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

Fixed an issue where the identical packages and sequences visible as different in the schema diff tool. Fixes #5362

Browse Source
This commit is contained in:
Akshay Joshi 2020-04-13 18:06:20 +05:30
parent 030741bba5
commit df11f28593
24 changed files with 111 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/en_US/release_notes_4_21.rst
View File

@ -42,4 +42,5 @@ Bug fixes
| `Issue #5275 <https://redmine.postgresql.org/issues/5275>`_ - Fixed tab key navigation issue for parameters in table dialog.
| `Issue #5314 <https://redmine.postgresql.org/issues/5314>`_ - Ensure that switch cell is in sync with switch control for accessibility.
| `Issue #5351 <https://redmine.postgresql.org/issues/5351>`_ - Fixed compilation warnings while building pgAdmin.
| `Issue #5361 <https://redmine.postgresql.org/issues/5361>`_ - Fixes an issue where pgAdmin4 GUI does not display properly in IE 11.
| `Issue #5361 <https://redmine.postgresql.org/issues/5361>`_ - Fixes an issue where pgAdmin4 GUI does not display properly in IE 11.
| `Issue #5362 <https://redmine.postgresql.org/issues/5362>`_ - Fixed an issue where the identical packages and sequences visible as different in the schema diff tool.

2
web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py
View File

