From e6a94006bf64a959c07c7b0bd8317abeb9af4418 Mon Sep 17 00:00:00 2001 From: Karthik Venkateswaran Date: Mon, 18 Mar 2019 14:26:07 +0530 Subject: [PATCH 1/3] npm installed --- console/package-lock.json | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/console/package-lock.json b/console/package-lock.json index bbf53f9f3f77e..c9ba1cb7d0e9f 100644 --- a/console/package-lock.json +++ b/console/package-lock.json @@ -6092,7 +6092,7 @@ "dependencies": { "combined-stream": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", + "resolved": "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", "requires": { "delayed-stream": "~1.0.0" @@ -6220,7 +6220,8 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "concat-map": { "version": "0.0.1", @@ -6228,7 +6229,8 @@ }, "console-control-strings": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -6331,7 +6333,8 @@ }, "inherits": { "version": "2.0.3", - "bundled": true + "bundled": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -6341,6 +6344,7 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -6452,7 +6456,8 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true + "bundled": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -6567,6 +6572,7 @@ "string-width": { "version": "1.0.2", "bundled": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -9488,7 +9494,7 @@ }, "node-fetch": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz", + "resolved": "http://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz", "integrity": "sha1-q4hOjn5X44qUR1POxwb3iNF2i7U=" }, "node-gyp": { @@ -12146,7 +12152,7 @@ }, "onetime": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=", "dev": true }, @@ -12243,7 +12249,7 @@ }, "p-is-promise": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz", "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=", "dev": true }, @@ -17671,7 +17677,7 @@ }, "whatwg-fetch": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz", + "resolved": "http://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz", "integrity": "sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==" }, "whet.extend": { From d6e0b5a089ada9a2cc0c04062b18eefe48b8ace3 Mon Sep 17 00:00:00 2001 From: Karthik Venkateswaran Date: Wed, 19 Jun 2019 18:45:48 +0530 Subject: [PATCH 2/3] Remove `prokind` filter for now to make it work with other versions of pgsql --- console/src/components/Services/Data/utils.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/console/src/components/Services/Data/utils.js b/console/src/components/Services/Data/utils.js index f642c26f54ac6..72451d050c5be 100644 --- a/console/src/components/Services/Data/utils.js +++ b/console/src/components/Services/Data/utils.js @@ -581,7 +581,7 @@ SELECT t.typcategory FROM pg_catalog.pg_type t LEFT JOIN pg_catalog.pg_namespace n ON n.oid = t.typnamespace -WHERE (t.typrelid = 0 OR (SELECT c.relkind = 'c' FROM pg_catalog.pg_class c WHERE c.oid = t.typrelid)) +WHERE t.typrelid = 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type el WHERE el.oid = t.typelem AND el.typarray = t.oid) AND pg_catalog.pg_type_is_visible(t.oid) AND t.typname != 'unknown' @@ -596,7 +596,7 @@ JOIN pg_type t ON pgp.prorettype = t.oid JOIN pg_namespace pgn ON pgn.oid = pgp.pronamespace -WHERE (t.typrelid = 0 OR (SELECT c.relkind = 'c' FROM pg_catalog.pg_class c WHERE c.oid = t.typrelid)) +WHERE t.typrelid = 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type el WHERE el.oid = t.typelem AND el.typarray = t.oid) AND pg_catalog.pg_type_is_visible(t.oid) AND t.typname != 'unknown' @@ -604,7 +604,6 @@ WHERE (t.typrelid = 0 OR (SELECT c.relkind = 'c' FROM pg_catalog.pg_class c WHER AND (array_length(pgp.proargtypes, 1) = 0) AND ( pgn.nspname = '${schema}' OR pgn.nspname = 'pg_catalog' ) AND pgp.proretset=false - AND pgp.prokind='f' GROUP BY t.typname ORDER BY t.typname ASC; `; From 25c009f1f8739b81b4cc2436c87f033a589b5367 Mon Sep 17 00:00:00 2001 From: Karthik Venkateswaran Date: Wed, 19 Jun 2019 19:04:16 +0530 Subject: [PATCH 3/3] Fix --- console/src/components/Services/Data/utils.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/console/src/components/Services/Data/utils.js b/console/src/components/Services/Data/utils.js index 72451d050c5be..05b9209ee2ab4 100644 --- a/console/src/components/Services/Data/utils.js +++ b/console/src/components/Services/Data/utils.js @@ -581,7 +581,7 @@ SELECT t.typcategory FROM pg_catalog.pg_type t LEFT JOIN pg_catalog.pg_namespace n ON n.oid = t.typnamespace -WHERE t.typrelid = 0 +WHERE (t.typrelid = 0 OR (SELECT c.relkind = 'c' FROM pg_catalog.pg_class c WHERE c.oid = t.typrelid)) AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type el WHERE el.oid = t.typelem AND el.typarray = t.oid) AND pg_catalog.pg_type_is_visible(t.oid) AND t.typname != 'unknown' @@ -596,7 +596,7 @@ JOIN pg_type t ON pgp.prorettype = t.oid JOIN pg_namespace pgn ON pgn.oid = pgp.pronamespace -WHERE t.typrelid = 0 +WHERE (t.typrelid = 0 OR (SELECT c.relkind = 'c' FROM pg_catalog.pg_class c WHERE c.oid = t.typrelid)) AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type el WHERE el.oid = t.typelem AND el.typarray = t.oid) AND pg_catalog.pg_type_is_visible(t.oid) AND t.typname != 'unknown'