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 schema diff marks an identical table as different. Fixes #5350

Browse Source 
Fixed an issue where schema diff showing changes in the identical domain constraints. Fixes #5315

Ignore the keys from the source and target list and also sort both the lists.
This commit is contained in:
Akshay Joshi
2020-04-20 18:04:16 +05:30
parent 36a3d4e53b
commit 4692b21bcf
19 changed files with 290 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -853,3 +853,20 @@ ALTER FOREIGN TABLE source.ft_diff_foreign_server_1
OWNER TO postgres;
ALTER FOREIGN TABLE source.ft_diff_foreign_server_1
ADD CONSTRAINT cs1 CHECK ((fid > 200)) NO INHERIT;
-- Test for RM #5350
CREATE TABLE source.events_transactions
(
event_code integer,
numerator integer,
account_token text COLLATE pg_catalog."default",
transaction_dt timestamp without time zone,
payment_method integer,
payment_pin integer,
approval text COLLATE pg_catalog."default",
amount integer,
file_dt timestamp without time zone DEFAULT CURRENT_TIMESTAMP,
file_name character varying(256) COLLATE pg_catalog."default",
transfer_dt timestamp without time zone,
transaction_type integer
);

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

@@ -808,3 +808,20 @@ ALTER FOREIGN TABLE target.ft_diff_foreign_server_1
OWNER TO postgres;
ALTER FOREIGN TABLE target.ft_diff_foreign_server_1
ADD CONSTRAINT cs2 CHECK ((fid > 200)) NO INHERIT;
-- Test for RM #5350
CREATE TABLE target.events_transactions
(
event_code integer,
numerator integer,
account_token text COLLATE pg_catalog."default",
transaction_dt timestamp without time zone,
payment_method integer,
approval text COLLATE pg_catalog."default",
amount integer,
file_dt timestamp without time zone DEFAULT CURRENT_TIMESTAMP,
file_name character varying(256) COLLATE pg_catalog."default",
payment_pin integer,
transfer_dt timestamp without time zone,
transaction_type integer
);

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

@@ -852,3 +852,20 @@ ALTER FOREIGN TABLE source.ft_diff_foreign_server_1
OWNER TO postgres;
ALTER FOREIGN TABLE source.ft_diff_foreign_server_1
ADD CONSTRAINT cs1 CHECK ((fid > 200)) NO INHERIT;
-- Test for RM #5350
CREATE TABLE source.events_transactions
(
event_code integer,
numerator integer,
account_token text COLLATE pg_catalog."default",
transaction_dt timestamp without time zone,
payment_method integer,
payment_pin integer,
approval text COLLATE pg_catalog."default",
amount integer,
file_dt timestamp without time zone DEFAULT CURRENT_TIMESTAMP,
file_name character varying(256) COLLATE pg_catalog."default",
transfer_dt timestamp without time zone,
transaction_type integer
);

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

@@ -807,3 +807,20 @@ ALTER FOREIGN TABLE target.ft_diff_foreign_server_1
OWNER TO postgres;
ALTER FOREIGN TABLE target.ft_diff_foreign_server_1
ADD CONSTRAINT cs2 CHECK ((fid > 200)) NO INHERIT;
-- Test for RM #5350
CREATE TABLE target.events_transactions
(
event_code integer,
numerator integer,
account_token text COLLATE pg_catalog."default",
transaction_dt timestamp without time zone,
payment_method integer,
approval text COLLATE pg_catalog."default",
amount integer,
file_dt timestamp without time zone DEFAULT CURRENT_TIMESTAMP,
file_name character varying(256) COLLATE pg_catalog."default",
payment_pin integer,
transfer_dt timestamp without time zone,
transaction_type integer
);

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

@@ -853,3 +853,20 @@ ALTER FOREIGN TABLE source.ft_diff_foreign_server_1
OWNER TO postgres;
ALTER FOREIGN TABLE source.ft_diff_foreign_server_1
ADD CONSTRAINT cs1 CHECK ((fid > 200)) NO INHERIT;
-- Test for RM #5350
CREATE TABLE source.events_transactions
(
event_code integer,
numerator integer,
account_token text COLLATE pg_catalog."default",
transaction_dt timestamp without time zone,
payment_method integer,
payment_pin integer,
approval text COLLATE pg_catalog."default",
amount integer,
file_dt timestamp without time zone DEFAULT CURRENT_TIMESTAMP,
file_name character varying(256) COLLATE pg_catalog."default",
transfer_dt timestamp without time zone,
transaction_type integer
);

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

@@ -796,3 +796,20 @@ ALTER FOREIGN TABLE target.ft_diff_foreign_server_1
OWNER TO postgres;
ALTER FOREIGN TABLE target.ft_diff_foreign_server_1
ADD CONSTRAINT cs2 CHECK ((fid > 200)) NO INHERIT;
-- Test for RM #5350
CREATE TABLE target.events_transactions
(
event_code integer,
numerator integer,
account_token text COLLATE pg_catalog."default",
transaction_dt timestamp without time zone,
payment_method integer,
approval text COLLATE pg_catalog."default",
amount integer,
file_dt timestamp without time zone DEFAULT CURRENT_TIMESTAMP,
file_name character varying(256) COLLATE pg_catalog."default",
payment_pin integer,
transfer_dt timestamp without time zone,
transaction_type integer
);

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

