Fixed following SoanrQube issues 1) Rename field "node_type" to prevent any misunderstanding/clash with field "NODE_TYPE" defined. 2) Define a constant instead of duplicating this literal.
Solution: 1) Rename the field "NODE_TYPE" and "COLLECTION_LABEL" to "_NODE_TYPE" and "_COLLECTION_LABEL" 2) Declare the constant in PGChildNodeView for SQL files. Branch ------ master Details ------- https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=703faf3b155ab243f4d0463d34576a91615d1ed1 Modified Files -------------- web/pgadmin/browser/collection.py | 8 ++-- web/pgadmin/browser/server_groups/__init__.py | 10 ++--- .../browser/server_groups/servers/__init__.py | 12 ++--- .../server_groups/servers/databases/__init__.py | 44 +++++++++---------- .../servers/databases/casts/__init__.py | 29 ++++++------ .../servers/databases/event_triggers/__init__.py | 43 +++++++++--------- .../servers/databases/extensions/__init__.py | 35 ++++++++------- .../servers/databases/external_tables/__init__.py | 8 ++-- .../databases/foreign_data_wrappers/__init__.py | 42 ++++++++++-------- .../foreign_servers/__init__.py | 51 +++++++++++++--------- .../foreign_servers/user_mappings/__init__.py | 47 +++++++++++--------- .../servers/databases/languages/__init__.py | 39 +++++++++-------- .../servers/databases/schemas/__init__.py | 10 ++--- .../databases/schemas/catalog_objects/__init__.py | 14 +++--- .../schemas/catalog_objects/columns/__init__.py | 12 ++--- .../databases/schemas/collations/__init__.py | 38 ++++++++-------- .../servers/databases/schemas/domains/__init__.py | 37 ++++++++-------- .../schemas/domains/domain_constraints/__init__.py | 30 ++++++------- .../databases/schemas/foreign_tables/__init__.py | 34 ++++++++------- .../schemas/fts_configurations/__init__.py | 40 ++++++++--------- .../databases/schemas/fts_dictionaries/__init__.py | 49 +++++++++++---------- .../databases/schemas/fts_parsers/__init__.py | 42 +++++++++--------- .../databases/schemas/fts_templates/__init__.py | 47 +++++++++++--------- .../databases/schemas/functions/__init__.py | 44 ++++++++++--------- .../servers/databases/schemas/packages/__init__.py | 45 ++++++++++--------- .../schemas/packages/edbfuncs/__init__.py | 19 ++++---- .../databases/schemas/packages/edbvars/__init__.py | 15 ++++--- .../databases/schemas/sequences/__init__.py | 40 ++++++++--------- .../servers/databases/schemas/synonyms/__init__.py | 32 +++++++------- .../servers/databases/schemas/tables/__init__.py | 38 ++++++++-------- .../databases/schemas/tables/columns/__init__.py | 30 ++++++------- .../schemas/tables/compound_triggers/__init__.py | 32 +++++++------- .../schemas/tables/constraints/__init__.py | 6 +-- .../constraints/check_constraint/__init__.py | 30 ++++++------- .../constraints/exclusion_constraint/__init__.py | 30 ++++++------- .../tables/constraints/foreign_key/__init__.py | 28 ++++++------ .../constraints/index_constraint/__init__.py | 40 ++++++++--------- .../databases/schemas/tables/indexes/__init__.py | 26 +++++------ .../schemas/tables/partitions/__init__.py | 29 ++++++------ .../tables/row_security_policies/__init__.py | 21 ++++----- .../databases/schemas/tables/rules/__init__.py | 38 ++++++++-------- .../databases/schemas/tables/schema_diff_utils.py | 14 +++--- .../databases/schemas/tables/triggers/__init__.py | 30 ++++++------- .../servers/databases/schemas/tables/utils.py | 48 ++++++++++---------- .../servers/databases/schemas/types/__init__.py | 42 +++++++++--------- .../servers/databases/schemas/views/__init__.py | 14 +++--- .../server_groups/servers/pgagent/__init__.py | 26 +++++------ .../servers/pgagent/schedules/__init__.py | 24 +++++----- .../servers/pgagent/steps/__init__.py | 28 ++++++------ .../servers/resource_groups/__init__.py | 4 +- .../server_groups/servers/roles/__init__.py | 26 +++++------ .../server_groups/servers/tablespaces/__init__.py | 32 +++++++------- web/pgadmin/browser/utils.py | 11 +++++ web/pgadmin/tools/schema_diff/__init__.py | 2 +- web/pgadmin/tools/schema_diff/compare.py | 2 +- 55 files changed, 816 insertions(+), 751 deletions(-)
