pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed an issue where the wrong schema is displayed for a foreign key in the schema diff tool. #5488

pull/5587/head
Akshay Joshi 2022-11-28 17:27:21 +05:30
parent 7710d5e21c
commit 83bfdf9b3c
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/en_US/release_notes_6_17.rst
View File

@ -25,7 +25,9 @@ Housekeeping
Bug fixes
*********
| `Issue #5488 <https://github.com/pgadmin-org/pgadmin4/issues/5488>`_ - Fixed an issue where the wrong schema is displayed for a foreign key in the schema diff tool.
| `Issue #5495 <https://github.com/pgadmin-org/pgadmin4/issues/5495>`_ - Ensure that the query history date format in Desktop mode matches the format of the locale of the pgadmin server.
| `Issue #5505 <https://github.com/pgadmin-org/pgadmin4/issues/5505>`_ - Fixed an issue where the CSV file would not download if the CSV quote character length exceeded 1.
| `Issue #5513 <https://github.com/pgadmin-org/pgadmin4/issues/5513>`_ - Ensure that DATA_DIR dependent folders/files are automatically created inside the specified DATA_DIR if they are not specified separately in the configuration file.
| `Issue #5548 <https://github.com/pgadmin-org/pgadmin4/issues/5548>`_ - Fixed an issue where editor position was wrong when editing data from result grid.
| `Issue #5575 <https://github.com/pgadmin-org/pgadmin4/issues/5575>`_ - Ensure the query tool is launched successfully for the servers registered with the PostgreSQL service.

4
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/utils.py
View File

@ -355,8 +355,8 @@ def _checks_for_schema_diff(table, schema, data):
if 'remote_schema' not in data:
data['remote_schema'] = None
elif 'schema' in data and (schema is None or schema == ''):
data['remote_schema'] = data['schema']
if 'schema' in data and (schema is None or schema == ''):
data['remote_schema'] = data['schema']
if 'remote_table' not in data:
data['remote_table'] = None

3
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/schema_diff_utils.py
View File

@ -30,7 +30,8 @@ class SchemaDiffTableCompare(SchemaDiffObjectCompare):
constraint_keys_to_ignore = ['relname', 'nspname', 'parent_tbl',
'attrelid', 'adrelid', 'fknsp', 'confrelid',
'references', 'refnsp', 'remote_schema',
'conkey', 'indkey', 'references_table_name']
'conkey', 'indkey', 'references_table_name',
'refnspoid']
trigger_keys_to_ignore = ['xmin', 'tgrelid', 'tgfoid', 'tfunction',
'tgqual', 'tgconstraint']

1
web/pgadmin/tools/schema_diff/directory_compare.py
View File

@ -13,7 +13,6 @@ import copy
import string
from pgadmin.tools.schema_diff.model import SchemaDiffModel
from flask import current_app
from pgadmin.utils.preferences import Preferences
from pgadmin.utils.constants import PGADMIN_STRING_SEPARATOR
count = 1