@ -113,7 +113,7 @@ class PackageView(PGChildNodeView, SchemaDiffObjectCompare):
'dependent': [{'get': 'dependents'}]
})
keys_to_ignore = ['oid', 'schema', 'xmin', 'oid-2']
keys_to_ignore = ['oid', 'schema', 'xmin', 'oid-2', 'acl']
def check_precondition(action=None):
"""

1
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py
View File

@ -716,6 +716,7 @@ class SequenceView(PGChildNodeView, SchemaDiffObjectCompare):
row['minimum'] = rset1['rows'][0]['min_value']
row['maximum'] = rset1['rows'][0]['max_value']
row['increment'] = rset1['rows'][0]['increment_by']
row['start'] = rset1['rows'][0]['start_value']
row['cache'] = rset1['rows'][0]['cache_value']
row['cycled'] = rset1['rows'][0]['is_cycled']

3
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/update.sql
View File

@ -20,6 +20,9 @@ SELECT setval({{ seqname|qtLiteral }}, {{ data.current_value }}, true);
{% if data.increment is defined %}
{% set defquery = defquery+'\n INCREMENT '+data.increment|string %}
{% endif %}
{% if data.start is defined %}
{% set defquery = defquery+'\n START '+data.start|string %}
{% endif %}
{% if data.minimum is defined %}
{% set defquery = defquery+'\n MINVALUE '+data.minimum|string %}
{% endif %}

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_privs_add.sql
View File

@ -5,7 +5,7 @@
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CYCLE
INCREMENT 12
START 7
START 5
MINVALUE 2
MAXVALUE 9992
CACHE 2;

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_privs_remove.sql
View File

@ -5,7 +5,7 @@
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CYCLE
INCREMENT 12
START 7
START 5
MINVALUE 2
MAXVALUE 9992
CACHE 2;

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_privs_update.sql
View File

@ -5,7 +5,7 @@
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CYCLE
INCREMENT 12
START 7
START 5
MINVALUE 2
MAXVALUE 9992
CACHE 2;

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_props.sql
View File

@ -5,7 +5,7 @@
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CYCLE
INCREMENT 12
START 7
START 5
MINVALUE 2
MAXVALUE 9992
CACHE 2;

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_privs_add.sql
View File

@ -5,7 +5,7 @@
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CYCLE
INCREMENT 12
START 7
START 5
MINVALUE 2
MAXVALUE 9992
CACHE 2;

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_privs_remove.sql
View File

@ -5,7 +5,7 @@
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CYCLE
INCREMENT 12
START 7
START 5
MINVALUE 2
MAXVALUE 9992
CACHE 2;

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_privs_update.sql
View File

@ -5,7 +5,7 @@
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CYCLE
INCREMENT 12
START 7
START 5
MINVALUE 2
MAXVALUE 9992
CACHE 2;

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_props.sql
View File

@ -5,7 +5,7 @@
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CYCLE
INCREMENT 12
START 7
START 5
MINVALUE 2
MAXVALUE 9992
CACHE 2;

8
web/pgadmin/tools/schema_diff/tests/pg/10_plus/source.sql
View File

@ -736,6 +736,14 @@ CREATE SEQUENCE source.seq_diff
ALTER SEQUENCE source.seq_diff
OWNER TO postgres;
CREATE SEQUENCE source.seq_start_diff
INCREMENT 5
START 3
MINVALUE 3
MAXVALUE 20;
ALTER SEQUENCE source.seq_start_diff
OWNER TO postgres;
-- Foreign Data Wrapper to test foreign table
CREATE FOREIGN DATA WRAPPER test_fdw_for_foreign_table;
ALTER FOREIGN DATA WRAPPER test_fdw_for_foreign_table

8
web/pgadmin/tools/schema_diff/tests/pg/10_plus/target.sql
View File

@ -687,6 +687,14 @@ CREATE SEQUENCE target.seq_diff
ALTER SEQUENCE target.seq_diff
OWNER TO postgres;
CREATE SEQUENCE target.seq_start_diff
INCREMENT 5
START 1
MINVALUE 1
MAXVALUE 20;
ALTER SEQUENCE target.seq_start_diff
OWNER TO postgres;
-- Foreign Data Wrapper to test foreign table
CREATE FOREIGN DATA WRAPPER test_fdw_for_foreign_table;
ALTER FOREIGN DATA WRAPPER test_fdw_for_foreign_table

8
web/pgadmin/tools/schema_diff/tests/pg/11_plus/source.sql
View File

@ -699,6 +699,14 @@ CREATE SEQUENCE source.seq_diff
ALTER SEQUENCE source.seq_diff
OWNER TO postgres;
CREATE SEQUENCE source.seq_start_diff
INCREMENT 5
START 3
MINVALUE 3
MAXVALUE 20;
ALTER SEQUENCE source.seq_start_diff
OWNER TO postgres;
-- Foreign Data Wrapper to test foreign table
CREATE FOREIGN DATA WRAPPER test_fdw_for_foreign_table;
ALTER FOREIGN DATA WRAPPER test_fdw_for_foreign_table

8
web/pgadmin/tools/schema_diff/tests/pg/11_plus/target.sql
View File

@ -686,6 +686,14 @@ CREATE SEQUENCE target.seq_diff
ALTER SEQUENCE target.seq_diff
OWNER TO postgres;
CREATE SEQUENCE target.seq_start_diff
INCREMENT 5
START 1
MINVALUE 1
MAXVALUE 20;
ALTER SEQUENCE target.seq_start_diff
OWNER TO postgres;
-- Foreign Data Wrapper to test foreign table
CREATE FOREIGN DATA WRAPPER test_fdw_for_foreign_table;
ALTER FOREIGN DATA WRAPPER test_fdw_for_foreign_table

8
web/pgadmin/tools/schema_diff/tests/pg/12_plus/source.sql
View File

@ -700,6 +700,14 @@ CREATE SEQUENCE source.seq_diff
ALTER SEQUENCE source.seq_diff
OWNER TO postgres;
CREATE SEQUENCE source.seq_start_diff
INCREMENT 5
START 3
MINVALUE 3
MAXVALUE 20;
ALTER SEQUENCE source.seq_start_diff
OWNER TO postgres;
-- Foreign Data Wrapper to test foreign table
CREATE FOREIGN DATA WRAPPER test_fdw_for_foreign_table;
ALTER FOREIGN DATA WRAPPER test_fdw_for_foreign_table

8
web/pgadmin/tools/schema_diff/tests/pg/12_plus/target.sql
View File

@ -675,6 +675,14 @@ CREATE SEQUENCE target.seq_diff
ALTER SEQUENCE target.seq_diff
OWNER TO postgres;
CREATE SEQUENCE target.seq_start_diff
INCREMENT 5
START 1
MINVALUE 1
MAXVALUE 20;
ALTER SEQUENCE target.seq_start_diff
OWNER TO postgres;
-- Foreign Data Wrapper to test foreign table
CREATE FOREIGN DATA WRAPPER test_fdw_for_foreign_table;
ALTER FOREIGN DATA WRAPPER test_fdw_for_foreign_table

8
web/pgadmin/tools/schema_diff/tests/pg/9.2_plus/source.sql
View File

@ -569,6 +569,14 @@ CREATE SEQUENCE source.seq_diff
ALTER SEQUENCE source.seq_diff
OWNER TO postgres;
CREATE SEQUENCE source.seq_start_diff
INCREMENT 5
START 3
MINVALUE 3
MAXVALUE 20;
ALTER SEQUENCE source.seq_start_diff
OWNER TO postgres;
-- Foreign Data Wrapper to test foreign table
CREATE FOREIGN DATA WRAPPER test_fdw_for_foreign_table;
ALTER FOREIGN DATA WRAPPER test_fdw_for_foreign_table

8
web/pgadmin/tools/schema_diff/tests/pg/9.2_plus/target.sql
View File

@ -593,6 +593,14 @@ CREATE SEQUENCE target.seq_diff
ALTER SEQUENCE target.seq_diff
OWNER TO postgres;
CREATE SEQUENCE target.seq_start_diff
INCREMENT 5
START 1
MINVALUE 1
MAXVALUE 20;
ALTER SEQUENCE target.seq_start_diff
OWNER TO postgres;
-- Foreign Data Wrapper to test foreign table
CREATE FOREIGN DATA WRAPPER test_fdw_for_foreign_table;
ALTER FOREIGN DATA WRAPPER test_fdw_for_foreign_table

8
web/pgadmin/tools/schema_diff/tests/ppas/10_plus/source.sql
View File

@ -797,6 +797,14 @@ CREATE SEQUENCE source.seq_diff
ALTER SEQUENCE source.seq_diff
OWNER TO enterprisedb;
CREATE SEQUENCE source.seq_start_diff
INCREMENT 5
START 3
MINVALUE 3
MAXVALUE 20;
ALTER SEQUENCE source.seq_start_diff
OWNER TO enterprisedb;
-- Foreign Data Wrapper to test foreign table
CREATE FOREIGN DATA WRAPPER test_fdw_for_foreign_table;
ALTER FOREIGN DATA WRAPPER test_fdw_for_foreign_table

8
web/pgadmin/tools/schema_diff/tests/ppas/10_plus/target.sql
View File

@ -774,6 +774,14 @@ CREATE SEQUENCE target.seq_diff
ALTER SEQUENCE target.seq_diff
OWNER TO enterprisedb;
CREATE SEQUENCE target.seq_start_diff
INCREMENT 5
START 1
MINVALUE 1
MAXVALUE 20;
ALTER SEQUENCE target.seq_start_diff
OWNER TO enterprisedb;
-- Foreign Data Wrapper to test foreign table
CREATE FOREIGN DATA WRAPPER test_fdw_for_foreign_table;
ALTER FOREIGN DATA WRAPPER test_fdw_for_foreign_table

8
web/pgadmin/tools/schema_diff/tests/ppas/9.2_plus/source.sql
View File

@ -729,6 +729,14 @@ CREATE SEQUENCE source.seq_diff
ALTER SEQUENCE source.seq_diff
OWNER TO enterprisedb;
CREATE SEQUENCE source.seq_start_diff
INCREMENT 5
START 3
MINVALUE 3
MAXVALUE 20;
ALTER SEQUENCE source.seq_start_diff
OWNER TO enterprisedb;
-- Foreign Data Wrapper to test foreign table
CREATE FOREIGN DATA WRAPPER test_fdw_for_foreign_table;
ALTER FOREIGN DATA WRAPPER test_fdw_for_foreign_table

8
web/pgadmin/tools/schema_diff/tests/ppas/9.2_plus/target.sql
View File

@ -743,6 +743,14 @@ CREATE SEQUENCE target.seq_diff
ALTER SEQUENCE target.seq_diff
OWNER TO enterprisedb;
CREATE SEQUENCE target.seq_start_diff
INCREMENT 5
START 1
MINVALUE 1
MAXVALUE 20;
ALTER SEQUENCE target.seq_start_diff
OWNER TO enterprisedb;
-- Foreign Data Wrapper to test foreign table
CREATE FOREIGN DATA WRAPPER test_fdw_for_foreign_table;
ALTER FOREIGN DATA WRAPPER test_fdw_for_foreign_table