IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix param

Browse Source
This commit is contained in:
Aleksandr Smyslov 2024-12-12 12:57:44 +01:00
parent 63628bba47
commit fb66672acd
4 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/pgadmin/browser/server_groups/servers/databases/schemas/views/schema_diff_view_utils.py
View File

@ -81,7 +81,7 @@ class SchemaDiffViewCompare(SchemaDiffObjectCompare):
ignore_owner=ignore_owner,
ignore_whitespaces=ignore_whitespaces,
ignore_tablespace=ignore_tablespace,
ignore_grants=ignore_grants
ignore_grants=ignore_grants,
ignore_partitions=ignore_partitions)
def ddl_compare(self, **kwargs):

27
web/pgadmin/tools/schema_diff/__init__.py
View File

@ -485,6 +485,8 @@ def compare_database(params):
ignore_whitespaces = bool(params['ignore_whitespaces'])
ignore_tablespace = bool(params['ignore_tablespace'])
ignore_grants = bool(params['ignore_grants'])
ignore_partitions = bool(params['ignore_partitions'])
# Fetch all the schemas of source and target database
# Compare them and get the status.
@ -514,7 +516,8 @@ def compare_database(params):
node_percent=node_percent, ignore_owner=ignore_owner,
ignore_whitespaces=ignore_whitespaces,
ignore_tablespace=ignore_tablespace,
ignore_grants=ignore_grants)
ignore_grants=ignore_grants,
ignore_partitions=ignore_partitions)
comparison_result = \
comparison_result + comparison_schema_result
@ -538,7 +541,8 @@ def compare_database(params):
ignore_owner=ignore_owner,
ignore_whitespaces=ignore_whitespaces,
ignore_tablespace=ignore_tablespace,
ignore_grants=ignore_grants)
ignore_grants=ignore_grants,
ignore_partitions=ignore_partitions)
comparison_result = \
comparison_result + comparison_schema_result
@ -561,7 +565,8 @@ def compare_database(params):
ignore_owner=ignore_owner,
ignore_whitespaces=ignore_whitespaces,
ignore_tablespace=ignore_tablespace,
ignore_grants=ignore_grants)
ignore_grants=ignore_grants,
ignore_partitions=ignore_partitions)
comparison_result = \
comparison_result + comparison_schema_result
@ -586,7 +591,8 @@ def compare_database(params):
ignore_owner=ignore_owner,
ignore_whitespaces=ignore_whitespaces,
ignore_tablespace=ignore_tablespace,
ignore_grants=ignore_grants)
ignore_grants=ignore_grants,
ignore_partitions=ignore_partitions)
comparison_result = \
comparison_result + comparison_schema_result
@ -631,6 +637,8 @@ def compare_schema(params):
ignore_whitespaces = bool(params['ignore_whitespaces'])
ignore_tablespace = bool(params['ignore_tablespace'])
ignore_grants = bool(params['ignore_grants'])
ignore_partitions = bool(params['ignore_partitions'])
all_registered_nodes = SchemaDiffRegistry.get_registered_nodes()
node_percent = round(100 / len(all_registered_nodes), 2)
total_percent = 0
@ -651,7 +659,8 @@ def compare_schema(params):
ignore_owner=ignore_owner,
ignore_whitespaces=ignore_whitespaces,
ignore_tablespace=ignore_tablespace,
ignore_grants=ignore_grants)
ignore_grants=ignore_grants,
ignore_partitions=ignore_partitions)
comparison_result = \
comparison_result + comparison_schema_result
@ -787,6 +796,7 @@ def compare_database_objects(**kwargs):
ignore_whitespaces = kwargs.get('ignore_whitespaces')
ignore_tablespace = kwargs.get('ignore_tablespace')
ignore_grants = kwargs.get('ignore_grants')
ignore_partitions = kwargs.get('ignore_partitions')
comparison_result = []
all_registered_nodes = SchemaDiffRegistry.get_registered_nodes(None,
@ -812,7 +822,8 @@ def compare_database_objects(**kwargs):
ignore_owner=ignore_owner,
ignore_whitespaces=ignore_whitespaces,
ignore_tablespace=ignore_tablespace,
ignore_grants=ignore_grants)
ignore_grants=ignore_grants,
ignore_partitions=ignore_partitions)
if res is not None:
comparison_result = comparison_result + res
@ -845,6 +856,7 @@ def compare_schema_objects(**kwargs):
ignore_whitespaces = kwargs.get('ignore_whitespaces')
ignore_tablespace = kwargs.get('ignore_tablespace')
ignore_grants = kwargs.get('ignore_grants')
ignore_partitions = kwargs.get('ignore_partitions')
source_schema_name = None
if is_schema_source_only:
@ -883,7 +895,8 @@ def compare_schema_objects(**kwargs):
ignore_owner=ignore_owner,
ignore_whitespaces=ignore_whitespaces,
ignore_tablespace=ignore_tablespace,
ignore_grants=ignore_grants)
ignore_grants=ignore_grants,
ignore_partitions=ignore_partitions)
if res is not None:
comparison_result = comparison_result + res

2
web/pgadmin/tools/schema_diff/compare.py
View File

@ -107,7 +107,7 @@ class SchemaDiffObjectCompare:
ignore_owner=ignore_owner,
ignore_whitespaces=ignore_whitespaces,
ignore_tablespace=ignore_tablespace,
ignore_grants=ignore_grants
ignore_grants=ignore_grants,
ignore_partitions=ignore_partitions)
def ddl_compare(self, **kwargs):

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

@ -493,7 +493,7 @@ def compare_dictionaries(**kwargs):
"group_name": group_name,
"target_schema": target_schema,
"ignore_whitespaces": ignore_whitespaces,
"ignore_grants": ignore_grants
"ignore_grants": ignore_grants,
"ignore_partitions": ignore_partitions
}