IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2026-08-17 16:34:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: filtering pg_attribute only by attname can return the wrong attnum if the column name exists in multiple table (#10013)

Browse Source
This commit is contained in:
Murtuza Zabuawala
2026-06-07 18:47:39 +05:30
committed by GitHub
parent 291a55ec5a
commit c7d2106462
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/utils.py
+10 -4
View File
@@ -112,8 +112,11 @@ def create_column(server, db_name, schema_name, table_name, col_name,
connection.commit() connection.commit()
# Get column position of newly added column # Get column position of newly added column
pg_cursor.execute( pg_cursor.execute(
"select attnum from pg_catalog.pg_attribute where attname=%s", "SELECT a.attnum FROM pg_catalog.pg_attribute a "
(col_name,) "JOIN pg_catalog.pg_class c ON c.oid = a.attrelid "
"JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace "
"WHERE n.nspname=%s AND c.relname=%s AND a.attname=%s",
(schema_name, table_name, col_name,)
) )
col = pg_cursor.fetchone() col = pg_cursor.fetchone()
col_pos = '' col_pos = ''
@@ -163,8 +166,11 @@ def create_identity_column(server, db_name, schema_name, table_name,
connection.commit() connection.commit()
# Get column position of newly added column # Get column position of newly added column
pg_cursor.execute( pg_cursor.execute(
"select attnum from pg_catalog.pg_attribute where attname=%s", "SELECT a.attnum FROM pg_catalog.pg_attribute a "
(col_name,) "JOIN pg_catalog.pg_class c ON c.oid = a.attrelid "
"JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace "
"WHERE n.nspname=%s AND c.relname=%s AND a.attname=%s",
(schema_name, table_name, col_name,)
) )
col = pg_cursor.fetchone() col = pg_cursor.fetchone()
col_pos = '' col_pos = ''
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/utils.py
+10 -4
View File
@@ -112,8 +112,11 @@ def create_column(server, db_name, schema_name, table_name, col_name,
connection.commit() connection.commit()
# Get column position of newly added column # Get column position of newly added column
pg_cursor.execute( pg_cursor.execute(
"select attnum from pg_catalog.pg_attribute where attname=%s", "SELECT a.attnum FROM pg_catalog.pg_attribute a "
(col_name,) "JOIN pg_catalog.pg_class c ON c.oid = a.attrelid "
"JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace "
"WHERE n.nspname=%s AND c.relname=%s AND a.attname=%s",
(schema_name, table_name, col_name,)
) )
col = pg_cursor.fetchone() col = pg_cursor.fetchone()
col_pos = '' col_pos = ''
@@ -163,8 +166,11 @@ def create_identity_column(server, db_name, schema_name, table_name,
connection.commit() connection.commit()
# Get column position of newly added column # Get column position of newly added column
pg_cursor.execute( pg_cursor.execute(
"select attnum from pg_catalog.pg_attribute where attname=%s", "SELECT a.attnum FROM pg_catalog.pg_attribute a "
(col_name,) "JOIN pg_catalog.pg_class c ON c.oid = a.attrelid "
"JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace "
"WHERE n.nspname=%s AND c.relname=%s AND a.attname=%s",
(schema_name, table_name, col_name,)
) )
col = pg_cursor.fetchone() col = pg_cursor.fetchone()
col_pos = '' col_pos = ''
web/pgadmin/dashboard/__init__.py
+1 -1
View File
@@ -699,7 +699,7 @@ def terminate_session(sid=None, did=None, pid=None):
@check_precondition @check_precondition
def check_system_statistics(sid=None, did=None): def check_system_statistics(sid=None, did=None):
sql = ( sql = (
"SELECT * FROM pg_catalog.pg_extension " "SELECT 1 FROM pg_catalog.pg_extension "
"WHERE extname = 'system_stats';" "WHERE extname = 'system_stats';"
) )
status, res = g.conn.execute_scalar(sql) status, res = g.conn.execute_scalar(sql)