From 9d985d3d8ffa1438f292b66d7f98ec90c69e12c1 Mon Sep 17 00:00:00 2001 From: Aditya Toshniwal Date: Fri, 30 Jul 2021 13:28:07 +0530 Subject: [PATCH] Fixed potential bug in the table node. --- .../servers/databases/schemas/tables/__init__.py | 6 +++--- .../server_groups/servers/databases/schemas/tables/utils.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py index a1a95524e..2653ac4da 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py @@ -823,9 +823,9 @@ class TableView(BaseTableView, DataTypeReader, SchemaDiffTableCompare): if 'relacl' in data: data['relacl'] = parse_priv_to_db(data['relacl'], self.acl) - # Parse & format columns - data = column_utils.parse_format_columns(data) - data = TableView.check_and_convert_name_to_string(data) + # Parse & format columns + data = column_utils.parse_format_columns(data) + data = TableView.check_and_convert_name_to_string(data) # 'coll_inherits' is Array but it comes as string from browser # We will convert it again to list diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py index 1674f2d7d..593f14d1b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py @@ -1473,7 +1473,7 @@ class BaseTableView(PGChildNodeView, BasePartitionTable, VacuumSettings): else: error, errmsg = BaseTableView._check_for_create_sql(data) if error: - return gettext('-- definition incomplete') + return gettext('-- definition incomplete'), data['name'] # validate constraint data. self._validate_constraint_data(data)