Skip to content

chore: Add pg_catalog schema prefix to catalog table queries #10004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mzabuawala wants to merge 3 commits into
base: master
Choose a base branch
from
Open

chore: Add pg_catalog schema prefix to catalog table queries #10004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64cd12d
chore: Add pg_catalog schema prefix to catalog table queries
mzabuawala Jun 5, 2026
6f9bb55
chore: fixed tests
mzabuawala Jun 5, 2026
cd1892d
chore: fixed lint issues
mzabuawala Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/pgadmin/browser/server_groups/servers/databases/dbms_job_scheduler/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion web/pgadmin/browser/server_groups/servers/databases/dbms_job_scheduler/tests/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
3 changes: 2 additions & 1 deletion web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
Expand Down
2 changes: 1 addition & 1 deletion ...es/foreign_data_wrappers/foreign_servers/templates/foreign_servers/sql/default/delete.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 ============= #}
Expand Down
3 changes: 2 additions & 1 deletion web/pgadmin/browser/server_groups/servers/databases/languages/tests/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand Down
6 changes: 3 additions & 3 deletions ...roups/servers/databases/publications/templates/publications/pg/15_plus/sql/get_tables.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
3 changes: 1 addition & 2 deletions .../servers/databases/publications/templates/publications/pg/default/sql/get_all_columns.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
4 changes: 2 additions & 2 deletions ...roups/servers/databases/publications/templates/publications/pg/default/sql/get_tables.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
6 changes: 3 additions & 3 deletions ...ups/servers/databases/publications/templates/publications/ppas/15_plus/sql/get_tables.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
3 changes: 1 addition & 2 deletions ...ervers/databases/publications/templates/publications/ppas/default/sql/get_all_columns.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
4 changes: 2 additions & 2 deletions ...ups/servers/databases/publications/templates/publications/ppas/default/sql/get_tables.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
4 changes: 2 additions & 2 deletions ...oups/servers/databases/schemas/aggregates/templates/aggregates/sql/11_plus/properties.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...er_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/default/nodes.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...oups/servers/databases/schemas/aggregates/templates/aggregates/sql/default/properties.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions ...rver_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ''
Expand Down Expand Up @@ -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 = ''
Expand Down Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions ...ups/servers/databases/schemas/functions/templates/functions/pg/sql/13_plus/properties.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ''
Expand Down
4 changes: 2 additions & 2 deletions ...ups/servers/databases/schemas/functions/templates/functions/pg/sql/14_plus/properties.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ''
Expand Down
4 changes: 2 additions & 2 deletions ...s/servers/databases/schemas/functions/templates/functions/ppas/sql/13_plus/properties.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions ...s/servers/databases/schemas/functions/templates/functions/ppas/sql/14_plus/properties.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions ...ps/servers/databases/schemas/functions/templates/procedures/pg/sql/13_plus/properties.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
(
Expand Down
4 changes: 2 additions & 2 deletions ...ps/servers/databases/schemas/functions/templates/procedures/pg/sql/14_plus/properties.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
(
Expand Down
4 changes: 2 additions & 2 deletions .../servers/databases/schemas/functions/templates/procedures/ppas/sql/13_plus/properties.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
(
Expand Down
4 changes: 2 additions & 2 deletions .../servers/databases/schemas/functions/templates/procedures/ppas/sql/14_plus/properties.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Comment thread
mzabuawala marked this conversation as resolved.
synonym = pg_cursor.fetchone()
connection.close()
Expand Down
7 changes: 4 additions & 3 deletions web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ''
Expand Down Expand Up @@ -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 = ''
Expand Down Expand Up @@ -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()
Expand Down
3 changes: 2 additions & 1 deletion ...s/databases/schemas/tables/templates/foreign_key/sql/tests/test_foreign_key_properties.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'")
Expand Down
2 changes: 1 addition & 1 deletion ...rver_groups/servers/databases/schemas/tables/templates/indexes/sql/11_plus/properties.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions ...rver_groups/servers/databases/schemas/tables/templates/indexes/sql/13_plus/properties.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions ...rver_groups/servers/databases/schemas/tables/templates/indexes/sql/15_plus/properties.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion ...er/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/nodes.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...rver_groups/servers/databases/schemas/tables/templates/indexes/sql/default/properties.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...er_groups/servers/databases/schemas/tables/templates/tables/sql/11_plus/get_collation.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...vers/databases/schemas/tables/templates/tables/sql/12_plus/get_tables_for_constraints.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 %}
Expand Down
2 changes: 1 addition & 1 deletion ...vers/databases/schemas/tables/templates/tables/sql/default/get_tables_for_constraints.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 %}
Expand Down
Loading
Loading