diff --git a/web/pgadmin/browser/server_groups/servers/databases/dbms_job_scheduler/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/dbms_job_scheduler/__init__.py index dc47ea66687..df443bc4b04 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/dbms_job_scheduler/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/dbms_job_scheduler/__init__.py @@ -105,7 +105,7 @@ def backend_supported(self, manager, **kwargs): # Checking whether both 'edb_job_scheduler' and 'dbms_scheduler' # extensions are created or not. status, res = conn.execute_scalar(""" - SELECT COUNT(*) FROM pg_extension WHERE extname IN ( + SELECT COUNT(*) FROM pg_catalog.pg_extension WHERE extname IN ( 'edb_job_scheduler', 'dbms_scheduler') """) if status and int(res) == 2: # Get the list of databases specified for the edb_job_scheduler diff --git a/web/pgadmin/browser/server_groups/servers/databases/dbms_job_scheduler/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/dbms_job_scheduler/tests/utils.py index aaaae526273..d30f59b508e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/dbms_job_scheduler/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/dbms_job_scheduler/tests/utils.py @@ -122,7 +122,8 @@ def is_dbms_job_scheduler_present(self): self.server['port']) pg_cursor = connection.cursor() - query = """SELECT COUNT(*) FROM pg_extension WHERE extname IN + query = """SELECT COUNT(*) FROM pg_catalog.pg_extension + WHERE extname IN ('edb_job_scheduler', 'dbms_scheduler')""" pg_cursor.execute(query) res = pg_cursor.fetchone() diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/utils.py index 6e9663f7111..8f63abf937d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/utils.py @@ -115,7 +115,8 @@ def verify_event_trigger_node(self): pg_cursor = connection.cursor() pg_cursor.execute("SELECT evtenabled," "evtevent, " - "(select rolname from pg_authid where oid " + "(select rolname from pg_catalog.pg_authid " + "where oid " "= pl.evtowner) as evtowner," " evtname from pg_catalog.pg_event_trigger pl " "WHERE evtname = '%s'" % self.test_data['name']) diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/sql/default/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/sql/default/delete.sql index cc024713384..0d4f9a6b9db 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/sql/default/delete.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/templates/foreign_servers/sql/default/delete.sql @@ -1,6 +1,6 @@ {# ============= Give foreign server name from foreign server id ============= #} {% if fsid %} -SELECT srvname as name FROM pg_foreign_server srv LEFT OUTER JOIN pg_catalog.pg_foreign_data_wrapper fdw on fdw.oid=srvfdw +SELECT srvname as name FROM pg_catalog.pg_foreign_server srv LEFT OUTER JOIN pg_catalog.pg_foreign_data_wrapper fdw on fdw.oid=srvfdw WHERE srv.oid={{fsid}}::oid; {% endif %} {# ============= Delete/Drop cascade foreign server ============= #} diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/utils.py index e482eeb796c..127971af672 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/utils.py @@ -71,7 +71,8 @@ def verify_language(self): pg_cursor.execute("SELECT * from pg_catalog.pg_language where " "lanname='%s'" % self.data["name"]) pg_cursor.execute("select pl.lanname, " - "(select rolname from pg_authid where oid " + "(select rolname from pg_catalog.pg_authid " + "where oid " "= pl.lanowner) as lanowner, " "pl.lanpltrusted, " "( select prosrc from pg_catalog.pg_proc where " diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/15_plus/sql/get_tables.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/15_plus/sql/get_tables.sql index ca3d718e63c..3f35f5d6dea 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/15_plus/sql/get_tables.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/15_plus/sql/get_tables.sql @@ -1,6 +1,6 @@ SELECT pg_catalog.quote_ident(n.nspname) || '.' || pg_catalog.quote_ident(cls.relname) AS table_name, - (SELECT array_agg(attname) FROM pg_attribute att WHERE attrelid = prel.prrelid AND attnum IN (SELECT unnest(prattrs) FROM pg_publication_rel WHERE oid = prel.oid ) ) AS columns, + (SELECT array_agg(attname) FROM pg_catalog.pg_attribute att WHERE attrelid = prel.prrelid AND attnum IN (SELECT unnest(prattrs) FROM pg_catalog.pg_publication_rel WHERE oid = prel.oid ) ) AS columns, pg_catalog.pg_get_expr(prel.prqual, prel.prrelid) AS where - FROM pg_publication_rel prel - JOIN pg_class cls ON cls.oid = prel.prrelid + FROM pg_catalog.pg_publication_rel prel + JOIN pg_catalog.pg_class cls ON cls.oid = prel.prrelid JOIN pg_catalog.pg_namespace n ON cls.relnamespace = n.oid WHERE prel.prpubid = {{pbid}} :: oid; diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/default/sql/get_all_columns.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/default/sql/get_all_columns.sql index 328856668b9..895f467b22f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/default/sql/get_all_columns.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/default/sql/get_all_columns.sql @@ -1,7 +1,6 @@ SELECT pg_catalog.quote_ident(attname) as column -FROM - pg_attribute +FROM pg_catalog.pg_attribute WHERE attrelid = '{{ tid }}' :: regclass and attnum > 0; diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/default/sql/get_tables.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/default/sql/get_tables.sql index 8cf5f20998a..7a45be4807b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/default/sql/get_tables.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/default/sql/get_tables.sql @@ -1,4 +1,4 @@ SELECT pg_catalog.quote_ident(n.nspname) || '.' || pg_catalog.quote_ident(cls.relname) AS table_name - FROM pg_publication_rel prel - JOIN pg_class cls ON cls.oid = prel.prrelid + FROM pg_catalog.pg_publication_rel prel + JOIN pg_catalog.pg_class cls ON cls.oid = prel.prrelid JOIN pg_catalog.pg_namespace n ON cls.relnamespace = n.oid WHERE prel.prpubid = {{pbid}} :: oid; diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/15_plus/sql/get_tables.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/15_plus/sql/get_tables.sql index ca3d718e63c..3f35f5d6dea 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/15_plus/sql/get_tables.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/15_plus/sql/get_tables.sql @@ -1,6 +1,6 @@ SELECT pg_catalog.quote_ident(n.nspname) || '.' || pg_catalog.quote_ident(cls.relname) AS table_name, - (SELECT array_agg(attname) FROM pg_attribute att WHERE attrelid = prel.prrelid AND attnum IN (SELECT unnest(prattrs) FROM pg_publication_rel WHERE oid = prel.oid ) ) AS columns, + (SELECT array_agg(attname) FROM pg_catalog.pg_attribute att WHERE attrelid = prel.prrelid AND attnum IN (SELECT unnest(prattrs) FROM pg_catalog.pg_publication_rel WHERE oid = prel.oid ) ) AS columns, pg_catalog.pg_get_expr(prel.prqual, prel.prrelid) AS where - FROM pg_publication_rel prel - JOIN pg_class cls ON cls.oid = prel.prrelid + FROM pg_catalog.pg_publication_rel prel + JOIN pg_catalog.pg_class cls ON cls.oid = prel.prrelid JOIN pg_catalog.pg_namespace n ON cls.relnamespace = n.oid WHERE prel.prpubid = {{pbid}} :: oid; diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/default/sql/get_all_columns.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/default/sql/get_all_columns.sql index 328856668b9..895f467b22f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/default/sql/get_all_columns.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/default/sql/get_all_columns.sql @@ -1,7 +1,6 @@ SELECT pg_catalog.quote_ident(attname) as column -FROM - pg_attribute +FROM pg_catalog.pg_attribute WHERE attrelid = '{{ tid }}' :: regclass and attnum > 0; diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/default/sql/get_tables.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/default/sql/get_tables.sql index 8cf5f20998a..7a45be4807b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/default/sql/get_tables.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/default/sql/get_tables.sql @@ -1,4 +1,4 @@ SELECT pg_catalog.quote_ident(n.nspname) || '.' || pg_catalog.quote_ident(cls.relname) AS table_name - FROM pg_publication_rel prel - JOIN pg_class cls ON cls.oid = prel.prrelid + FROM pg_catalog.pg_publication_rel prel + JOIN pg_catalog.pg_class cls ON cls.oid = prel.prrelid JOIN pg_catalog.pg_namespace n ON cls.relnamespace = n.oid WHERE prel.prpubid = {{pbid}} :: oid; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/11_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/11_plus/properties.sql index cd0d4e8bc8d..98a6a2813ee 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/11_plus/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/11_plus/properties.sql @@ -25,13 +25,13 @@ SELECT aggfnoid::oid as oid, proname as name, ns.nspname as schema, op.oprname as sort_oper, aggfinalextra as final_extra_param, aggmfinalextra as moving_final_extra_param, aggtransspace as state_data_size, aggmtransspace as moving_state_data_size, CASE WHEN (tt.typlen = -1 AND tt.typelem != 0) THEN - (SELECT at.typname FROM pg_type at WHERE at.oid = tt.typelem) || '[]' + (SELECT at.typname FROM pg_catalog.pg_type at WHERE at.oid = tt.typelem) || '[]' ELSE tt.typname END as state_type, CASE WHEN (tf.typlen = -1 AND tf.typelem != 0) THEN (SELECT at.typname FROM pg_catalog.pg_type at WHERE at.oid = tf.typelem) || '[]' ELSE tf.typname END as final_type, CASE WHEN (tm.typlen = -1 AND tm.typelem != 0) THEN - (SELECT at.typname FROM pg_type at WHERE at.oid = tm.typelem) || '[]' + (SELECT at.typname FROM pg_catalog.pg_type at WHERE at.oid = tm.typelem) || '[]' ELSE tm.typname END as moving_state_type, description FROM pg_catalog.pg_aggregate ag diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/default/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/default/nodes.sql index 4546c461afe..b9b523f1e88 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/default/nodes.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/default/nodes.sql @@ -2,7 +2,7 @@ SELECT aggfnoid::oid as oid, proname || '(' || COALESCE(pg_catalog.pg_get_function_arguments(aggfnoid::oid), '') || ')' AS name, pg_catalog.pg_get_userbyid(proowner) AS owner, description -FROM pg_aggregate ag +FROM pg_catalog.pg_aggregate ag LEFT OUTER JOIN pg_catalog.pg_proc pr ON pr.oid = ag.aggfnoid LEFT OUTER JOIN pg_catalog.pg_type tt on tt.oid=aggtranstype LEFT OUTER JOIN pg_catalog.pg_type tf on tf.oid=prorettype diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/default/properties.sql index 0b86bd4780b..668f3671653 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/default/properties.sql @@ -17,13 +17,13 @@ SELECT aggfnoid::oid as oid, proname as name, ns.nspname as schema, op.oprname as sort_oper, aggfinalextra as final_extra_param, aggmfinalextra as moving_final_extra_param, aggtransspace as state_data_size, aggmtransspace as moving_state_data_size, CASE WHEN (tt.typlen = -1 AND tt.typelem != 0) THEN - (SELECT at.typname FROM pg_type at WHERE at.oid = tt.typelem) || '[]' + (SELECT at.typname FROM pg_catalog.pg_type at WHERE at.oid = tt.typelem) || '[]' ELSE tt.typname END as state_type, CASE WHEN (tf.typlen = -1 AND tf.typelem != 0) THEN (SELECT at.typname FROM pg_catalog.pg_type at WHERE at.oid = tf.typelem) || '[]' ELSE tf.typname END as final_type, CASE WHEN (tm.typlen = -1 AND tm.typelem != 0) THEN - (SELECT at.typname FROM pg_type at WHERE at.oid = tm.typelem) || '[]' + (SELECT at.typname FROM pg_catalog.pg_type at WHERE at.oid = tm.typelem) || '[]' ELSE tm.typname END as moving_state_type, description FROM pg_catalog.pg_aggregate ag diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/utils.py index 4ec3c06995f..659dd883084 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/utils.py @@ -111,7 +111,7 @@ def create_column(server, db_name, schema_name, table_name, col_name, utils.set_isolation_level(connection, old_isolation_level) connection.commit() # Get column position of newly added column - pg_cursor.execute("select attnum from pg_attribute where" + pg_cursor.execute("select attnum from pg_catalog.pg_attribute where" " attname='%s'" % col_name) col = pg_cursor.fetchone() col_pos = '' @@ -160,7 +160,7 @@ def create_identity_column(server, db_name, schema_name, table_name, utils.set_isolation_level(connection, old_isolation_level) connection.commit() # Get column position of newly added column - pg_cursor.execute("select attnum from pg_attribute where" + pg_cursor.execute("select attnum from pg_catalog.pg_attribute where" " attname='%s'" % col_name) col = pg_cursor.fetchone() col_pos = '' @@ -193,7 +193,8 @@ def verify_column(server, db_name, col_name): server['port'], server['sslmode']) pg_cursor = connection.cursor() - pg_cursor.execute("select * from pg_attribute where attname='%s'" % + pg_cursor.execute("select * from pg_catalog.pg_attribute " + "where attname='%s'" % col_name) col = pg_cursor.fetchone() connection.close() diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/13_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/13_plus/properties.sql index 94966f768ec..fda6d7ee53c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/13_plus/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/13_plus/properties.sql @@ -10,8 +10,8 @@ SELECT pr.pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, ( SELECT array_agg(DISTINCT e.extname) - FROM pg_depend d - JOIN pg_extension e ON d.refobjid = e.oid + FROM pg_catalog.pg_depend d + JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid WHERE d.objid = pr.oid ) AS dependsonextensions, CASE WHEN prosupport = 0::oid THEN '' diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/14_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/14_plus/properties.sql index 7a9d2a33876..16fddf592ec 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/14_plus/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/14_plus/properties.sql @@ -12,8 +12,8 @@ SELECT pr.pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, ( SELECT array_agg(DISTINCT e.extname) - FROM pg_depend d - JOIN pg_extension e ON d.refobjid = e.oid + FROM pg_catalog.pg_depend d + JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid WHERE d.objid = pr.oid ) AS dependsonextensions, CASE WHEN prosupport = 0::oid THEN '' diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/13_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/13_plus/properties.sql index b2f8c76e74d..3bd50ac932d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/13_plus/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/13_plus/properties.sql @@ -10,8 +10,8 @@ SELECT pr.pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, ( SELECT array_agg(DISTINCT e.extname) - FROM pg_depend d - JOIN pg_extension e ON d.refobjid = e.oid + FROM pg_catalog.pg_depend d + JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid WHERE d.objid = pr.oid ) AS dependsonextensions, CASE WHEN prosupport = 0::oid THEN '' ELSE prosupport::text END AS prosupportfunc, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/14_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/14_plus/properties.sql index dad0240166c..e4837cca15a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/14_plus/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/14_plus/properties.sql @@ -10,8 +10,8 @@ SELECT pr.pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, ( SELECT array_agg(DISTINCT e.extname) - FROM pg_depend d - JOIN pg_extension e ON d.refobjid = e.oid + FROM pg_catalog.pg_depend d + JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid WHERE d.objid = pr.oid ) AS dependsonextensions, pg_catalog.pg_get_function_sqlbody(pr.oid) AS prosrc_sql, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/13_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/13_plus/properties.sql index 4f1ba466502..627b8e500f5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/13_plus/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/13_plus/properties.sql @@ -10,8 +10,8 @@ SELECT pr.pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, ( SELECT array_agg(DISTINCT e.extname) - FROM pg_depend d - JOIN pg_extension e ON d.refobjid = e.oid + FROM pg_catalog.pg_depend d + JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid WHERE d.objid = pr.oid ) AS dependsonextensions, ( diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/14_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/14_plus/properties.sql index 6cbdaf6d99b..0396458766a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/14_plus/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/14_plus/properties.sql @@ -12,8 +12,8 @@ SELECT pr.pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, ( SELECT array_agg(DISTINCT e.extname) - FROM pg_depend d - JOIN pg_extension e ON d.refobjid = e.oid + FROM pg_catalog.pg_depend d + JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid WHERE d.objid = pr.oid ) AS dependsonextensions, ( diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/13_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/13_plus/properties.sql index 4f1ba466502..627b8e500f5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/13_plus/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/13_plus/properties.sql @@ -10,8 +10,8 @@ SELECT pr.pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, ( SELECT array_agg(DISTINCT e.extname) - FROM pg_depend d - JOIN pg_extension e ON d.refobjid = e.oid + FROM pg_catalog.pg_depend d + JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid WHERE d.objid = pr.oid ) AS dependsonextensions, ( diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/14_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/14_plus/properties.sql index 594e4769d5f..72b8bfe0084 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/14_plus/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/14_plus/properties.sql @@ -10,8 +10,8 @@ SELECT pr.pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, ( SELECT array_agg(DISTINCT e.extname) - FROM pg_depend d - JOIN pg_extension e ON d.refobjid = e.oid + FROM pg_catalog.pg_depend d + JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid WHERE d.objid = pr.oid ) AS dependsonextensions, pg_catalog.pg_get_function_sqlbody(pr.oid) AS prosrc_sql, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/utils.py index 5c0c46d2a47..9968c53dc54 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/utils.py @@ -70,7 +70,8 @@ def verify_synonym(server, db_name, synonym_name): server['host'], server['port']) pg_cursor = connection.cursor() - pg_cursor.execute("SELECT * FROM pg_synonym WHERE synname='%s'" % + pg_cursor.execute("SELECT * FROM pg_catalog.pg_synonym " + "WHERE synname='%s'" % synonym_name) synonym = pg_cursor.fetchone() connection.close() diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/utils.py index 05148a299a8..6684fe93f2b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/utils.py @@ -111,7 +111,7 @@ def create_column(server, db_name, schema_name, table_name, col_name, utils.set_isolation_level(connection, old_isolation_level) connection.commit() # Get column position of newly added column - pg_cursor.execute("select attnum from pg_attribute where" + pg_cursor.execute("select attnum from pg_catalog.pg_attribute where" " attname='%s'" % col_name) col = pg_cursor.fetchone() col_pos = '' @@ -160,7 +160,7 @@ def create_identity_column(server, db_name, schema_name, table_name, utils.set_isolation_level(connection, old_isolation_level) connection.commit() # Get column position of newly added column - pg_cursor.execute("select attnum from pg_attribute where" + pg_cursor.execute("select attnum from pg_catalog.pg_attribute where" " attname='%s'" % col_name) col = pg_cursor.fetchone() col_pos = '' @@ -193,7 +193,8 @@ def verify_column(server, db_name, col_name): server['port'], server['sslmode']) pg_cursor = connection.cursor() - pg_cursor.execute("select * from pg_attribute where attname='%s'" % + pg_cursor.execute("select * from pg_catalog.pg_attribute " + "where attname='%s'" % col_name) col = pg_cursor.fetchone() connection.close() diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/foreign_key/sql/tests/test_foreign_key_properties.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/foreign_key/sql/tests/test_foreign_key_properties.py index 155a901af23..b1939781ebf 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/foreign_key/sql/tests/test_foreign_key_properties.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/foreign_key/sql/tests/test_foreign_key_properties.py @@ -32,7 +32,8 @@ def runTest(self): cursor = connection.cursor() cursor.execute("SELECT pg_class.oid as table_id, " "pg_attribute.attnum as column_id " - "FROM pg_catalog.pg_class join pg_attribute on " + "FROM pg_catalog.pg_class " + "join pg_catalog.pg_attribute on " "attrelid=pg_class.oid " "where pg_class.relname='test_table'" " and pg_attribute.attname = 'some_column'") diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/11_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/11_plus/properties.sql index 94509e84594..4784815f9b0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/11_plus/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/11_plus/properties.sql @@ -36,7 +36,7 @@ SELECT DISTINCT ON (cls.relname) con.condeferred, am.amname, EXISTS ( - SELECT 1 FROM pg_inherits inh WHERE inh.inhrelid = cls.oid + SELECT 1 FROM pg_catalog.pg_inherits inh WHERE inh.inhrelid = cls.oid ) AS is_inherited, substring(array_to_string(cls.reloptions, ',') FROM 'fillfactor=([0-9]*)')::int AS fillfactor, substring(array_to_string(cls.reloptions, ',') FROM 'gin_pending_list_limit=([0-9]*)')::int AS gin_pending_list_limit, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/13_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/13_plus/properties.sql index 0e6140869e1..00b6c69558c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/13_plus/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/13_plus/properties.sql @@ -32,8 +32,8 @@ SELECT DISTINCT ON (cls.relname) END AS description, ( SELECT array_agg(DISTINCT e.extname) - FROM pg_depend d - JOIN pg_extension e ON d.refobjid = e.oid + FROM pg_catalog.pg_depend d + JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid WHERE d.objid = cls.oid ) AS dependsonextensions, pg_catalog.pg_get_expr(idx.indpred, idx.indrelid, true) AS indconstraint, @@ -42,7 +42,7 @@ SELECT DISTINCT ON (cls.relname) con.condeferred, am.amname, EXISTS ( - SELECT 1 FROM pg_inherits inh WHERE inh.inhrelid = cls.oid + SELECT 1 FROM pg_catalog.pg_inherits inh WHERE inh.inhrelid = cls.oid ) AS is_inherited, -- Options (with defaults per index type) substring(array_to_string(cls.reloptions, ',') FROM 'fillfactor=([0-9]*)')::int AS fillfactor, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/15_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/15_plus/properties.sql index b2b99066811..2fce4aa3612 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/15_plus/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/15_plus/properties.sql @@ -33,8 +33,8 @@ SELECT DISTINCT ON (cls.relname) END AS description, ( SELECT array_agg(DISTINCT e.extname) - FROM pg_depend d - JOIN pg_extension e ON d.refobjid = e.oid + FROM pg_catalog.pg_depend d + JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid WHERE d.objid = cls.oid ) AS dependsonextensions, pg_catalog.pg_get_expr(idx.indpred, idx.indrelid, true) AS indconstraint, @@ -43,7 +43,7 @@ SELECT DISTINCT ON (cls.relname) con.condeferred, am.amname, EXISTS ( - SELECT 1 FROM pg_inherits inh WHERE inh.inhrelid = cls.oid + SELECT 1 FROM pg_catalog.pg_inherits inh WHERE inh.inhrelid = cls.oid ) AS is_inherited, -- Options (with defaults per index type) substring(array_to_string(cls.reloptions, ',') FROM 'fillfactor=([0-9]*)')::int AS fillfactor, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/nodes.sql index 0af0576800b..c995f2ebd58 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/nodes.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/nodes.sql @@ -1,5 +1,5 @@ SELECT DISTINCT ON(cls.relname) cls.oid, cls.relname as name, -(SELECT (CASE WHEN count(i.inhrelid) > 0 THEN true ELSE false END) FROM pg_inherits i WHERE i.inhrelid = cls.oid) as is_inherited, +(SELECT (CASE WHEN count(i.inhrelid) > 0 THEN true ELSE false END) FROM pg_catalog.pg_inherits i WHERE i.inhrelid = cls.oid) as is_inherited, CASE WHEN contype IN ('p', 'u', 'x') THEN desp.description ELSE des.description END AS description FROM pg_catalog.pg_index idx JOIN pg_catalog.pg_class cls ON cls.oid=indexrelid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/properties.sql index 23214d8bd3f..a26ec0d80d8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/properties.sql @@ -9,7 +9,7 @@ SELECT DISTINCT ON(cls.relname) cls.oid, cls.relname as name, indrelid, indkey, CASE WHEN contype IN ('p', 'u', 'x') THEN desp.description ELSE des.description END AS description, pg_catalog.pg_get_expr(indpred, indrelid, true) as indconstraint, contype, condeferrable, condeferred, amname, - (SELECT (CASE WHEN count(i.inhrelid) > 0 THEN true ELSE false END) FROM pg_inherits i WHERE i.inhrelid = cls.oid) as is_inherited, + (SELECT (CASE WHEN count(i.inhrelid) > 0 THEN true ELSE false END) FROM pg_catalog.pg_inherits i WHERE i.inhrelid = cls.oid) as is_inherited, substring(pg_catalog.array_to_string(cls.reloptions, ',') from 'fillfactor=([0-9]*)') AS fillfactor {% if datlastsysoid %}, (CASE WHEN cls.oid <= {{ datlastsysoid}}::oid THEN true ElSE false END) AS is_sys_idx {% endif %} FROM pg_catalog.pg_index idx diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/11_plus/get_collation.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/11_plus/get_collation.sql index af8d33f4b4f..c160603177b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/11_plus/get_collation.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/11_plus/get_collation.sql @@ -1,5 +1,5 @@ SELECT (PG_CATALOG.CONCAT(PG_CATALOG.QUOTE_IDENT(nspc.nspname),'.',PG_CATALOG.QUOTE_IDENT(PGCOL.COLLNAME))) AS collationame - FROM PG_PARTITIONED_TABLE PARTT + FROM pg_catalog.PG_PARTITIONED_TABLE PARTT LEFT OUTER JOIN PG_CATALOG.PG_COLLATION PGCOL ON PGCOL.OID = 950 LEFT OUTER JOIN PG_CATALOG.PG_NAMESPACE NSPC diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/get_tables_for_constraints.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/get_tables_for_constraints.sql index 594a00a70f1..1e65fbec48b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/get_tables_for_constraints.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/get_tables_for_constraints.sql @@ -1,5 +1,5 @@ SELECT cl.oid as value, pg_catalog.quote_ident(nspname)||'.'||pg_catalog.quote_ident(relname) AS label -FROM pg_catalog.pg_namespace nsp, pg_class cl +FROM pg_catalog.pg_namespace nsp, pg_catalog.pg_class cl WHERE relnamespace=nsp.oid AND relkind in ('r', 'p') AND nsp.nspname NOT LIKE E'pg\_temp\_%' {% if not show_sysobj %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_tables_for_constraints.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_tables_for_constraints.sql index 082c10cab1b..b0dd3d33293 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_tables_for_constraints.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_tables_for_constraints.sql @@ -1,5 +1,5 @@ SELECT cl.oid as value, pg_catalog.quote_ident(nspname)||'.'||pg_catalog.quote_ident(relname) AS label -FROM pg_catalog.pg_namespace nsp, pg_class cl +FROM pg_catalog.pg_namespace nsp, pg_catalog.pg_class cl WHERE relnamespace=nsp.oid AND relkind='r' AND nsp.nspname NOT LIKE E'pg\_temp\_%' {% if not show_sysobj %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_acl_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_acl_sql.py index 702a9a0b162..880c14efa5c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_acl_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_acl_sql.py @@ -28,7 +28,8 @@ def __init__(self): def test_setup(self, connection, cursor): cursor.execute("SELECT pg_class.oid AS table_id, " "pg_attribute.attnum AS column_id " - "FROM pg_catalog.pg_class JOIN pg_attribute ON " + "FROM pg_catalog.pg_class " + "JOIN pg_catalog.pg_attribute ON " "attrelid=pg_class.oid " "WHERE pg_class.relname='test_table'" " AND pg_attribute.attname = 'some_column'") diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_trigger_get_oid_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_trigger_get_oid_sql.py index 397edceb4f2..3cf9e9f120a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_trigger_get_oid_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_trigger_get_oid_sql.py @@ -28,7 +28,8 @@ def __init__(self): def test_setup(self, connection, cursor): cursor.execute("SELECT pg_class.oid AS table_id, " "pg_attribute.attnum AS column_id " - "FROM pg_catalog.pg_class JOIN pg_attribute ON " + "FROM pg_catalog.pg_class " + "JOIN pg_catalog.pg_attribute ON " "attrelid=pg_class.oid " "WHERE pg_class.relname='test_table'" " AND pg_attribute.attname = 'some_column'") diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/utils.py index da03cee3a26..d0dff7705d8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/utils.py @@ -610,7 +610,8 @@ def create_postgis_extension(self): self.server['sslmode']) pg_cursor = connection.cursor() # Check if postgis extension is available to install - pg_cursor.execute('''SELECT COUNT(*) FROM pg_available_extensions WHERE + pg_cursor.execute('''SELECT COUNT(*) FROM + pg_catalog.pg_available_extensions WHERE name ='postgis' ''') res = pg_cursor.fetchone() if res and len(res) > 0 and int(res[0]) == 1: diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py index 0750952a3fd..ef9f26118da 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py @@ -1553,7 +1553,7 @@ def dependencies(self, gid, sid, did, scid, tid): """ # For composite type typrelid is required to fetch dependencies. type_where = "WHERE (dep.objid={0}::oid OR dep.objid=(select typrelid \ - from pg_type where oid = {0}::oid))".format(tid) + from pg_catalog.pg_type where oid = {0}::oid))".format(tid) dependencies_result = self.get_dependencies( self.conn, tid, where=type_where ) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/14_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/14_plus/properties.sql index 66d66e56c55..62d625c0017 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/14_plus/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/14_plus/properties.sql @@ -6,21 +6,21 @@ SELECT t.oid, t.typname AS name, t.typrelid, t.typelem, t.typarray, t.typalign, t.typstorage, t.typnotnull, t.typbasetype, t.typtypmod, t.typndims, t.typcollation, t.typdefaultbin, t.typdefault, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typinput::oid) AS typinput, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typoutput::oid) AS typoutput, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typreceive::oid) AS typreceive, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typsend::oid) AS typsend, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typmodin::oid) AS typmodin, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typmodout::oid) AS typmodout, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typanalyze::oid) AS typanalyze, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typsubscript::oid) AS typsubscript, pg_catalog.format_type(t.oid, null) AS alias, pg_catalog.pg_get_userbyid(t.typowner) as typeowner, e.typname as element, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/default/properties.sql index a52fbaeb883..400c742140a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/default/properties.sql @@ -6,19 +6,19 @@ SELECT t.oid, t.typname AS name, t.typrelid, t.typelem, t.typarray, t.typalign, t.typstorage, t.typnotnull, t.typbasetype, t.typtypmod, t.typndims, t.typcollation, t.typdefaultbin, t.typdefault, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typinput::oid) AS typinput, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typoutput::oid) AS typoutput, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typreceive::oid) AS typreceive, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typsend::oid) AS typsend, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typmodin::oid) AS typmodin, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typmodout::oid) AS typmodout, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typanalyze::oid) AS typanalyze, pg_catalog.format_type(t.oid, null) AS alias, pg_catalog.pg_get_userbyid(t.typowner) as typeowner, e.typname as element, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/14_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/14_plus/properties.sql index d50619e6197..62d625c0017 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/14_plus/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/14_plus/properties.sql @@ -6,21 +6,21 @@ SELECT t.oid, t.typname AS name, t.typrelid, t.typelem, t.typarray, t.typalign, t.typstorage, t.typnotnull, t.typbasetype, t.typtypmod, t.typndims, t.typcollation, t.typdefaultbin, t.typdefault, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typinput::oid) AS typinput, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typoutput::oid) AS typoutput, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typreceive::oid) AS typreceive, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typsend::oid) AS typsend, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typmodin::oid) AS typmodin, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typmodout::oid) AS typmodout, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typanalyze::oid) AS typanalyze, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typsubscript::oid) AS typsubscript, pg_catalog.format_type(t.oid, null) AS alias, pg_catalog.pg_get_userbyid(t.typowner) as typeowner, e.typname as element, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/default/properties.sql index a52fbaeb883..400c742140a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/default/properties.sql @@ -6,19 +6,19 @@ SELECT t.oid, t.typname AS name, t.typrelid, t.typelem, t.typarray, t.typalign, t.typstorage, t.typnotnull, t.typbasetype, t.typtypmod, t.typndims, t.typcollation, t.typdefaultbin, t.typdefault, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typinput::oid) AS typinput, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typoutput::oid) AS typoutput, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typreceive::oid) AS typreceive, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typsend::oid) AS typsend, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typmodin::oid) AS typmodin, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typmodout::oid) AS typmodout, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_proc pr JOIN pg_namespace nsp ON pr.pronamespace = nsp.oid + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typanalyze::oid) AS typanalyze, pg_catalog.format_type(t.oid, null) AS alias, pg_catalog.pg_get_userbyid(t.typowner) as typeowner, e.typname as element, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/13_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/13_plus/sql/properties.sql index ae9406471a6..a79512c98c0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/13_plus/sql/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/13_plus/sql/properties.sql @@ -19,8 +19,8 @@ SELECT description AS comment, ( SELECT array_agg(DISTINCT e.extname) - FROM pg_depend d - JOIN pg_extension e ON d.refobjid = e.oid + FROM pg_catalog.pg_depend d + JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid WHERE d.objid = c.oid ) AS dependsonextensions, pg_catalog.pg_get_viewdef(c.oid, true) AS definition, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/15_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/15_plus/sql/properties.sql index ae9406471a6..a79512c98c0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/15_plus/sql/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/15_plus/sql/properties.sql @@ -19,8 +19,8 @@ SELECT description AS comment, ( SELECT array_agg(DISTINCT e.extname) - FROM pg_depend d - JOIN pg_extension e ON d.refobjid = e.oid + FROM pg_catalog.pg_depend d + JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid WHERE d.objid = c.oid ) AS dependsonextensions, pg_catalog.pg_get_viewdef(c.oid, true) AS definition, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/13_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/13_plus/sql/properties.sql index 2d5c91a8d47..0c1113ceb0b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/13_plus/sql/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/13_plus/sql/properties.sql @@ -19,8 +19,8 @@ SELECT description AS comment, ( SELECT array_agg(DISTINCT e.extname) - FROM pg_depend d - JOIN pg_extension e ON d.refobjid = e.oid + FROM pg_catalog.pg_depend d + JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid WHERE d.objid = c.oid ) AS dependsonextensions, pg_catalog.pg_get_viewdef(c.oid) AS definition, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/15_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/15_plus/sql/properties.sql index 2d5c91a8d47..0c1113ceb0b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/15_plus/sql/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/15_plus/sql/properties.sql @@ -19,8 +19,8 @@ SELECT description AS comment, ( SELECT array_agg(DISTINCT e.extname) - FROM pg_depend d - JOIN pg_extension e ON d.refobjid = e.oid + FROM pg_catalog.pg_depend d + JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid WHERE d.objid = c.oid ) AS dependsonextensions, pg_catalog.pg_get_viewdef(c.oid) AS definition, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/view_test_data.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/view_test_data.json index aa4a7a5d611..c2a00d15c38 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/view_test_data.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/view_test_data.json @@ -159,7 +159,7 @@ "url": "/browser/view/obj/", "is_positive_test": true, "inventory_data": { - "query": "\"CREATE OR REPLACE VIEW %s.%s AS SELECT CASE WHEN (pg_db.datistemplate = false AND pg_db.datallowconn = true AND (pg_db.datconnlimit = -1 OR pg_db.datacl is null)) then true else false end as res FROM pg_database pg_db; ALTER TABLE %s.%s OWNER TO %s\" % (schema_name, view_name, schema_name, view_name, server['username'])" + "query": "\"CREATE OR REPLACE VIEW %s.%s AS SELECT CASE WHEN (pg_db.datistemplate = false AND pg_db.datallowconn = true AND (pg_db.datconnlimit = -1 OR pg_db.datacl is null)) then true else false end as res FROM pg_catalog.pg_database pg_db; ALTER TABLE %s.%s OWNER TO %s\" % (schema_name, view_name, schema_name, view_name, server['username'])" }, "test_data": { "server_max_version": 159999, @@ -182,7 +182,7 @@ "url": "/browser/view/obj/", "is_positive_test": true, "inventory_data": { - "query": "\"CREATE OR REPLACE VIEW %s.%s AS SELECT CASE WHEN (pg_db.datistemplate = false AND pg_db.datallowconn = true AND (pg_db.datconnlimit = -1 OR pg_db.datacl is null)) then true else false end as res FROM pg_database pg_db; ALTER TABLE %s.%s OWNER TO %s\" % (schema_name, view_name, schema_name, view_name, server['username'])" + "query": "\"CREATE OR REPLACE VIEW %s.%s AS SELECT CASE WHEN (pg_db.datistemplate = false AND pg_db.datallowconn = true AND (pg_db.datconnlimit = -1 OR pg_db.datacl is null)) then true else false end as res FROM pg_catalog.pg_database pg_db; ALTER TABLE %s.%s OWNER TO %s\" % (schema_name, view_name, schema_name, view_name, server['username'])" }, "test_data": { "server_min_version": 160000, @@ -485,7 +485,7 @@ "url": "/browser/view/nodes/", "is_positive_test": true, "inventory_data": { - "query": "\"CREATE OR REPLACE VIEW %s.%s AS SELECT CASE WHEN (pg_db.datistemplate = false AND pg_db.datallowconn = true AND (pg_db.datconnlimit = -1 OR pg_db.datacl is null)) then true else false end as res FROM pg_database pg_db; ALTER TABLE %s.%s OWNER TO %s\" % (schema_name, view_name, schema_name, view_name, server['username'])" + "query": "\"CREATE OR REPLACE VIEW %s.%s AS SELECT CASE WHEN (pg_db.datistemplate = false AND pg_db.datallowconn = true AND (pg_db.datconnlimit = -1 OR pg_db.datacl is null)) then true else false end as res FROM pg_catalog.pg_database pg_db; ALTER TABLE %s.%s OWNER TO %s\" % (schema_name, view_name, schema_name, view_name, server['username'])" }, "test_data": {}, "mocking_required": false, @@ -616,7 +616,7 @@ "url": "/browser/view/", "is_positive_test": true, "inventory_data": { - "query": "\"CREATE OR REPLACE VIEW %s.%s AS SELECT CASE WHEN (pg_db.datistemplate = false AND pg_db.datallowconn = true AND (pg_db.datconnlimit = -1 OR pg_db.datacl is null)) then true else false end as res FROM pg_database pg_db; ALTER TABLE %s.%s OWNER TO %s\" % (schema_name, view_name, schema_name, view_name, server['username'])" + "query": "\"CREATE OR REPLACE VIEW %s.%s AS SELECT CASE WHEN (pg_db.datistemplate = false AND pg_db.datallowconn = true AND (pg_db.datconnlimit = -1 OR pg_db.datacl is null)) then true else false end as res FROM pg_catalog.pg_database pg_db; ALTER TABLE %s.%s OWNER TO %s\" % (schema_name, view_name, schema_name, view_name, server['username'])" }, "test_data": {}, "mocking_required": false, @@ -687,7 +687,7 @@ "url": "/browser/view/sql/", "is_positive_test": true, "inventory_data": { - "query": "\"CREATE OR REPLACE VIEW %s.%s AS SELECT CASE WHEN (pg_db.datistemplate = false AND pg_db.datallowconn = true AND (pg_db.datconnlimit = -1 OR pg_db.datacl is null)) then true else false end as res FROM pg_database pg_db; ALTER TABLE %s.%s OWNER TO %s\" % (schema_name, view_name, schema_name, view_name, server['username'])" + "query": "\"CREATE OR REPLACE VIEW %s.%s AS SELECT CASE WHEN (pg_db.datistemplate = false AND pg_db.datallowconn = true AND (pg_db.datconnlimit = -1 OR pg_db.datacl is null)) then true else false end as res FROM pg_catalog.pg_database pg_db; ALTER TABLE %s.%s OWNER TO %s\" % (schema_name, view_name, schema_name, view_name, server['username'])" }, "test_data": {}, "mocking_required": false, diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/default/stats.sql b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/default/stats.sql index 0289aee4ad1..9f2262a5216 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/default/stats.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/default/stats.sql @@ -5,7 +5,7 @@ SELECT stat.last_msg_receipt_time AS {{ conn|qtIdent(_('Last message receipt')) }}, stat.last_msg_send_time AS {{ conn|qtIdent(_('Last message send time'))}} FROM pg_catalog.pg_stat_subscription stat -LEFT JOIN pg_subscription sub ON sub.subname = stat.subname +LEFT JOIN pg_catalog.pg_subscription sub ON sub.subname = stat.subname {% if subid %} WHERE stat.subid = {{ subid }}; {% else %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/15_plus/get_icu_locale.sql b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/15_plus/get_icu_locale.sql index fd1ad045bbc..27f7b49ac8f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/15_plus/get_icu_locale.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/15_plus/get_icu_locale.sql @@ -1 +1 @@ -SELECT colliculocale from pg_collation where collprovider = 'i' +SELECT colliculocale from pg_catalog.pg_collation where collprovider = 'i' diff --git a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/16_plus/get_ctypes.sql b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/16_plus/get_ctypes.sql index 4dfd31e37ac..8a5347a4070 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/16_plus/get_ctypes.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/16_plus/get_ctypes.sql @@ -1,8 +1,8 @@ SELECT CASE WHEN datlocprovider = 'i' THEN - (SELECT daticulocale as cname FROM pg_database WHERE datname = current_database()) + (SELECT daticulocale as cname FROM pg_catalog.pg_database WHERE datname = current_database()) ELSE - (SELECT datcollate as cname FROM pg_database WHERE datname = current_database() + (SELECT datcollate as cname FROM pg_catalog.pg_database WHERE datname = current_database() UNION - SELECT datctype as cname FROM pg_database WHERE datname = current_database()) + SELECT datctype as cname FROM pg_catalog.pg_database WHERE datname = current_database()) END -FROM pg_database WHERE datname = current_database(); +FROM pg_catalog.pg_database WHERE datname = current_database(); diff --git a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/17_plus/get_builtin_locale.sql b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/17_plus/get_builtin_locale.sql index cd846efe339..f357e4bec69 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/17_plus/get_builtin_locale.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/17_plus/get_builtin_locale.sql @@ -1 +1 @@ -SELECT colllocale as collbuiltinlocale from pg_collation where collprovider = 'b'; +SELECT colllocale as collbuiltinlocale from pg_catalog.pg_collation where collprovider = 'b'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/17_plus/get_ctypes.sql b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/17_plus/get_ctypes.sql index 25276770ba7..00221883616 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/17_plus/get_ctypes.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/17_plus/get_ctypes.sql @@ -1,8 +1,8 @@ SELECT CASE WHEN datlocprovider = 'i' THEN - (SELECT datlocale as cname FROM pg_database WHERE datname = current_database()) + (SELECT datlocale as cname FROM pg_catalog.pg_database WHERE datname = current_database()) ELSE - (SELECT datcollate as cname FROM pg_database WHERE datname = current_database() + (SELECT datcollate as cname FROM pg_catalog.pg_database WHERE datname = current_database() UNION - SELECT datctype as cname FROM pg_database WHERE datname = current_database()) + SELECT datctype as cname FROM pg_catalog.pg_database WHERE datname = current_database()) END -FROM pg_database WHERE datname = current_database(); +FROM pg_catalog.pg_database WHERE datname = current_database(); diff --git a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/17_plus/get_icu_locale.sql b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/17_plus/get_icu_locale.sql index 128bfeb0649..791afffd33b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/17_plus/get_icu_locale.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/17_plus/get_icu_locale.sql @@ -1 +1 @@ -SELECT colllocale as colliculocale from pg_collation where collprovider = 'i' +SELECT colllocale as colliculocale from pg_catalog.pg_collation where collprovider = 'i' diff --git a/web/pgadmin/browser/server_groups/servers/directories/tests/utils.py b/web/pgadmin/browser/server_groups/servers/directories/tests/utils.py index 068f57eba58..22a6df69a84 100644 --- a/web/pgadmin/browser/server_groups/servers/directories/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/directories/tests/utils.py @@ -112,7 +112,7 @@ def create_superuser_role(server, role_name): utils.set_isolation_level(connection, old_isolation_level) connection.commit() # Get oid of newly created directory - pg_cursor.execute("SELECT usename FROM pg_user WHERE " + pg_cursor.execute("SELECT usename FROM pg_catalog.pg_user WHERE " " usename='%s'" % role_name) user_role = pg_cursor.fetchone() role_username = user_role[0] diff --git a/web/pgadmin/browser/server_groups/servers/replica_nodes/templates/replica_nodes/sql/default/count.sql b/web/pgadmin/browser/server_groups/servers/replica_nodes/templates/replica_nodes/sql/default/count.sql index 3d751e37935..2dd9d072e67 100644 --- a/web/pgadmin/browser/server_groups/servers/replica_nodes/templates/replica_nodes/sql/default/count.sql +++ b/web/pgadmin/browser/server_groups/servers/replica_nodes/templates/replica_nodes/sql/default/count.sql @@ -1,2 +1,2 @@ SELECT count(*) -FROM pg_stat_replication +FROM pg_catalog.pg_stat_replication diff --git a/web/pgadmin/browser/server_groups/servers/replica_nodes/templates/replica_nodes/sql/default/nodes.sql b/web/pgadmin/browser/server_groups/servers/replica_nodes/templates/replica_nodes/sql/default/nodes.sql index 34219a67eb8..a8a4413d98d 100644 --- a/web/pgadmin/browser/server_groups/servers/replica_nodes/templates/replica_nodes/sql/default/nodes.sql +++ b/web/pgadmin/browser/server_groups/servers/replica_nodes/templates/replica_nodes/sql/default/nodes.sql @@ -1,3 +1,3 @@ SELECT pid, 'Standby ['||COALESCE(host(client_addr), client_hostname, 'Socket')||']' as name -FROM pg_stat_replication +FROM pg_catalog.pg_stat_replication ORDER BY pid diff --git a/web/pgadmin/browser/server_groups/servers/replica_nodes/templates/replica_nodes/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/replica_nodes/templates/replica_nodes/sql/default/properties.sql index 02dd66ebc98..0f5f4982231 100644 --- a/web/pgadmin/browser/server_groups/servers/replica_nodes/templates/replica_nodes/sql/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/replica_nodes/templates/replica_nodes/sql/default/properties.sql @@ -1,6 +1,6 @@ SELECT st.*, 'Standby ['||COALESCE(host(client_addr), client_hostname, 'Socket')||']' as name, sl.slot_name, sl.slot_type, sl.active -FROM pg_stat_replication st JOIN pg_replication_slots sl +FROM pg_catalog.pg_stat_replication st JOIN pg_catalog.pg_replication_slots sl ON st.pid = sl.active_pid {% if pid %} WHERE st.pid={{pid}} diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/default/properties.sql index 6705584db26..ad7cb0e218e 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/default/properties.sql @@ -15,8 +15,8 @@ SELECT SELECT CASE WHEN pg.admin_option THEN '1' ELSE '0' END || pg.usename FROM - (SELECT pg_roles.rolname AS usename, pg_auth_members.admin_option AS admin_option FROM pg_roles - JOIN pg_auth_members ON pg_roles.oid=pg_auth_members.member AND pg_auth_members.roleid={{ rid|qtLiteral(conn) }}::oid) pg + (SELECT pg_roles.rolname AS usename, pg_auth_members.admin_option AS admin_option FROM pg_catalog.pg_roles + JOIN pg_catalog.pg_auth_members ON pg_roles.oid=pg_auth_members.member AND pg_auth_members.roleid={{ rid|qtLiteral(conn) }}::oid) pg ) rolmembers {% endif %} FROM diff --git a/web/pgadmin/browser/server_groups/servers/templates/servers/sql/default/replication_type.sql b/web/pgadmin/browser/server_groups/servers/templates/servers/sql/default/replication_type.sql index 50bbc585098..7e7c8c9c2a9 100644 --- a/web/pgadmin/browser/server_groups/servers/templates/servers/sql/default/replication_type.sql +++ b/web/pgadmin/browser/server_groups/servers/templates/servers/sql/default/replication_type.sql @@ -1,7 +1,7 @@ SELECT CASE WHEN (SELECT count(extname) FROM pg_catalog.pg_extension WHERE extname='bdr') > 0 THEN 'pgd' - WHEN (SELECT COUNT(*) FROM pg_replication_slots) > 0 + WHEN (SELECT COUNT(*) FROM pg_catalog.pg_replication_slots) > 0 THEN 'log' ELSE NULL END as type; diff --git a/web/pgadmin/browser/server_groups/servers/tests/servers_test_data.json b/web/pgadmin/browser/server_groups/servers/tests/servers_test_data.json index a5a432c7f23..22c7c9f6ef1 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/servers_test_data.json +++ b/web/pgadmin/browser/server_groups/servers/tests/servers_test_data.json @@ -272,7 +272,7 @@ "url": "/browser/server/obj/", "is_positive_test": true, "test_data": { - "db_res": "SELECT datname FROM pg_database\nWHERE datistemplate = false AND datname ILIKE '%myprefix_%'\nORDER BY datname" + "db_res": "SELECT datname FROM pg_catalog.pg_database\nWHERE datistemplate = false AND datname ILIKE '%myprefix_%'\nORDER BY datname" }, "mocking_required": false, "mock_data": {}, diff --git a/web/pgadmin/dashboard/__init__.py b/web/pgadmin/dashboard/__init__.py index 7100be73db1..e6899fb8613 100644 --- a/web/pgadmin/dashboard/__init__.py +++ b/web/pgadmin/dashboard/__init__.py @@ -698,7 +698,10 @@ def terminate_session(sid=None, did=None, pid=None): @pga_login_required @check_precondition def check_system_statistics(sid=None, did=None): - sql = "SELECT * FROM pg_extension WHERE extname = 'system_stats';" + sql = ( + "SELECT * FROM pg_catalog.pg_extension " + "WHERE extname = 'system_stats';" + ) status, res = g.conn.execute_scalar(sql) if not status: return internal_server_error(errormsg=res) diff --git a/web/pgadmin/dashboard/templates/dashboard/sql/default/replication_slots.sql b/web/pgadmin/dashboard/templates/dashboard/sql/default/replication_slots.sql index f156a6a4c63..2f2f853f327 100644 --- a/web/pgadmin/dashboard/templates/dashboard/sql/default/replication_slots.sql +++ b/web/pgadmin/dashboard/templates/dashboard/sql/default/replication_slots.sql @@ -1 +1 @@ -select * from pg_replication_slots +select * from pg_catalog.pg_replication_slots diff --git a/web/pgadmin/dashboard/templates/dashboard/sql/default/replication_stats.sql b/web/pgadmin/dashboard/templates/dashboard/sql/default/replication_stats.sql index e7e58e98f2d..1cf78416e65 100644 --- a/web/pgadmin/dashboard/templates/dashboard/sql/default/replication_stats.sql +++ b/web/pgadmin/dashboard/templates/dashboard/sql/default/replication_stats.sql @@ -1 +1 @@ -select * from pg_stat_replication +select * from pg_catalog.pg_stat_replication diff --git a/web/pgadmin/llm/__init__.py b/web/pgadmin/llm/__init__.py index 63ee046d997..7e3fc87b569 100644 --- a/web/pgadmin/llm/__init__.py +++ b/web/pgadmin/llm/__init__.py @@ -1174,7 +1174,7 @@ def _gather_security_config(conn, manager): # Get security-related settings from pg_settings settings_query = """ SELECT name, setting, short_desc, context, source - FROM pg_settings + FROM pg_catalog.pg_settings WHERE name IN ( -- Connection settings 'listen_addresses', 'port', 'max_connections', @@ -1215,7 +1215,7 @@ def _gather_security_config(conn, manager): hba_query = """ SELECT line_number, type, database, user_name, address, netmask, auth_method, options, error - FROM pg_hba_file_rules + FROM pg_catalog.pg_hba_file_rules ORDER BY line_number """ @@ -1231,7 +1231,7 @@ def _gather_security_config(conn, manager): superusers_query = """ SELECT rolname, rolcreaterole, rolcreatedb, rolbypassrls, rolconnlimit, rolvaliduntil - FROM pg_roles + FROM pg_catalog.pg_roles WHERE rolsuper = true ORDER BY rolname """ @@ -1246,7 +1246,7 @@ def _gather_security_config(conn, manager): special_roles_query = """ SELECT rolname, rolsuper, rolcreaterole, rolcreatedb, rolreplication, rolbypassrls, rolcanlogin, rolconnlimit - FROM pg_roles + FROM pg_catalog.pg_roles WHERE (rolcreaterole OR rolcreatedb OR rolreplication OR rolbypassrls) AND NOT rolsuper ORDER BY rolname @@ -1261,7 +1261,7 @@ def _gather_security_config(conn, manager): # Get roles with no password expiry that can login no_expiry_query = """ SELECT rolname, rolvaliduntil - FROM pg_roles + FROM pg_catalog.pg_roles WHERE rolcanlogin = true AND (rolvaliduntil IS NULL OR rolvaliduntil = 'infinity') ORDER BY rolname @@ -1276,7 +1276,7 @@ def _gather_security_config(conn, manager): # Check for loaded extensions extensions_query = """ SELECT extname, extversion - FROM pg_extension + FROM pg_catalog.pg_extension ORDER BY extname """ @@ -1459,7 +1459,9 @@ def generate_schema_security_report(sid, did, scid): ) # Get schema name from scid - schema_query = "SELECT nspname FROM pg_namespace WHERE oid = %s" + schema_query = ( + "SELECT nspname FROM pg_catalog.pg_namespace WHERE oid = %s" + ) status, result = conn.execute_dict(schema_query, [scid]) if not status or not result.get('rows'): return make_json_response( @@ -1538,7 +1540,9 @@ def generate_schema_security_report_stream(sid, did, scid): ) # Get schema name from scid - schema_query = "SELECT nspname FROM pg_namespace WHERE oid = %s" + schema_query = ( + "SELECT nspname FROM pg_catalog.pg_namespace WHERE oid = %s" + ) status, result = conn.execute_dict(schema_query, [scid]) if not status or not result.get('rows'): return make_json_response( @@ -1991,7 +1995,9 @@ def generate_schema_design_report(sid, did, scid): ) # Get schema name from scid - schema_query = "SELECT nspname FROM pg_namespace WHERE oid = %s" + schema_query = ( + "SELECT nspname FROM pg_catalog.pg_namespace WHERE oid = %s" + ) status, result = conn.execute_dict(schema_query, [scid]) if not status or not result.get('rows'): return make_json_response( @@ -2070,7 +2076,9 @@ def generate_schema_design_report_stream(sid, did, scid): ) # Get schema name from scid - schema_query = "SELECT nspname FROM pg_namespace WHERE oid = %s" + schema_query = ( + "SELECT nspname FROM pg_catalog.pg_namespace WHERE oid = %s" + ) status, result = conn.execute_dict(schema_query, [scid]) if not status or not result.get('rows'): return make_json_response( diff --git a/web/pgadmin/llm/reports/generator.py b/web/pgadmin/llm/reports/generator.py index 4f04914c3fa..8a8914121c4 100644 --- a/web/pgadmin/llm/reports/generator.py +++ b/web/pgadmin/llm/reports/generator.py @@ -51,7 +51,7 @@ def executor(query_id: str, context: dict) -> dict[str, Any]: if required_ext: check_sql = """ SELECT EXISTS ( - SELECT 1 FROM pg_extension WHERE extname = %s + SELECT 1 FROM pg_catalog.pg_extension WHERE extname = %s ) as available """ status, result = conn.execute_dict(check_sql, [required_ext]) diff --git a/web/pgadmin/llm/reports/queries.py b/web/pgadmin/llm/reports/queries.py index d7b6b5d5ce0..81feb3d2b21 100644 --- a/web/pgadmin/llm/reports/queries.py +++ b/web/pgadmin/llm/reports/queries.py @@ -28,7 +28,7 @@ 'security_settings': { 'sql': """ SELECT name, setting, short_desc, context, source - FROM pg_settings + FROM pg_catalog.pg_settings WHERE name IN ( 'listen_addresses', 'port', 'max_connections', 'superuser_reserved_connections', @@ -46,7 +46,7 @@ 'sql': """ SELECT line_number, type, database, user_name, address, netmask, auth_method, options, error - FROM pg_hba_file_rules + FROM pg_catalog.pg_hba_file_rules ORDER BY line_number LIMIT 50 """, @@ -58,7 +58,7 @@ 'sql': """ SELECT rolname, rolcreaterole, rolcreatedb, rolbypassrls, rolconnlimit, rolvaliduntil - FROM pg_roles + FROM pg_catalog.pg_roles WHERE rolsuper = true ORDER BY rolname """, @@ -69,7 +69,7 @@ 'sql': """ SELECT rolname, rolsuper, rolcreaterole, rolcreatedb, rolreplication, rolbypassrls, rolcanlogin, rolconnlimit - FROM pg_roles + FROM pg_catalog.pg_roles WHERE (rolcreaterole OR rolcreatedb OR rolreplication OR rolbypassrls) AND NOT rolsuper @@ -82,7 +82,7 @@ 'roles_no_expiry': { 'sql': """ SELECT rolname, rolvaliduntil - FROM pg_roles + FROM pg_catalog.pg_roles WHERE rolcanlogin = true AND (rolvaliduntil IS NULL OR rolvaliduntil = 'infinity') ORDER BY rolname @@ -99,7 +99,7 @@ ARRAY(SELECT b.rolname FROM pg_catalog.pg_auth_members m JOIN pg_catalog.pg_roles b ON m.roleid = b.oid WHERE m.member = r.oid) as member_of - FROM pg_roles r + FROM pg_catalog.pg_roles r WHERE r.rolcanlogin = true ORDER BY r.rolname LIMIT 30 @@ -112,7 +112,7 @@ 'sql': """ SELECT datname, pg_catalog.pg_get_userbyid(datdba) as owner, datacl, datconnlimit - FROM pg_database + FROM pg_catalog.pg_database WHERE datname = current_database() """, 'scope': ['database'], @@ -123,7 +123,7 @@ SELECT n.nspname as schema_name, pg_catalog.pg_get_userbyid(n.nspowner) as owner, n.nspacl as acl - FROM pg_namespace n + FROM pg_catalog.pg_namespace n WHERE n.nspname NOT IN ( 'pg_catalog', 'information_schema', 'pg_toast') @@ -143,8 +143,8 @@ c.relacl as acl, c.relrowsecurity as row_security, c.relforcerowsecurity as force_row_security - FROM pg_class c - JOIN pg_namespace n ON n.oid = c.relnamespace + FROM pg_catalog.pg_class c + JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace WHERE c.relkind IN ('r', 'p') AND n.nspname NOT IN ( 'pg_catalog', 'information_schema', @@ -172,9 +172,9 @@ pg_catalog.pg_get_expr( pol.polwithcheck, pol.polrelid ) as check_expr - FROM pg_policy pol - JOIN pg_class c ON c.oid = pol.polrelid - JOIN pg_namespace n ON n.oid = c.relnamespace + FROM pg_catalog.pg_policy pol + JOIN pg_catalog.pg_class c ON c.oid = pol.polrelid + JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace WHERE n.nspname NOT IN ('pg_catalog', 'information_schema') ORDER BY n.nspname, c.relname, pol.polname LIMIT 30 @@ -188,8 +188,8 @@ c.relname as table_name, c.relrowsecurity as row_security, c.relforcerowsecurity as force_row_security - FROM pg_class c - JOIN pg_namespace n ON n.oid = c.relnamespace + FROM pg_catalog.pg_class c + JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace WHERE c.relrowsecurity = true AND n.nspname NOT IN ('pg_catalog', 'information_schema') ORDER BY n.nspname, c.relname @@ -205,8 +205,8 @@ p.proname as function_name, pg_catalog.pg_get_userbyid(p.proowner) as owner, p.proacl as acl - FROM pg_proc p - JOIN pg_namespace n ON n.oid = p.pronamespace + FROM pg_catalog.pg_proc p + JOIN pg_catalog.pg_namespace n ON n.oid = p.pronamespace WHERE p.prosecdef = true AND n.nspname NOT IN ('pg_catalog', 'information_schema') ORDER BY n.nspname, p.proname @@ -219,7 +219,7 @@ 'logging_settings': { 'sql': """ SELECT name, setting, short_desc - FROM pg_settings + FROM pg_catalog.pg_settings WHERE name IN ( 'log_connections', 'log_disconnections', 'log_hostname', 'log_statement', 'log_line_prefix', @@ -235,7 +235,7 @@ 'extensions': { 'sql': """ SELECT extname, extversion - FROM pg_extension + FROM pg_catalog.pg_extension ORDER BY extname """, 'scope': ['server', 'database'], @@ -254,8 +254,8 @@ WHEN 'n' THEN 'schema' END as object_type, d.defaclacl as default_acl - FROM pg_default_acl d - LEFT JOIN pg_namespace n ON n.oid = d.defaclnamespace + FROM pg_catalog.pg_default_acl d + LEFT JOIN pg_catalog.pg_namespace n ON n.oid = d.defaclnamespace ORDER BY role, schema_name, object_type LIMIT 30 """, @@ -270,7 +270,7 @@ 'memory_settings': { 'sql': """ SELECT name, setting, unit, short_desc, context, source - FROM pg_settings + FROM pg_catalog.pg_settings WHERE name IN ( 'shared_buffers', 'effective_cache_size', 'work_mem', 'maintenance_work_mem', 'wal_buffers', 'temp_buffers', @@ -285,7 +285,7 @@ 'checkpoint_settings': { 'sql': """ SELECT name, setting, unit, short_desc - FROM pg_settings + FROM pg_catalog.pg_settings WHERE name IN ( 'checkpoint_completion_target', 'checkpoint_timeout', 'max_wal_size', 'min_wal_size' @@ -298,7 +298,7 @@ 'wal_settings': { 'sql': """ SELECT name, setting, unit, short_desc - FROM pg_settings + FROM pg_catalog.pg_settings WHERE name IN ( 'wal_level', 'synchronous_commit', 'wal_compression', 'wal_writer_delay', 'max_wal_senders' @@ -314,7 +314,7 @@ checkpoint_sync_time, buffers_checkpoint, buffers_clean, maxwritten_clean, buffers_backend, buffers_backend_fsync, buffers_alloc, stats_reset - FROM pg_stat_bgwriter + FROM pg_catalog.pg_stat_bgwriter """, 'scope': ['server'], }, @@ -323,7 +323,7 @@ 'autovacuum_settings': { 'sql': """ SELECT name, setting, unit, short_desc - FROM pg_settings + FROM pg_catalog.pg_settings WHERE name IN ( 'autovacuum', 'autovacuum_max_workers', 'autovacuum_naptime', @@ -348,7 +348,7 @@ last_autovacuum, last_analyze, last_autoanalyze - FROM pg_stat_user_tables + FROM pg_catalog.pg_stat_user_tables WHERE n_dead_tup > 1000 ORDER BY n_dead_tup DESC LIMIT 15 @@ -360,7 +360,7 @@ 'planner_settings': { 'sql': """ SELECT name, setting, unit, short_desc - FROM pg_settings + FROM pg_catalog.pg_settings WHERE name IN ( 'random_page_cost', 'seq_page_cost', 'cpu_tuple_cost', 'cpu_index_tuple_cost', 'cpu_operator_cost', @@ -377,7 +377,7 @@ 'parallel_settings': { 'sql': """ SELECT name, setting, unit, short_desc - FROM pg_settings + FROM pg_catalog.pg_settings WHERE name IN ( 'max_worker_processes', 'max_parallel_workers_per_gather', 'max_parallel_workers', 'max_parallel_maintenance_workers' @@ -391,7 +391,7 @@ 'connection_settings': { 'sql': """ SELECT name, setting, unit, short_desc - FROM pg_settings + FROM pg_catalog.pg_settings WHERE name IN ( 'max_connections', 'superuser_reserved_connections', 'idle_in_transaction_session_timeout', 'idle_session_timeout', @@ -405,12 +405,13 @@ 'active_connections': { 'sql': """ SELECT - (SELECT count(*) FROM pg_stat_activity) as total_connections, - (SELECT count(*) FROM pg_stat_activity + (SELECT count(*) FROM pg_catalog.pg_stat_activity) + as total_connections, + (SELECT count(*) FROM pg_catalog.pg_stat_activity WHERE state = 'active') as active_queries, - (SELECT count(*) FROM pg_stat_activity + (SELECT count(*) FROM pg_catalog.pg_stat_activity WHERE state = 'idle in transaction') as idle_in_transaction, - (SELECT count(*) FROM pg_stat_activity + (SELECT count(*) FROM pg_catalog.pg_stat_activity WHERE state = 'idle') as idle """, 'scope': ['server', 'database'], @@ -429,7 +430,7 @@ tup_updated, tup_deleted, conflicts, temp_files, temp_bytes, deadlocks, stats_reset - FROM pg_stat_database + FROM pg_catalog.pg_stat_database WHERE datname NOT IN ('template0', 'template1') ORDER BY datname """, @@ -445,7 +446,7 @@ (heap_blks_read + heap_blks_hit), 2) ELSE 0 END as cache_hit_ratio, idx_blks_read, idx_blks_hit - FROM pg_statio_user_tables + FROM pg_catalog.pg_statio_user_tables WHERE heap_blks_read + heap_blks_hit > 1000 ORDER BY heap_blks_read DESC LIMIT 15 @@ -462,7 +463,7 @@ n_live_tup, n_dead_tup, last_vacuum, last_autovacuum, last_analyze, last_autoanalyze - FROM pg_stat_user_tables + FROM pg_catalog.pg_stat_user_tables ORDER BY n_dead_tup DESC LIMIT 20 """, @@ -475,8 +476,8 @@ s.indexrelname as index_name, pg_size_pretty(pg_relation_size(s.indexrelid)) as size, s.idx_scan - FROM pg_stat_user_indexes s - JOIN pg_index i ON s.indexrelid = i.indexrelid + FROM pg_catalog.pg_stat_user_indexes s + JOIN pg_catalog.pg_index i ON s.indexrelid = i.indexrelid WHERE s.idx_scan = 0 AND NOT i.indisunique AND NOT i.indisprimary @@ -493,7 +494,7 @@ CASE WHEN seq_scan > 0 THEN round(seq_tup_read::numeric / seq_scan, 0) ELSE 0 END as avg_seq_tup_read - FROM pg_stat_user_tables + FROM pg_catalog.pg_stat_user_tables WHERE seq_scan > idx_scan AND seq_scan > 100 AND n_live_tup > 1000 ORDER BY seq_scan - idx_scan DESC LIMIT 15 @@ -505,7 +506,8 @@ 'stat_statements_check': { 'sql': """ SELECT EXISTS ( - SELECT 1 FROM pg_extension WHERE extname = 'pg_stat_statements' + SELECT 1 FROM pg_catalog.pg_extension + WHERE extname = 'pg_stat_statements' ) as available """, 'scope': ['server', 'database'], @@ -520,7 +522,7 @@ round(mean_exec_time::numeric, 2) as mean_exec_time_ms, rows - FROM pg_stat_statements + FROM pg_catalog.pg_stat_statements ORDER BY total_exec_time DESC LIMIT 10 """, @@ -537,7 +539,7 @@ round(mean_exec_time::numeric, 2) as mean_exec_time_ms, rows - FROM pg_stat_statements + FROM pg_catalog.pg_stat_statements ORDER BY calls DESC LIMIT 10 """, @@ -553,7 +555,7 @@ pg_size_pretty(pg_relation_size(relid)) as table_size, pg_size_pretty(pg_indexes_size(relid)) as indexes_size, n_live_tup as row_count - FROM pg_stat_user_tables + FROM pg_catalog.pg_stat_user_tables ORDER BY pg_total_relation_size(relid) DESC LIMIT 15 """, @@ -576,7 +578,7 @@ pg_wal_lsn_diff( pg_current_wal_lsn(), replay_lsn ) as replay_lag - FROM pg_stat_replication + FROM pg_catalog.pg_stat_replication LIMIT 10 """, 'scope': ['server'], @@ -595,14 +597,14 @@ pg_size_pretty( pg_total_relation_size(c.oid) ) as total_size, - (SELECT count(*) FROM pg_attribute a + (SELECT count(*) FROM pg_catalog.pg_attribute a WHERE a.attrelid = c.oid AND a.attnum > 0 AND NOT a.attisdropped ) as column_count, obj_description(c.oid) as description - FROM pg_class c - JOIN pg_namespace n ON n.oid = c.relnamespace + FROM pg_catalog.pg_class c + JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace WHERE c.relkind IN ('r', 'p') AND n.nspname NOT IN ( 'pg_catalog', 'information_schema', @@ -627,10 +629,10 @@ as default_value, col_description(c.oid, a.attnum) as description - FROM pg_attribute a - JOIN pg_class c ON c.oid = a.attrelid - JOIN pg_namespace n ON n.oid = c.relnamespace - LEFT JOIN pg_attrdef d + FROM pg_catalog.pg_attribute a + JOIN pg_catalog.pg_class c ON c.oid = a.attrelid + JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace + LEFT JOIN pg_catalog.pg_attrdef d ON d.adrelid = a.attrelid AND d.adnum = a.attnum WHERE a.attnum > 0 @@ -656,11 +658,11 @@ array_position(con.conkey, a.attnum)) as columns - FROM pg_constraint con - JOIN pg_class c ON c.oid = con.conrelid - JOIN pg_namespace n + FROM pg_catalog.pg_constraint con + JOIN pg_catalog.pg_class c ON c.oid = con.conrelid + JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace - JOIN pg_attribute a + JOIN pg_catalog.pg_attribute a ON a.attrelid = c.oid AND a.attnum = ANY(con.conkey) WHERE con.contype = 'p' @@ -679,15 +681,15 @@ pg_size_pretty( pg_total_relation_size(c.oid) ) as size - FROM pg_class c - JOIN pg_namespace n ON n.oid = c.relnamespace + FROM pg_catalog.pg_class c + JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace WHERE c.relkind = 'r' AND n.nspname NOT IN ( 'pg_catalog', 'information_schema', 'pg_toast') AND n.nspname NOT LIKE 'pg_temp%' AND NOT EXISTS ( - SELECT 1 FROM pg_constraint con + SELECT 1 FROM pg_catalog.pg_constraint con WHERE con.conrelid = c.oid AND con.contype = 'p' ) ORDER BY pg_total_relation_size(c.oid) DESC @@ -712,18 +714,18 @@ array_position(con.confkey, fa.attnum)) as ref_columns - FROM pg_constraint con - JOIN pg_class c ON c.oid = con.conrelid - JOIN pg_namespace n + FROM pg_catalog.pg_constraint con + JOIN pg_catalog.pg_class c ON c.oid = con.conrelid + JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace - JOIN pg_class fc + JOIN pg_catalog.pg_class fc ON fc.oid = con.confrelid - JOIN pg_namespace fn + JOIN pg_catalog.pg_namespace fn ON fn.oid = fc.relnamespace - JOIN pg_attribute a + JOIN pg_catalog.pg_attribute a ON a.attrelid = c.oid AND a.attnum = ANY(con.conkey) - JOIN pg_attribute fa + JOIN pg_catalog.pg_attribute fa ON fa.attrelid = fc.oid AND fa.attnum = ANY(con.confkey) WHERE con.contype = 'f' @@ -746,11 +748,11 @@ idx.indisprimary as is_primary, pg_get_indexdef(idx.indexrelid) as definition, pg_size_pretty(pg_relation_size(i.oid)) as size - FROM pg_index idx - JOIN pg_class c ON c.oid = idx.indrelid - JOIN pg_class i ON i.oid = idx.indexrelid - JOIN pg_namespace n ON n.oid = c.relnamespace - JOIN pg_am am ON am.oid = i.relam + FROM pg_catalog.pg_index idx + JOIN pg_catalog.pg_class c ON c.oid = idx.indrelid + JOIN pg_catalog.pg_class i ON i.oid = idx.indexrelid + JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace + JOIN pg_catalog.pg_am am ON am.oid = i.relam WHERE n.nspname NOT IN ( 'pg_catalog', 'information_schema', 'pg_toast') @@ -772,11 +774,11 @@ idx.indkey, a.attnum)) as columns, pg_relation_size(i.oid) as size - FROM pg_index idx - JOIN pg_class c ON c.oid = idx.indrelid - JOIN pg_class i ON i.oid = idx.indexrelid - JOIN pg_namespace n ON n.oid = c.relnamespace - JOIN pg_attribute a ON a.attrelid = c.oid + FROM pg_catalog.pg_index idx + JOIN pg_catalog.pg_class c ON c.oid = idx.indrelid + JOIN pg_catalog.pg_class i ON i.oid = idx.indexrelid + JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace + JOIN pg_catalog.pg_attribute a ON a.attrelid = c.oid AND a.attnum = ANY(idx.indkey) WHERE n.nspname NOT IN ('pg_catalog', 'information_schema') GROUP BY n.nspname, c.relname, i.relname, idx.indexrelid, i.oid @@ -803,9 +805,9 @@ c.relname as table_name, con.conname as constraint_name, pg_get_constraintdef(con.oid) as definition - FROM pg_constraint con - JOIN pg_class c ON c.oid = con.conrelid - JOIN pg_namespace n ON n.oid = c.relnamespace + FROM pg_catalog.pg_constraint con + JOIN pg_catalog.pg_class c ON c.oid = con.conrelid + JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace WHERE con.contype = 'c' AND n.nspname NOT IN ('pg_catalog', 'information_schema') ORDER BY n.nspname, c.relname, con.conname @@ -823,11 +825,11 @@ array_position(con.conkey, a.attnum)) as columns - FROM pg_constraint con - JOIN pg_class c ON c.oid = con.conrelid - JOIN pg_namespace n + FROM pg_catalog.pg_constraint con + JOIN pg_catalog.pg_class c ON c.oid = con.conrelid + JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace - JOIN pg_attribute a + JOIN pg_catalog.pg_attribute a ON a.attrelid = c.oid AND a.attnum = ANY(con.conkey) WHERE con.contype = 'u' @@ -847,9 +849,9 @@ array_agg(DISTINCT n.nspname || '.' || c.relname ) as tables - FROM pg_attribute a - JOIN pg_class c ON c.oid = a.attrelid - JOIN pg_namespace n + FROM pg_catalog.pg_attribute a + JOIN pg_catalog.pg_class c ON c.oid = a.attrelid + JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace WHERE a.attnum > 0 AND NOT a.attisdropped @@ -871,8 +873,8 @@ SELECT 'table' as object_type, n.nspname as schema_name, c.relname as name - FROM pg_class c - JOIN pg_namespace n + FROM pg_catalog.pg_class c + JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace WHERE c.relkind IN ('r', 'p') AND n.nspname NOT IN ( @@ -881,9 +883,9 @@ UNION ALL SELECT 'column', n.nspname, c.relname || '.' || a.attname - FROM pg_attribute a - JOIN pg_class c ON c.oid = a.attrelid - JOIN pg_namespace n + FROM pg_catalog.pg_attribute a + JOIN pg_catalog.pg_class c ON c.oid = a.attrelid + JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace WHERE a.attnum > 0 AND NOT a.attisdropped @@ -911,9 +913,9 @@ || a.attname) ELSE NULL END as example_columns - FROM pg_attribute a - JOIN pg_class c ON c.oid = a.attrelid - JOIN pg_namespace n + FROM pg_catalog.pg_attribute a + JOIN pg_catalog.pg_class c ON c.oid = a.attrelid + JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace WHERE a.attnum > 0 AND NOT a.attisdropped @@ -974,7 +976,7 @@ def execute_query( # Check if extension is installed check_sql = """ SELECT EXISTS ( - SELECT 1 FROM pg_extension WHERE extname = %s + SELECT 1 FROM pg_catalog.pg_extension WHERE extname = %s ) as available """ status, result = conn.execute_dict(check_sql, [required_ext]) diff --git a/web/pgadmin/tools/schema_diff/tests/pg/12_plus/source.sql b/web/pgadmin/tools/schema_diff/tests/pg/12_plus/source.sql index d0d8618ceff..9a0ba56f830 100644 --- a/web/pgadmin/tools/schema_diff/tests/pg/12_plus/source.sql +++ b/web/pgadmin/tools/schema_diff/tests/pg/12_plus/source.sql @@ -390,7 +390,7 @@ CREATE VIEW test_schema_diff."test view" AS pg_class.relfilenode, pg_class.reltablespace, pg_class.relpages - FROM pg_class + FROM pg_catalog.pg_class LIMIT 10; diff --git a/web/pgadmin/tools/schema_diff/tests/pg/17_plus/source.sql b/web/pgadmin/tools/schema_diff/tests/pg/17_plus/source.sql index b356290d494..63d84df1b80 100644 --- a/web/pgadmin/tools/schema_diff/tests/pg/17_plus/source.sql +++ b/web/pgadmin/tools/schema_diff/tests/pg/17_plus/source.sql @@ -390,7 +390,7 @@ CREATE VIEW test_schema_diff."test view" AS pg_class.relfilenode, pg_class.reltablespace, pg_class.relpages - FROM pg_class + FROM pg_catalog.pg_class LIMIT 10; diff --git a/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/11_plus/search.sql b/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/11_plus/search.sql index 25ccea65283..b91c8a3329a 100644 --- a/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/11_plus/search.sql +++ b/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/11_plus/search.sql @@ -524,7 +524,7 @@ FROM ( ':schema.'|| ns.oid || ':/' || ns.nspname || '/' || ':aggregate.' || ag.aggfnoid::oid ||':/' || pr.proname AS obj_path, ns.nspname AS schema_name, {{ show_node_prefs['aggregate'] }} AS show_node, pg_catalog.pg_get_function_arguments(aggfnoid::oid) AS other_info - FROM pg_aggregate ag + FROM pg_catalog.pg_aggregate ag LEFT OUTER JOIN pg_catalog.pg_proc pr ON pr.oid = ag.aggfnoid LEFT OUTER JOIN pg_catalog.pg_namespace ns ON ns.oid=pr.pronamespace WHERE ({{ CATALOGS.DB_SUPPORT('ns') }}) diff --git a/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/default/search.sql b/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/default/search.sql index 11634059fd4..f5c610072dd 100644 --- a/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/default/search.sql +++ b/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/default/search.sql @@ -508,7 +508,7 @@ FROM ( ':schema.'|| ns.oid || ':/' || ns.nspname || '/' || ':aggregate.' || ag.aggfnoid::oid ||':/' || pr.proname AS obj_path, ns.nspname AS schema_name, {{ show_node_prefs['aggregate'] }} AS show_node, pg_catalog.pg_get_function_arguments(aggfnoid::oid) AS other_info - FROM pg_aggregate ag + FROM pg_catalog.pg_aggregate ag LEFT OUTER JOIN pg_catalog.pg_proc pr ON pr.oid = ag.aggfnoid LEFT OUTER JOIN pg_catalog.pg_namespace ns ON ns.oid=pr.pronamespace WHERE ({{ CATALOGS.DB_SUPPORT('ns') }}) diff --git a/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/11_plus/search.sql b/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/11_plus/search.sql index abfea8c7261..74dd9c560c6 100644 --- a/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/11_plus/search.sql +++ b/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/11_plus/search.sql @@ -585,7 +585,7 @@ FROM ( ':schema.'|| ns.oid || ':/' || ns.nspname || '/' || ':aggregate.' || ag.aggfnoid::oid ||':/' || pr.proname AS obj_path, ns.nspname AS schema_name, {{ show_node_prefs['aggregate'] }} AS show_node, pg_catalog.pg_get_function_arguments(aggfnoid::oid) AS other_info - FROM pg_aggregate ag + FROM pg_catalog.pg_aggregate ag LEFT OUTER JOIN pg_catalog.pg_proc pr ON pr.oid = ag.aggfnoid LEFT OUTER JOIN pg_catalog.pg_namespace ns ON ns.oid=pr.pronamespace WHERE ({{ CATALOGS.DB_SUPPORT('ns') }}) diff --git a/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/12_plus/search.sql b/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/12_plus/search.sql index 781dbbb27c2..5f872224d39 100644 --- a/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/12_plus/search.sql +++ b/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/12_plus/search.sql @@ -109,7 +109,7 @@ FROM ( JOIN pg_catalog.pg_class cls ON cls.oid=indexrelid JOIN pg_catalog.pg_class tab ON tab.oid=indrelid JOIN pg_catalog.pg_namespace n ON n.oid=tab.relnamespace - LEFT JOIN pg_catalog.pg_depend dep ON (dep.classid = cls.tableoid AND dep.objid = cls.oid AND dep.refobjsubid = '0' AND dep.refclassid=(SELECT oid FROM pg_class WHERE relname='pg_constraint') AND dep.deptype='i') + LEFT JOIN pg_catalog.pg_depend dep ON (dep.classid = cls.tableoid AND dep.objid = cls.oid AND dep.refobjsubid = '0' AND dep.refclassid=(SELECT oid FROM pg_catalog.pg_class WHERE relname='pg_constraint') AND dep.deptype='i') LEFT OUTER JOIN pg_catalog.pg_constraint con ON (con.tableoid = dep.refclassid AND con.oid = dep.refobjid) LEFT OUTER JOIN pg_catalog.pg_description des ON des.objoid=cls.oid LEFT OUTER JOIN pg_catalog.pg_description desp ON (desp.objoid=con.oid AND desp.objsubid = 0) @@ -594,7 +594,7 @@ FROM ( ':schema.'|| ns.oid || ':/' || ns.nspname || '/' || ':aggregate.' || ag.aggfnoid::oid ||':/' || pr.proname AS obj_path, ns.nspname AS schema_name, {{ show_node_prefs['aggregate'] }} AS show_node, pg_catalog.pg_get_function_arguments(aggfnoid::oid) AS other_info - FROM pg_aggregate ag + FROM pg_catalog.pg_aggregate ag LEFT OUTER JOIN pg_catalog.pg_proc pr ON pr.oid = ag.aggfnoid LEFT OUTER JOIN pg_catalog.pg_namespace ns ON ns.oid=pr.pronamespace WHERE ({{ CATALOGS.DB_SUPPORT('ns') }}) diff --git a/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/default/search.sql b/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/default/search.sql index 1ff4b561bd8..ccd2266356a 100644 --- a/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/default/search.sql +++ b/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/default/search.sql @@ -585,7 +585,7 @@ FROM ( ':schema.'|| ns.oid || ':/' || ns.nspname || '/' || ':aggregate.' || ag.aggfnoid::oid ||':/' || pr.proname AS obj_path, ns.nspname AS schema_name, {{ show_node_prefs['aggregate'] }} AS show_node, pg_catalog.pg_get_function_arguments(aggfnoid::oid) AS other_info - FROM pg_aggregate ag + FROM pg_catalog.pg_aggregate ag LEFT OUTER JOIN pg_catalog.pg_proc pr ON pr.oid = ag.aggfnoid LEFT OUTER JOIN pg_catalog.pg_namespace ns ON ns.oid=pr.pronamespace WHERE ({{ CATALOGS.DB_SUPPORT('ns') }}) diff --git a/web/pgadmin/utils/__init__.py b/web/pgadmin/utils/__init__.py index 7f2136d99f5..6417271d361 100644 --- a/web/pgadmin/utils/__init__.py +++ b/web/pgadmin/utils/__init__.py @@ -999,7 +999,10 @@ def get_safe_post_logout_redirect(): def check_extension_exists(conn, extension_name): - sql = f"SELECT * FROM pg_extension WHERE extname = '{extension_name}'" + sql = ( + "SELECT * FROM pg_catalog.pg_extension " + f"WHERE extname = '{extension_name}'" + ) status, res = conn.execute_scalar(sql) if status: if res: diff --git a/web/pgadmin/utils/driver/psycopg3/connection.py b/web/pgadmin/utils/driver/psycopg3/connection.py index 47ab25b7660..cee6633984d 100644 --- a/web/pgadmin/utils/driver/psycopg3/connection.py +++ b/web/pgadmin/utils/driver/psycopg3/connection.py @@ -447,7 +447,8 @@ def _set_role(self, manager, cur, conn_id, **kwargs): role = manager.role if is_set_role: - _query = "SELECT rolname from pg_roles WHERE rolname = {0}" \ + _query = "SELECT rolname from pg_catalog.pg_roles " \ + "WHERE rolname = {0}" \ "".format(self.qtLiteral(role, self.conn)) _status, res = self.execute_scalar(_query) @@ -516,7 +517,8 @@ def _initialize(self, conn_id, **kwargs): status, cur = self.__cursor() - # Note that we use 'UPDATE pg_settings' for setting bytea_output as a + # Note that we use 'UPDATE pg_catalog.pg_settings' for setting + # bytea_output as a # convenience hack for those running on old, unsupported versions of # PostgreSQL 'cos we're nice like that. status = self._execute( @@ -627,12 +629,12 @@ def _set_user_info(self, cur, manager, **kwargs): CASE WHEN roles.rolsuper THEN true ELSE roles.rolcreatedb END as can_create_db, CASE WHEN 'pg_signal_backend'=ANY(ARRAY(WITH RECURSIVE cte AS ( - SELECT pg_roles.oid,pg_roles.rolname FROM pg_roles + SELECT pg_roles.oid,pg_roles.rolname FROM pg_catalog.pg_roles WHERE pg_roles.oid = roles.oid UNION ALL SELECT m.roleid,pgr.rolname FROM cte cte_1 - JOIN pg_auth_members m ON m.member = cte_1.oid - JOIN pg_roles pgr ON pgr.oid = m.roleid) + JOIN pg_catalog.pg_auth_members m ON m.member = cte_1.oid + JOIN pg_catalog.pg_roles pgr ON pgr.oid = m.roleid) SELECT rolname FROM cte)) THEN True ELSE False END as can_signal_backend FROM diff --git a/web/regression/python_test_utils/test_utils.py b/web/regression/python_test_utils/test_utils.py index e40c82a8e4d..cb2991921c1 100644 --- a/web/regression/python_test_utils/test_utils.py +++ b/web/regression/python_test_utils/test_utils.py @@ -563,14 +563,14 @@ def drop_database(connection, database_name): if connection.info.server_version >= 90100: pg_cursor.execute( "SELECT pg_terminate_backend(pg_stat_activity.pid) " - "FROM pg_stat_activity " + "FROM pg_catalog.pg_stat_activity " "WHERE pg_stat_activity.datname ='%s' AND " "pid <> pg_backend_pid();" % database_name ) else: pg_cursor.execute( "SELECT pg_terminate_backend(procpid) " - "FROM pg_stat_activity " + "FROM pg_catalog.pg_stat_activity " "WHERE pg_stat_activity.datname ='%s' " "AND current_query='';" % database_name ) @@ -597,14 +597,14 @@ def drop_database_multiple(connection, database_names): if get_server_version(connection) >= 90100: pg_cursor.execute( "SELECT pg_terminate_backend(pg_stat_activity.pid) " - "FROM pg_stat_activity " + "FROM pg_catalog.pg_stat_activity " "WHERE pg_stat_activity.datname ='%s' AND " "pid <> pg_backend_pid();" % database_name ) else: pg_cursor.execute( "SELECT pg_terminate_backend(procpid) " - "FROM pg_stat_activity " + "FROM pg_catalog.pg_stat_activity " "WHERE pg_stat_activity.datname ='%s' " "AND current_query='';" % database_name ) @@ -1907,7 +1907,7 @@ def module_patch(*args): def check_extension_exists(cursor, extension_name): - cursor.execute(f"""SELECT COUNT(*) FROM pg_extension + cursor.execute(f"""SELECT COUNT(*) FROM pg_catalog.pg_extension WHERE extname='{extension_name}'""") res = cursor.fetchone() return res diff --git a/web/regression/re_sql/tests/test_resql.py b/web/regression/re_sql/tests/test_resql.py index 91fdc7a48d5..952329e1044 100644 --- a/web/regression/re_sql/tests/test_resql.py +++ b/web/regression/re_sql/tests/test_resql.py @@ -848,11 +848,13 @@ def preprocess_expected_sql(self, scenario, sql, resp_sql, object_id): # Fetch the lc_collate and lc_ctype pg_cursor.execute( - "SELECT datcollate as cname FROM pg_database WHERE datname = " + "SELECT datcollate as cname FROM pg_catalog.pg_database " + "WHERE datname = " "'{0}'".format(db_name)) lc_collate = ''.join(pg_cursor.fetchone()) pg_cursor.execute( - "SELECT datctype as cname FROM pg_database WHERE datname = " + "SELECT datctype as cname FROM pg_catalog.pg_database " + "WHERE datname = " "'{0}'".format(db_name)) lc_ctype = ''.join(pg_cursor.fetchone()) pg_cursor.close()