From e095d382b3094076dfc5b4265ed67a4ebc3ce133 Mon Sep 17 00:00:00 2001 From: Pradip Parkale Date: Sun, 27 Jun 2021 19:00:16 +0530 Subject: [PATCH] Fixed an issue where incorrect column name listed in the properties of Index. Fixes #6557 --- docs/en_US/release_notes_5_5.rst | 1 + .../servers/databases/schemas/tables/indexes/utils.py | 4 ++-- .../datagrid/tests/test_data_grid_update_connection.py | 10 ---------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/docs/en_US/release_notes_5_5.rst b/docs/en_US/release_notes_5_5.rst index ae8e8c6d6..6636a0539 100644 --- a/docs/en_US/release_notes_5_5.rst +++ b/docs/en_US/release_notes_5_5.rst @@ -27,3 +27,4 @@ Bug fixes | `Issue #6541 `_ - Ensure that setting 'Open in new browser tab' should be visible, it should not be based on the value of 'ENABLE_PSQL'. | `Issue #6547 `_ - Fixed copy/paste issues for PSQL tool terminal. | `Issue #6555 `_ - Fixed Czech translation string for 'Login' keyword. +| `Issue #6557 `_ - Fixed an issue where incorrect column name listed in the properties of Index. diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/utils.py index 6f3bb869b..d8556f11e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/utils.py @@ -130,8 +130,8 @@ def get_column_details(conn, idx, data, mode='properties', template_path=None): # We need same data as string to display in properties window # If multiple column then separate it by colon - cols_str = row['attdef'] - cols_str += _get_column_property_display_data(row, cols_str, data) + cols_str = '' + cols_str += _get_column_property_display_data(row, row['attdef'], data) cols.append(cols_str) diff --git a/web/pgadmin/tools/datagrid/tests/test_data_grid_update_connection.py b/web/pgadmin/tools/datagrid/tests/test_data_grid_update_connection.py index 42aa1aeaf..9228ffb15 100644 --- a/web/pgadmin/tools/datagrid/tests/test_data_grid_update_connection.py +++ b/web/pgadmin/tools/datagrid/tests/test_data_grid_update_connection.py @@ -117,15 +117,5 @@ class DatagridUpdateConnectionTestCase(BaseTestGenerator): def tearDown(self): """This function disconnect database.""" - # Delete role of created - # if self.is_create_role: - # connection = utils.get_db_connection(self.server['db'], - # self.server['username'], - # self.server['db_password'], - # self.server['host'], - # self.server['port'], - # self.server['sslmode']) - # roles_utils.delete_role(connection, self.role_name) - database_utils.disconnect_database(self, self.sid, self.did)