@@ -720,3 +720,20 @@ ALTER FOREIGN TABLE source.ft_diff_foreign_server_1
OWNER TO postgres;
ALTER FOREIGN TABLE source.ft_diff_foreign_server_1
ADD CONSTRAINT cs1 CHECK ((fid > 200)) NO INHERIT;
-- Test for RM #5350
CREATE TABLE source.events_transactions
(
event_code integer,
numerator integer,
account_token text COLLATE pg_catalog."default",
transaction_dt timestamp without time zone,
payment_method integer,
payment_pin integer,
approval text COLLATE pg_catalog."default",
amount integer,
file_dt timestamp without time zone DEFAULT CURRENT_TIMESTAMP,
file_name character varying(256) COLLATE pg_catalog."default",
transfer_dt timestamp without time zone,
transaction_type integer
);

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

@@ -714,3 +714,20 @@ ALTER FOREIGN TABLE target.ft_diff_foreign_server_1
OWNER TO postgres;
ALTER FOREIGN TABLE target.ft_diff_foreign_server_1
ADD CONSTRAINT cs2 CHECK ((fid > 200)) NO INHERIT;
-- Test for RM #5350
CREATE TABLE target.events_transactions
(
event_code integer,
numerator integer,
account_token text COLLATE pg_catalog."default",
transaction_dt timestamp without time zone,
payment_method integer,
approval text COLLATE pg_catalog."default",
amount integer,
file_dt timestamp without time zone DEFAULT CURRENT_TIMESTAMP,
file_name character varying(256) COLLATE pg_catalog."default",
payment_pin integer,
transfer_dt timestamp without time zone,
transaction_type integer
);

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

@@ -950,3 +950,20 @@ ALTER FOREIGN TABLE source.ft_diff_foreign_server_1
OWNER TO enterprisedb;
ALTER FOREIGN TABLE source.ft_diff_foreign_server_1
ADD CONSTRAINT cs1 CHECK ((fid > 200)) NO INHERIT;
-- Test for RM #5350
CREATE TABLE source.events_transactions
(
event_code integer,
numerator integer,
account_token text COLLATE pg_catalog."default",
transaction_dt timestamp without time zone,
payment_method integer,
payment_pin integer,
approval text COLLATE pg_catalog."default",
amount integer,
file_dt timestamp without time zone DEFAULT CURRENT_TIMESTAMP,
file_name character varying(256) COLLATE pg_catalog."default",
transfer_dt timestamp without time zone,
transaction_type integer
);

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

@@ -895,3 +895,20 @@ ALTER FOREIGN TABLE target.ft_diff_foreign_server_1
OWNER TO enterprisedb;
ALTER FOREIGN TABLE target.ft_diff_foreign_server_1
ADD CONSTRAINT cs2 CHECK ((fid > 200)) NO INHERIT;
-- Test for RM #5350
CREATE TABLE target.events_transactions
(
event_code integer,
numerator integer,
account_token text COLLATE pg_catalog."default",
transaction_dt timestamp without time zone,
payment_method integer,
approval text COLLATE pg_catalog."default",
amount integer,
file_dt timestamp without time zone DEFAULT CURRENT_TIMESTAMP,
file_name character varying(256) COLLATE pg_catalog."default",
payment_pin integer,
transfer_dt timestamp without time zone,
transaction_type integer
);

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

@@ -880,3 +880,20 @@ ALTER FOREIGN TABLE source.ft_diff_foreign_server_1
OWNER TO enterprisedb;
ALTER FOREIGN TABLE source.ft_diff_foreign_server_1
ADD CONSTRAINT cs1 CHECK ((fid > 200)) NO INHERIT;
-- Test for RM #5350
CREATE TABLE source.events_transactions
(
event_code integer,
numerator integer,
account_token text COLLATE pg_catalog."default",
transaction_dt timestamp without time zone,
payment_method integer,
payment_pin integer,
approval text COLLATE pg_catalog."default",
amount integer,
file_dt timestamp without time zone DEFAULT CURRENT_TIMESTAMP,
file_name character varying(256) COLLATE pg_catalog."default",
transfer_dt timestamp without time zone,
transaction_type integer
);

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

@@ -864,3 +864,20 @@ ALTER FOREIGN TABLE target.ft_diff_foreign_server_1
OWNER TO enterprisedb;
ALTER FOREIGN TABLE target.ft_diff_foreign_server_1
ADD CONSTRAINT cs2 CHECK ((fid > 200)) NO INHERIT;
-- Test for RM #5350
CREATE TABLE target.events_transactions
(
event_code integer,
numerator integer,
account_token text COLLATE pg_catalog."default",
transaction_dt timestamp without time zone,
payment_method integer,
approval text COLLATE pg_catalog."default",
amount integer,
file_dt timestamp without time zone DEFAULT CURRENT_TIMESTAMP,
file_name character varying(256) COLLATE pg_catalog."default",
payment_pin integer,
transfer_dt timestamp without time zone,
transaction_type integer
);