Added support of Domain, Domain Constraints and Types to the Schema Diff. Fixes #5262

2025-02-25 18:55:31 -06:00 · 2020-03-26 14:30:09 +05:30
parent 4c0b229b14
commit 94a76cc9e0
20 changed files with 1968 additions and 29 deletions
--- a/web/pgadmin/tools/schema_diff/directory_compare.py
+++ b/web/pgadmin/tools/schema_diff/directory_compare.py
@@ -326,7 +326,8 @@ def directory_diff(source_dict, target_dict, ignore_keys=[], difference={}):
                        pass
                    elif type(source) is dict:
                        tmp_key_array = ['name', 'colname', 'argid', 'token',
-                                         'option']
+                                         'option', 'conname', 'member_name',
+                                         'label']
                        # Check the above keys are exist in the dictionary
                        tmp_key = is_key_exists(tmp_key_array, source)
                        if tmp_key is not None:
@@ -408,6 +409,8 @@ def parce_acl(source, target):
        key = 'datacl'
    elif 'relacl' in source:
        key = 'relacl'
+    elif 'typacl' in source:
+        key = 'typacl'

    tmp_source = source[key] if\
        key in source and source[key] is not None else []
--- a/web/pgadmin/tools/schema_diff/tests/pg/10_plus/source.sql
+++ b/web/pgadmin/tools/schema_diff/tests/pg/10_plus/source.sql
@@ -526,3 +526,165 @@ CREATE TEXT SEARCH TEMPLATE source.fts_templ_diff (
 );

 COMMENT ON TEXT SEARCH TEMPLATE source.fts_templ_diff IS 'Test Comment';
+
+-- Domain and Domain Constraint script
+CREATE DOMAIN source.dom_src
+    AS bigint
+    DEFAULT 100
+    NOT NULL;
+
+ALTER DOMAIN source.dom_src OWNER TO postgres;
+
+ALTER DOMAIN source.dom_src
+    ADD CONSTRAINT con_src CHECK (VALUE <> 100);
+
+CREATE DOMAIN source.dom_cons_diff
+    AS bigint
+    DEFAULT 100
+    NOT NULL;
+
+ALTER DOMAIN source.dom_cons_diff OWNER TO postgres;
+
+ALTER DOMAIN source.dom_cons_diff
+    ADD CONSTRAINT cons_diff_1 CHECK (VALUE <> 50);
+
+ALTER DOMAIN source.dom_cons_diff
+    ADD CONSTRAINT cons_src_only CHECK (VALUE <> 25);
+
+CREATE DOMAIN source.dom_type_diff
+    AS character varying(40)
+    COLLATE pg_catalog."POSIX";
+
+ALTER DOMAIN source.dom_type_diff OWNER TO postgres;
+
+ALTER DOMAIN source.dom_type_diff
+    ADD CONSTRAINT cons1 CHECK (VALUE::text <> 'pgAdmin3'::text);
+
+ALTER DOMAIN source.dom_type_diff
+    ADD CONSTRAINT cons2 CHECK (VALUE::text <> 'pgAdmin4'::text);
+
+COMMENT ON DOMAIN source.dom_type_diff
+    IS 'Test comment';
+
+-- Type Script composite type
+CREATE TYPE source.typ_comp_src AS
+(
+	m1 bit(5),
+	m2 text COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE source.typ_comp_src
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_comp_diff AS
+(
+	m1 numeric(5,2),
+	m3 character varying(30) COLLATE pg_catalog."C"
+);
+ALTER TYPE source.typ_comp_diff
+    OWNER TO postgres;
+COMMENT ON TYPE source.typ_comp_diff
+    IS 'Test Comment';
+GRANT USAGE ON TYPE source.typ_comp_diff TO PUBLIC;
+GRANT USAGE ON TYPE source.typ_comp_diff TO pg_monitor WITH GRANT OPTION;
+GRANT USAGE ON TYPE source.typ_comp_diff TO postgres;
+
+-- Type Script ENUM type
+CREATE TYPE source.typ_enum_src AS ENUM
+    ('test_enum');
+ALTER TYPE source.typ_enum_src
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_enum_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE source.typ_enum_diff
+    OWNER TO postgres;
+COMMENT ON TYPE source.typ_enum_diff
+    IS 'Test Comment';
+GRANT USAGE ON TYPE source.typ_enum_src TO pg_monitor WITH GRANT OPTION;
+
+-- Type Script RANGE type
+CREATE TYPE source.typ_range_src AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."POSIX",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE source.typ_range_src
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_range_col_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE source.typ_range_col_diff
+    OWNER TO pg_monitor;
+COMMENT ON TYPE source.typ_range_col_diff
+    IS 'Test Comment';
+GRANT USAGE ON TYPE source.typ_range_col_diff TO PUBLIC;
+GRANT USAGE ON TYPE source.typ_range_col_diff TO pg_monitor WITH GRANT OPTION;
+
+CREATE TYPE source.typ_range_subtype_diff AS RANGE
+(
+    SUBTYPE=bpchar,
+    COLLATION = pg_catalog."POSIX"
+);
+ALTER TYPE source.typ_range_subtype_diff
+    OWNER TO postgres;
+
+-- Type Script SHELL type
+CREATE TYPE source.typ_shell_src;
+ALTER TYPE source.typ_shell_src
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_shell_diff;
+ALTER TYPE source.typ_shell_diff
+    OWNER TO postgres;
+COMMENT ON TYPE source.typ_shell_diff
+    IS 'Test Comment';
+
+-- Type script to test when Type is different
+CREATE TYPE source.typ_comp_range_diff AS
+(
+	m1 bigint,
+	m2 text[] COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE source.typ_comp_range_diff
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_comp_enum_diff AS
+(
+	m1 bigint,
+	m2 text[] COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE source.typ_comp_range_diff
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_range_comp_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE source.typ_range_comp_diff
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_range_enum_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE source.typ_range_enum_diff
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_enum_comp_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE source.typ_enum_comp_diff
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_enum_range_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE source.typ_enum_range_diff
+    OWNER TO postgres;
--- a/web/pgadmin/tools/schema_diff/tests/pg/10_plus/target.sql
+++ b/web/pgadmin/tools/schema_diff/tests/pg/10_plus/target.sql
@@ -497,3 +497,148 @@ CREATE TEXT SEARCH TEMPLATE target.fts_templ_diff (
 );

 COMMENT ON TEXT SEARCH TEMPLATE target.fts_templ_diff IS 'Comment';
+
+-- Domain and Domain Constraint script
+CREATE DOMAIN target.dom_tar
+    AS bigint
+    DEFAULT 100
+    NOT NULL;
+
+ALTER DOMAIN target.dom_tar OWNER TO postgres;
+
+ALTER DOMAIN target.dom_tar
+    ADD CONSTRAINT con_tar CHECK (VALUE <> 100);
+
+CREATE DOMAIN target.dom_cons_diff
+    AS bigint
+    DEFAULT 400;
+
+ALTER DOMAIN target.dom_cons_diff OWNER TO postgres;
+
+ALTER DOMAIN target.dom_cons_diff
+    ADD CONSTRAINT cons_diff_1 CHECK (VALUE <> 40);
+
+ALTER DOMAIN target.dom_cons_diff
+    ADD CONSTRAINT cons_tar_only CHECK (VALUE <> 25);
+
+CREATE DOMAIN target.dom_type_diff
+    AS numeric(8,4);
+
+ALTER DOMAIN target.dom_type_diff OWNER TO postgres;
+
+ALTER DOMAIN target.dom_type_diff
+    ADD CONSTRAINT cons1 CHECK (VALUE <> 45::numeric);
+
+ALTER DOMAIN target.dom_type_diff
+    ADD CONSTRAINT cons2 CHECK (VALUE <> 50::numeric);
+
+COMMENT ON DOMAIN target.dom_type_diff
+    IS 'Comment';
+
+-- Type Script composite type
+CREATE TYPE target.typ_comp_tar AS
+(
+	m1 bit(5),
+	m2 text COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE target.typ_comp_tar
+    OWNER TO postgres;
+CREATE TYPE target.typ_comp_diff AS
+(
+	m1 bit(5),
+	m2 text COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE target.typ_comp_diff
+    OWNER TO postgres;
+
+-- Type Script ENUM type
+CREATE TYPE target.typ_enum_tar AS ENUM
+    ('test_enum');
+ALTER TYPE target.typ_enum_tar
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_enum_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE target.typ_enum_diff
+    OWNER TO postgres;
+
+-- Type Script RANGE type
+CREATE TYPE target.typ_range_tar AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."POSIX",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE target.typ_range_tar
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_range_col_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."POSIX",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE target.typ_range_col_diff
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_range_subtype_diff AS RANGE
+(
+    SUBTYPE=bool,
+    SUBTYPE_OPCLASS = bool_ops
+);
+ALTER TYPE target.typ_range_subtype_diff
+    OWNER TO postgres;
+
+-- Type Script SHELL type
+CREATE TYPE target.typ_shell_tar;
+ALTER TYPE target.typ_shell_tar
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_shell_diff;
+ALTER TYPE target.typ_shell_diff
+    OWNER TO pg_monitor;
+
+-- Type script to test when Type is different
+CREATE TYPE target.typ_comp_range_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE target.typ_comp_range_diff
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_comp_enum_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE target.typ_comp_enum_diff
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_range_comp_diff AS
+(
+	m1 bigint,
+	m2 text[] COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE target.typ_range_comp_diff
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_range_enum_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE target.typ_range_enum_diff
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_enum_comp_diff AS
+(
+	m1 bigint,
+	m2 text[] COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE target.typ_enum_comp_diff
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_enum_range_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE target.typ_enum_range_diff
+    OWNER TO postgres;
--- a/web/pgadmin/tools/schema_diff/tests/pg/11_plus/source.sql
+++ b/web/pgadmin/tools/schema_diff/tests/pg/11_plus/source.sql
@@ -525,3 +525,129 @@ CREATE TEXT SEARCH TEMPLATE source.fts_templ_diff (
 );

 COMMENT ON TEXT SEARCH TEMPLATE source.fts_templ_diff IS 'Test Comment';
+
+-- Domain and Domain Constraint script
+CREATE DOMAIN source.dom_src
+    AS bigint
+    DEFAULT 100
+    NOT NULL;
+
+ALTER DOMAIN source.dom_src OWNER TO postgres;
+
+ALTER DOMAIN source.dom_src
+    ADD CONSTRAINT con_src CHECK (VALUE <> 100);
+
+CREATE DOMAIN source.dom_cons_diff
+    AS bigint
+    DEFAULT 100
+    NOT NULL;
+
+ALTER DOMAIN source.dom_cons_diff OWNER TO postgres;
+
+ALTER DOMAIN source.dom_cons_diff
+    ADD CONSTRAINT cons_diff_1 CHECK (VALUE <> 50);
+
+ALTER DOMAIN source.dom_cons_diff
+    ADD CONSTRAINT cons_src_only CHECK (VALUE <> 25);
+
+CREATE DOMAIN source.dom_type_diff
+    AS character varying(40)
+    COLLATE pg_catalog."POSIX";
+
+ALTER DOMAIN source.dom_type_diff OWNER TO postgres;
+
+ALTER DOMAIN source.dom_type_diff
+    ADD CONSTRAINT cons1 CHECK (VALUE::text <> 'pgAdmin3'::text);
+
+ALTER DOMAIN source.dom_type_diff
+    ADD CONSTRAINT cons2 CHECK (VALUE::text <> 'pgAdmin4'::text);
+
+COMMENT ON DOMAIN source.dom_type_diff
+    IS 'Test comment';
+
+-- Type Script RANGE type
+CREATE TYPE source.typ_range_src AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."POSIX",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE source.typ_range_src
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_range_col_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE source.typ_range_col_diff
+    OWNER TO pg_monitor;
+COMMENT ON TYPE source.typ_range_col_diff
+    IS 'Test Comment';
+GRANT USAGE ON TYPE source.typ_range_col_diff TO PUBLIC;
+GRANT USAGE ON TYPE source.typ_range_col_diff TO pg_monitor WITH GRANT OPTION;
+
+CREATE TYPE source.typ_range_subtype_diff AS RANGE
+(
+    SUBTYPE=bpchar,
+    COLLATION = pg_catalog."POSIX"
+);
+ALTER TYPE source.typ_range_subtype_diff
+    OWNER TO postgres;
+
+-- Type Script SHELL type
+CREATE TYPE source.typ_shell_src;
+ALTER TYPE source.typ_shell_src
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_shell_diff;
+ALTER TYPE source.typ_shell_diff
+    OWNER TO postgres;
+COMMENT ON TYPE source.typ_shell_diff
+    IS 'Test Comment';
+
+-- Type script to test when Type is different
+CREATE TYPE source.typ_comp_range_diff AS
+(
+	m1 bigint,
+	m2 text[] COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE source.typ_comp_range_diff
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_comp_enum_diff AS
+(
+	m1 bigint,
+	m2 text[] COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE source.typ_comp_range_diff
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_range_comp_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE source.typ_range_comp_diff
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_range_enum_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE source.typ_range_enum_diff
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_enum_comp_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE source.typ_enum_comp_diff
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_enum_range_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE source.typ_enum_range_diff
+    OWNER TO postgres;
--- a/web/pgadmin/tools/schema_diff/tests/pg/11_plus/target.sql
+++ b/web/pgadmin/tools/schema_diff/tests/pg/11_plus/target.sql
@@ -496,3 +496,148 @@ CREATE TEXT SEARCH TEMPLATE target.fts_templ_diff (
 );

 COMMENT ON TEXT SEARCH TEMPLATE target.fts_templ_diff IS 'Comment';
+
+-- Domain and Domain Constraint script
+CREATE DOMAIN target.dom_src
+    AS bigint
+    DEFAULT 100
+    NOT NULL;
+
+ALTER DOMAIN target.dom_src OWNER TO postgres;
+
+ALTER DOMAIN target.dom_src
+    ADD CONSTRAINT con_src CHECK (VALUE <> 100);
+
+CREATE DOMAIN target.dom_cons_diff
+    AS bigint
+    DEFAULT 400;
+
+ALTER DOMAIN target.dom_cons_diff OWNER TO postgres;
+
+ALTER DOMAIN target.dom_cons_diff
+    ADD CONSTRAINT cons_diff_1 CHECK (VALUE <> 40);
+
+ALTER DOMAIN target.dom_cons_diff
+    ADD CONSTRAINT cons_tar_only CHECK (VALUE <> 25);
+
+CREATE DOMAIN target.dom_type_diff
+    AS numeric(8,4);
+
+ALTER DOMAIN target.dom_type_diff OWNER TO postgres;
+
+ALTER DOMAIN target.dom_type_diff
+    ADD CONSTRAINT cons1 CHECK (VALUE <> 45::numeric);
+
+ALTER DOMAIN target.dom_type_diff
+    ADD CONSTRAINT cons2 CHECK (VALUE <> 50::numeric);
+
+COMMENT ON DOMAIN target.dom_type_diff
+    IS 'Comment';
+
+-- Type Script composite type
+CREATE TYPE target.typ_comp_tar AS
+(
+	m1 bit(5),
+	m2 text COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE target.typ_comp_tar
+    OWNER TO postgres;
+CREATE TYPE target.typ_comp_diff AS
+(
+	m1 bit(5),
+	m2 text COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE target.typ_comp_diff
+    OWNER TO postgres;
+
+-- Type Script ENUM type
+CREATE TYPE target.typ_enum_tar AS ENUM
+    ('test_enum');
+ALTER TYPE target.typ_enum_tar
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_enum_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE target.typ_enum_diff
+    OWNER TO postgres;
+
+-- Type Script RANGE type
+CREATE TYPE target.typ_range_tar AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."POSIX",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE target.typ_range_tar
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_range_col_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."POSIX",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE target.typ_range_col_diff
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_range_subtype_diff AS RANGE
+(
+    SUBTYPE=bool,
+    SUBTYPE_OPCLASS = bool_ops
+);
+ALTER TYPE target.typ_range_subtype_diff
+    OWNER TO postgres;
+
+-- Type Script SHELL type
+CREATE TYPE target.typ_shell_tar;
+ALTER TYPE target.typ_shell_tar
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_shell_diff;
+ALTER TYPE target.typ_shell_diff
+    OWNER TO pg_monitor;
+
+-- Type script to test when Type is different
+CREATE TYPE target.typ_comp_range_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE target.typ_comp_range_diff
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_comp_enum_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE target.typ_comp_enum_diff
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_range_comp_diff AS
+(
+	m1 bigint,
+	m2 text[] COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE target.typ_range_comp_diff
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_range_enum_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE target.typ_range_enum_diff
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_enum_comp_diff AS
+(
+	m1 bigint,
+	m2 text[] COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE target.typ_enum_comp_diff
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_enum_range_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE target.typ_enum_range_diff
+    OWNER TO postgres;
--- a/web/pgadmin/tools/schema_diff/tests/pg/12_plus/source.sql
+++ b/web/pgadmin/tools/schema_diff/tests/pg/12_plus/source.sql
@@ -526,3 +526,129 @@ CREATE TEXT SEARCH TEMPLATE source.fts_templ_diff (
 );

 COMMENT ON TEXT SEARCH TEMPLATE source.fts_templ_diff IS 'Test Comment';
+
+-- Domain and Domain Constraint script
+CREATE DOMAIN source.dom_src
+    AS bigint
+    DEFAULT 100
+    NOT NULL;
+
+ALTER DOMAIN source.dom_src OWNER TO postgres;
+
+ALTER DOMAIN source.dom_src
+    ADD CONSTRAINT con_src CHECK (VALUE <> 100);
+
+CREATE DOMAIN source.dom_cons_diff
+    AS bigint
+    DEFAULT 100
+    NOT NULL;
+
+ALTER DOMAIN source.dom_cons_diff OWNER TO postgres;
+
+ALTER DOMAIN source.dom_cons_diff
+    ADD CONSTRAINT cons_diff_1 CHECK (VALUE <> 50);
+
+ALTER DOMAIN source.dom_cons_diff
+    ADD CONSTRAINT cons_src_only CHECK (VALUE <> 25);
+
+CREATE DOMAIN source.dom_type_diff
+    AS character varying(40)
+    COLLATE pg_catalog."POSIX";
+
+ALTER DOMAIN source.dom_type_diff OWNER TO postgres;
+
+ALTER DOMAIN source.dom_type_diff
+    ADD CONSTRAINT cons1 CHECK (VALUE::text <> 'pgAdmin3'::text);
+
+ALTER DOMAIN source.dom_type_diff
+    ADD CONSTRAINT cons2 CHECK (VALUE::text <> 'pgAdmin4'::text);
+
+COMMENT ON DOMAIN source.dom_type_diff
+    IS 'Test comment';
+
+-- Type Script RANGE type
+CREATE TYPE source.typ_range_src AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."POSIX",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE source.typ_range_src
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_range_col_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE source.typ_range_col_diff
+    OWNER TO pg_monitor;
+COMMENT ON TYPE source.typ_range_col_diff
+    IS 'Test Comment';
+GRANT USAGE ON TYPE source.typ_range_col_diff TO PUBLIC;
+GRANT USAGE ON TYPE source.typ_range_col_diff TO pg_monitor WITH GRANT OPTION;
+
+CREATE TYPE source.typ_range_subtype_diff AS RANGE
+(
+    SUBTYPE=bpchar,
+    COLLATION = pg_catalog."POSIX"
+);
+ALTER TYPE source.typ_range_subtype_diff
+    OWNER TO postgres;
+
+-- Type Script SHELL type
+CREATE TYPE source.typ_shell_src;
+ALTER TYPE source.typ_shell_src
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_shell_diff;
+ALTER TYPE source.typ_shell_diff
+    OWNER TO postgres;
+COMMENT ON TYPE source.typ_shell_diff
+    IS 'Test Comment';
+
+-- Type script to test when Type is different
+CREATE TYPE source.typ_comp_range_diff AS
+(
+	m1 bigint,
+	m2 text[] COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE source.typ_comp_range_diff
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_comp_enum_diff AS
+(
+	m1 bigint,
+	m2 text[] COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE source.typ_comp_range_diff
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_range_comp_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE source.typ_range_comp_diff
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_range_enum_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE source.typ_range_enum_diff
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_enum_comp_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE source.typ_enum_comp_diff
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_enum_range_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE source.typ_enum_range_diff
+    OWNER TO postgres;
--- a/web/pgadmin/tools/schema_diff/tests/pg/12_plus/target.sql
+++ b/web/pgadmin/tools/schema_diff/tests/pg/12_plus/target.sql
@@ -485,3 +485,148 @@ CREATE TEXT SEARCH TEMPLATE target.fts_templ_diff (
 );

 COMMENT ON TEXT SEARCH TEMPLATE target.fts_templ_diff IS 'Comment';
+
+-- Domain and Domain Constraint script
+CREATE DOMAIN target.dom_src
+    AS bigint
+    DEFAULT 100
+    NOT NULL;
+
+ALTER DOMAIN target.dom_src OWNER TO postgres;
+
+ALTER DOMAIN target.dom_src
+    ADD CONSTRAINT con_src CHECK (VALUE <> 100);
+
+CREATE DOMAIN target.dom_cons_diff
+    AS bigint
+    DEFAULT 400;
+
+ALTER DOMAIN target.dom_cons_diff OWNER TO postgres;
+
+ALTER DOMAIN target.dom_cons_diff
+    ADD CONSTRAINT cons_diff_1 CHECK (VALUE <> 40);
+
+ALTER DOMAIN target.dom_cons_diff
+    ADD CONSTRAINT cons_tar_only CHECK (VALUE <> 25);
+
+CREATE DOMAIN target.dom_type_diff
+    AS numeric(8,4);
+
+ALTER DOMAIN target.dom_type_diff OWNER TO postgres;
+
+ALTER DOMAIN target.dom_type_diff
+    ADD CONSTRAINT cons1 CHECK (VALUE <> 45::numeric);
+
+ALTER DOMAIN target.dom_type_diff
+    ADD CONSTRAINT cons2 CHECK (VALUE <> 50::numeric);
+
+COMMENT ON DOMAIN target.dom_type_diff
+    IS 'Comment';
+
+-- Type Script composite type
+CREATE TYPE target.typ_comp_tar AS
+(
+	m1 bit(5),
+	m2 text COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE target.typ_comp_tar
+    OWNER TO postgres;
+CREATE TYPE target.typ_comp_diff AS
+(
+	m1 bit(5),
+	m2 text COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE target.typ_comp_diff
+    OWNER TO postgres;
+
+-- Type Script ENUM type
+CREATE TYPE target.typ_enum_tar AS ENUM
+    ('test_enum');
+ALTER TYPE target.typ_enum_tar
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_enum_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE target.typ_enum_diff
+    OWNER TO postgres;
+
+-- Type Script RANGE type
+CREATE TYPE target.typ_range_tar AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."POSIX",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE target.typ_range_tar
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_range_col_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."POSIX",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE target.typ_range_col_diff
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_range_subtype_diff AS RANGE
+(
+    SUBTYPE=bool,
+    SUBTYPE_OPCLASS = bool_ops
+);
+ALTER TYPE target.typ_range_subtype_diff
+    OWNER TO postgres;
+
+-- Type Script SHELL type
+CREATE TYPE target.typ_shell_tar;
+ALTER TYPE target.typ_shell_tar
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_shell_diff;
+ALTER TYPE target.typ_shell_diff
+    OWNER TO pg_monitor;
+
+-- Type script to test when Type is different
+CREATE TYPE target.typ_comp_range_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE target.typ_comp_range_diff
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_comp_enum_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE target.typ_comp_enum_diff
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_range_comp_diff AS
+(
+	m1 bigint,
+	m2 text[] COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE target.typ_range_comp_diff
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_range_enum_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE target.typ_range_enum_diff
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_enum_comp_diff AS
+(
+	m1 bigint,
+	m2 text[] COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE target.typ_enum_comp_diff
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_enum_range_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE target.typ_enum_range_diff
+    OWNER TO postgres;
--- a/web/pgadmin/tools/schema_diff/tests/pg/9.2_plus/source.sql
+++ b/web/pgadmin/tools/schema_diff/tests/pg/9.2_plus/source.sql
@@ -395,3 +395,129 @@ CREATE TEXT SEARCH TEMPLATE source.fts_templ_diff (
 );

 COMMENT ON TEXT SEARCH TEMPLATE source.fts_templ_diff IS 'Test Comment';
+
+-- Domain and Domain Constraint script
+CREATE DOMAIN source.dom_src
+    AS bigint
+    DEFAULT 100
+    NOT NULL;
+
+ALTER DOMAIN source.dom_src OWNER TO postgres;
+
+ALTER DOMAIN source.dom_src
+    ADD CONSTRAINT con_src CHECK (VALUE <> 100);
+
+CREATE DOMAIN source.dom_cons_diff
+    AS bigint
+    DEFAULT 100
+    NOT NULL;
+
+ALTER DOMAIN source.dom_cons_diff OWNER TO postgres;
+
+ALTER DOMAIN source.dom_cons_diff
+    ADD CONSTRAINT cons_diff_1 CHECK (VALUE <> 50);
+
+ALTER DOMAIN source.dom_cons_diff
+    ADD CONSTRAINT cons_src_only CHECK (VALUE <> 25);
+
+CREATE DOMAIN source.dom_type_diff
+    AS character varying(40)
+    COLLATE pg_catalog."POSIX";
+
+ALTER DOMAIN source.dom_type_diff OWNER TO postgres;
+
+ALTER DOMAIN source.dom_type_diff
+    ADD CONSTRAINT cons1 CHECK (VALUE::text <> 'pgAdmin3'::text);
+
+ALTER DOMAIN source.dom_type_diff
+    ADD CONSTRAINT cons2 CHECK (VALUE::text <> 'pgAdmin4'::text);
+
+COMMENT ON DOMAIN source.dom_type_diff
+    IS 'Test comment';
+
+-- Type Script RANGE type
+CREATE TYPE source.typ_range_src AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."POSIX",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE source.typ_range_src
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_range_col_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE source.typ_range_col_diff
+    OWNER TO postgres;
+COMMENT ON TYPE source.typ_range_col_diff
+    IS 'Test Comment';
+GRANT USAGE ON TYPE source.typ_range_col_diff TO PUBLIC;
+GRANT USAGE ON TYPE source.typ_range_col_diff TO postgres WITH GRANT OPTION;
+
+CREATE TYPE source.typ_range_subtype_diff AS RANGE
+(
+    SUBTYPE=bpchar,
+    COLLATION = pg_catalog."POSIX"
+);
+ALTER TYPE source.typ_range_subtype_diff
+    OWNER TO postgres;
+
+-- Type Script SHELL type
+CREATE TYPE source.typ_shell_src;
+ALTER TYPE source.typ_shell_src
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_shell_diff;
+ALTER TYPE source.typ_shell_diff
+    OWNER TO postgres;
+COMMENT ON TYPE source.typ_shell_diff
+    IS 'Test Comment';
+
+-- Type script to test when Type is different
+CREATE TYPE source.typ_comp_range_diff AS
+(
+	m1 bigint,
+	m2 text[] COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE source.typ_comp_range_diff
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_comp_enum_diff AS
+(
+	m1 bigint,
+	m2 text[] COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE source.typ_comp_range_diff
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_range_comp_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE source.typ_range_comp_diff
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_range_enum_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE source.typ_range_enum_diff
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_enum_comp_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE source.typ_enum_comp_diff
+    OWNER TO postgres;
+
+CREATE TYPE source.typ_enum_range_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE source.typ_enum_range_diff
+    OWNER TO postgres;
--- a/web/pgadmin/tools/schema_diff/tests/pg/9.2_plus/target.sql
+++ b/web/pgadmin/tools/schema_diff/tests/pg/9.2_plus/target.sql
@@ -405,3 +405,146 @@ CREATE TEXT SEARCH TEMPLATE target.fts_templ_diff (
 );

 COMMENT ON TEXT SEARCH TEMPLATE target.fts_templ_diff IS 'Comment';
+
+-- Domain and Domain Constraint script
+CREATE DOMAIN target.dom_src
+    AS bigint
+    DEFAULT 100
+    NOT NULL;
+
+ALTER DOMAIN target.dom_src OWNER TO postgres;
+
+ALTER DOMAIN target.dom_src
+    ADD CONSTRAINT con_src CHECK (VALUE <> 100);
+
+CREATE DOMAIN target.dom_cons_diff
+    AS bigint
+    DEFAULT 400;
+
+ALTER DOMAIN target.dom_cons_diff OWNER TO postgres;
+
+ALTER DOMAIN target.dom_cons_diff
+    ADD CONSTRAINT cons_diff_1 CHECK (VALUE <> 40);
+
+ALTER DOMAIN target.dom_cons_diff
+    ADD CONSTRAINT cons_tar_only CHECK (VALUE <> 25);
+
+CREATE DOMAIN target.dom_type_diff
+    AS numeric(8,4);
+
+ALTER DOMAIN target.dom_type_diff OWNER TO postgres;
+
+ALTER DOMAIN target.dom_type_diff
+    ADD CONSTRAINT cons1 CHECK (VALUE <> 45::numeric);
+
+ALTER DOMAIN target.dom_type_diff
+    ADD CONSTRAINT cons2 CHECK (VALUE <> 50::numeric);
+
+COMMENT ON DOMAIN target.dom_type_diff
+    IS 'Comment';
+
+-- Type Script composite type
+CREATE TYPE target.typ_comp_tar AS
+(
+	m1 bit(5),
+	m2 text COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE target.typ_comp_tar
+    OWNER TO postgres;
+CREATE TYPE target.typ_comp_diff AS
+(
+	m1 bit(5),
+	m2 text COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE target.typ_comp_diff
+    OWNER TO postgres;
+
+-- Type Script ENUM type
+CREATE TYPE target.typ_enum_tar AS ENUM
+    ('test_enum');
+ALTER TYPE target.typ_enum_tar
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_enum_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE target.typ_enum_diff
+    OWNER TO postgres;
+
+-- Type Script RANGE type
+CREATE TYPE target.typ_range_tar AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."POSIX",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE target.typ_range_tar
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_range_col_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."POSIX",
+    SUBTYPE_OPCLASS = text_ops
+);
+
+CREATE TYPE target.typ_range_subtype_diff AS RANGE
+(
+    SUBTYPE=bool,
+    SUBTYPE_OPCLASS = bool_ops
+);
+ALTER TYPE target.typ_range_subtype_diff
+    OWNER TO postgres;
+
+-- Type Script SHELL type
+CREATE TYPE target.typ_shell_tar;
+ALTER TYPE target.typ_shell_tar
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_shell_diff;
+ALTER TYPE target.typ_shell_diff
+    OWNER TO postgres;
+
+-- Type script to test when Type is different
+CREATE TYPE target.typ_comp_range_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE target.typ_comp_range_diff
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_comp_enum_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE target.typ_comp_enum_diff
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_range_comp_diff AS
+(
+	m1 bigint,
+	m2 text[] COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE target.typ_range_comp_diff
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_range_enum_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE target.typ_range_enum_diff
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_enum_comp_diff AS
+(
+	m1 bigint,
+	m2 text[] COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE target.typ_enum_comp_diff
+    OWNER TO postgres;
+
+CREATE TYPE target.typ_enum_range_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE target.typ_enum_range_diff
+    OWNER TO postgres;
--- a/web/pgadmin/tools/schema_diff/tests/ppas/10_plus/source.sql
+++ b/web/pgadmin/tools/schema_diff/tests/ppas/10_plus/source.sql
@@ -462,3 +462,129 @@ CREATE TEXT SEARCH TEMPLATE source.fts_templ_diff (
 );

 COMMENT ON TEXT SEARCH TEMPLATE source.fts_templ_diff IS 'Test Comment';
+
+-- Domain and Domain Constraint script
+CREATE DOMAIN source.dom_src
+    AS bigint
+    DEFAULT 100
+    NOT NULL;
+
+ALTER DOMAIN source.dom_src OWNER TO enterprisedb;
+
+ALTER DOMAIN source.dom_src
+    ADD CONSTRAINT con_src CHECK (VALUE <> 100);
+
+CREATE DOMAIN source.dom_cons_diff
+    AS bigint
+    DEFAULT 100
+    NOT NULL;
+
+ALTER DOMAIN source.dom_cons_diff OWNER TO enterprisedb;
+
+ALTER DOMAIN source.dom_cons_diff
+    ADD CONSTRAINT cons_diff_1 CHECK (VALUE <> 50);
+
+ALTER DOMAIN source.dom_cons_diff
+    ADD CONSTRAINT cons_src_only CHECK (VALUE <> 25);
+
+CREATE DOMAIN source.dom_type_diff
+    AS character varying(40)
+    COLLATE pg_catalog."POSIX";
+
+ALTER DOMAIN source.dom_type_diff OWNER TO enterprisedb;
+
+ALTER DOMAIN source.dom_type_diff
+    ADD CONSTRAINT cons1 CHECK (VALUE::text <> 'pgAdmin3'::text);
+
+ALTER DOMAIN source.dom_type_diff
+    ADD CONSTRAINT cons2 CHECK (VALUE::text <> 'pgAdmin4'::text);
+
+COMMENT ON DOMAIN source.dom_type_diff
+    IS 'Test comment';
+
+-- Type Script RANGE type
+CREATE TYPE source.typ_range_src AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."POSIX",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE source.typ_range_src
+    OWNER TO enterprisedb;
+
+CREATE TYPE source.typ_range_col_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE source.typ_range_col_diff
+    OWNER TO pg_monitor;
+COMMENT ON TYPE source.typ_range_col_diff
+    IS 'Test Comment';
+GRANT USAGE ON TYPE source.typ_range_col_diff TO PUBLIC;
+GRANT USAGE ON TYPE source.typ_range_col_diff TO pg_monitor WITH GRANT OPTION;
+
+CREATE TYPE source.typ_range_subtype_diff AS RANGE
+(
+    SUBTYPE=bpchar,
+    COLLATION = pg_catalog."POSIX"
+);
+ALTER TYPE source.typ_range_subtype_diff
+    OWNER TO enterprisedb;
+
+-- Type Script SHELL type
+CREATE TYPE source.typ_shell_src;
+ALTER TYPE source.typ_shell_src
+    OWNER TO enterprisedb;
+
+CREATE TYPE source.typ_shell_diff;
+ALTER TYPE source.typ_shell_diff
+    OWNER TO enterprisedb;
+COMMENT ON TYPE source.typ_shell_diff
+    IS 'Test Comment';
+
+-- Type script to test when Type is different
+CREATE TYPE source.typ_comp_range_diff AS
+(
+	m1 bigint,
+	m2 text[] COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE source.typ_comp_range_diff
+    OWNER TO enterprisedb;
+
+CREATE TYPE source.typ_comp_enum_diff AS
+(
+	m1 bigint,
+	m2 text[] COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE source.typ_comp_range_diff
+    OWNER TO enterprisedb;
+
+CREATE TYPE source.typ_range_comp_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE source.typ_range_comp_diff
+    OWNER TO enterprisedb;
+
+CREATE TYPE source.typ_range_enum_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE source.typ_range_enum_diff
+    OWNER TO enterprisedb;
+
+CREATE TYPE source.typ_enum_comp_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE source.typ_enum_comp_diff
+    OWNER TO enterprisedb;
+
+CREATE TYPE source.typ_enum_range_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE source.typ_enum_range_diff
+    OWNER TO enterprisedb;
--- a/web/pgadmin/tools/schema_diff/tests/ppas/10_plus/target.sql
+++ b/web/pgadmin/tools/schema_diff/tests/ppas/10_plus/target.sql
@@ -432,3 +432,149 @@ CREATE TEXT SEARCH TEMPLATE target.fts_templ_diff (
 );

 COMMENT ON TEXT SEARCH TEMPLATE target.fts_templ_diff IS 'Comment';
+
+-- Domain and Domain Constraint script
+CREATE DOMAIN target.dom_src
+    AS bigint
+    DEFAULT 100
+    NOT NULL;
+
+ALTER DOMAIN target.dom_src OWNER TO enterprisedb;
+
+ALTER DOMAIN target.dom_src
+    ADD CONSTRAINT con_src CHECK (VALUE <> 100);
+
+CREATE DOMAIN target.dom_cons_diff
+    AS bigint
+    DEFAULT 400;
+
+ALTER DOMAIN target.dom_cons_diff OWNER TO enterprisedb;
+
+ALTER DOMAIN target.dom_cons_diff
+    ADD CONSTRAINT cons_diff_1 CHECK (VALUE <> 40);
+
+ALTER DOMAIN target.dom_cons_diff
+    ADD CONSTRAINT cons_tar_only CHECK (VALUE <> 25);
+
+CREATE DOMAIN target.dom_type_diff
+    AS numeric(8,4);
+
+ALTER DOMAIN target.dom_type_diff OWNER TO enterprisedb;
+
+ALTER DOMAIN target.dom_type_diff
+    ADD CONSTRAINT cons1 CHECK (VALUE <> 45::numeric);
+
+ALTER DOMAIN target.dom_type_diff
+    ADD CONSTRAINT cons2 CHECK (VALUE <> 50::numeric);
+
+COMMENT ON DOMAIN target.dom_type_diff
+    IS 'Comment';
+
+-- Type Script composite type
+CREATE TYPE target.typ_comp_tar AS
+(
+	m1 bit(5),
+	m2 text COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE target.typ_comp_tar
+    OWNER TO enterprisedb;
+CREATE TYPE target.typ_comp_diff AS
+(
+	m1 bit(5),
+	m2 text COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE target.typ_comp_diff
+    OWNER TO enterprisedb;
+
+-- Type Script ENUM type
+CREATE TYPE target.typ_enum_tar AS ENUM
+    ('test_enum');
+ALTER TYPE target.typ_enum_tar
+    OWNER TO enterprisedb;
+
+CREATE TYPE target.typ_enum_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE target.typ_enum_diff
+    OWNER TO enterprisedb;
+
+-- Type Script RANGE type
+CREATE TYPE target.typ_range_tar AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."POSIX",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE target.typ_range_tar
+    OWNER TO enterprisedb;
+
+CREATE TYPE target.typ_range_col_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."POSIX",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE target.typ_range_col_diff
+    OWNER TO enterprisedb;
+
+CREATE TYPE target.typ_range_subtype_diff AS RANGE
+(
+    SUBTYPE=bool,
+    SUBTYPE_OPCLASS = bool_ops
+);
+ALTER TYPE target.typ_range_subtype_diff
+    OWNER TO enterprisedb;
+
+-- Type Script SHELL type
+CREATE TYPE target.typ_shell_tar;
+ALTER TYPE target.typ_shell_tar
+    OWNER TO enterprisedb;
+
+CREATE TYPE target.typ_shell_diff;
+ALTER TYPE target.typ_shell_diff
+    OWNER TO pg_monitor;
+
+-- Type script to test when Type is different
+CREATE TYPE target.typ_comp_range_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE target.typ_comp_range_diff
+    OWNER TO enterprisedb;
+
+CREATE TYPE target.typ_comp_enum_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE target.typ_comp_enum_diff
+    OWNER TO enterprisedb;
+
+CREATE TYPE target.typ_range_comp_diff AS
+(
+	m1 bigint,
+	m2 text[] COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE target.typ_range_comp_diff
+    OWNER TO enterprisedb;
+
+CREATE TYPE target.typ_range_enum_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE target.typ_range_enum_diff
+    OWNER TO enterprisedb;
+
+CREATE TYPE target.typ_enum_comp_diff AS
+(
+	m1 bigint,
+	m2 text[] COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE target.typ_enum_comp_diff
+    OWNER TO enterprisedb;
+
+CREATE TYPE target.typ_enum_range_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE target.typ_enum_range_diff
+    OWNER TO enterprisedb;
+
--- a/web/pgadmin/tools/schema_diff/tests/ppas/9.2_plus/source.sql
+++ b/web/pgadmin/tools/schema_diff/tests/ppas/9.2_plus/source.sql
@@ -396,3 +396,129 @@ CREATE TEXT SEARCH TEMPLATE source.fts_templ_diff (
 );

 COMMENT ON TEXT SEARCH TEMPLATE source.fts_templ_diff IS 'Test Comment';
+
+-- Domain and Domain Constraint script
+CREATE DOMAIN source.dom_src
+    AS bigint
+    DEFAULT 100
+    NOT NULL;
+
+ALTER DOMAIN source.dom_src OWNER TO enterprisedb;
+
+ALTER DOMAIN source.dom_src
+    ADD CONSTRAINT con_src CHECK (VALUE <> 100);
+
+CREATE DOMAIN source.dom_cons_diff
+    AS bigint
+    DEFAULT 100
+    NOT NULL;
+
+ALTER DOMAIN source.dom_cons_diff OWNER TO enterprisedb;
+
+ALTER DOMAIN source.dom_cons_diff
+    ADD CONSTRAINT cons_diff_1 CHECK (VALUE <> 50);
+
+ALTER DOMAIN source.dom_cons_diff
+    ADD CONSTRAINT cons_src_only CHECK (VALUE <> 25);
+
+CREATE DOMAIN source.dom_type_diff
+    AS character varying(40)
+    COLLATE pg_catalog."POSIX";
+
+ALTER DOMAIN source.dom_type_diff OWNER TO enterprisedb;
+
+ALTER DOMAIN source.dom_type_diff
+    ADD CONSTRAINT cons1 CHECK (VALUE::text <> 'pgAdmin3'::text);
+
+ALTER DOMAIN source.dom_type_diff
+    ADD CONSTRAINT cons2 CHECK (VALUE::text <> 'pgAdmin4'::text);
+
+COMMENT ON DOMAIN source.dom_type_diff
+    IS 'Test comment';
+
+-- Type Script RANGE type
+CREATE TYPE source.typ_range_src AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."POSIX",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE source.typ_range_src
+    OWNER TO enterprisedb;
+
+CREATE TYPE source.typ_range_col_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE source.typ_range_col_diff
+    OWNER TO enterprisedb;
+COMMENT ON TYPE source.typ_range_col_diff
+    IS 'Test Comment';
+GRANT USAGE ON TYPE source.typ_range_col_diff TO PUBLIC;
+GRANT USAGE ON TYPE source.typ_range_col_diff TO enterprisedb WITH GRANT OPTION;
+
+CREATE TYPE source.typ_range_subtype_diff AS RANGE
+(
+    SUBTYPE=bpchar,
+    COLLATION = pg_catalog."POSIX"
+);
+ALTER TYPE source.typ_range_subtype_diff
+    OWNER TO enterprisedb;
+
+-- Type Script SHELL type
+CREATE TYPE source.typ_shell_src;
+ALTER TYPE source.typ_shell_src
+    OWNER TO enterprisedb;
+
+CREATE TYPE source.typ_shell_diff;
+ALTER TYPE source.typ_shell_diff
+    OWNER TO enterprisedb;
+COMMENT ON TYPE source.typ_shell_diff
+    IS 'Test Comment';
+
+-- Type script to test when Type is different
+CREATE TYPE source.typ_comp_range_diff AS
+(
+	m1 bigint,
+	m2 text[] COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE source.typ_comp_range_diff
+    OWNER TO enterprisedb;
+
+CREATE TYPE source.typ_comp_enum_diff AS
+(
+	m1 bigint,
+	m2 text[] COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE source.typ_comp_range_diff
+    OWNER TO enterprisedb;
+
+CREATE TYPE source.typ_range_comp_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE source.typ_range_comp_diff
+    OWNER TO enterprisedb;
+
+CREATE TYPE source.typ_range_enum_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE source.typ_range_enum_diff
+    OWNER TO enterprisedb;
+
+CREATE TYPE source.typ_enum_comp_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE source.typ_enum_comp_diff
+    OWNER TO enterprisedb;
+
+CREATE TYPE source.typ_enum_range_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE source.typ_enum_range_diff
+    OWNER TO enterprisedb;
--- a/web/pgadmin/tools/schema_diff/tests/ppas/9.2_plus/target.sql
+++ b/web/pgadmin/tools/schema_diff/tests/ppas/9.2_plus/target.sql
@@ -405,3 +405,148 @@ CREATE TEXT SEARCH TEMPLATE target.fts_templ_diff (
 );

 COMMENT ON TEXT SEARCH TEMPLATE target.fts_templ_diff IS 'Comment';
+
+-- Domain and Domain Constraint script
+CREATE DOMAIN target.dom_src
+    AS bigint
+    DEFAULT 100
+    NOT NULL;
+
+ALTER DOMAIN target.dom_src OWNER TO enterprisedb;
+
+ALTER DOMAIN target.dom_src
+    ADD CONSTRAINT con_src CHECK (VALUE <> 100);
+
+CREATE DOMAIN target.dom_cons_diff
+    AS bigint
+    DEFAULT 400;
+
+ALTER DOMAIN target.dom_cons_diff OWNER TO enterprisedb;
+
+ALTER DOMAIN target.dom_cons_diff
+    ADD CONSTRAINT cons_diff_1 CHECK (VALUE <> 40);
+
+ALTER DOMAIN target.dom_cons_diff
+    ADD CONSTRAINT cons_tar_only CHECK (VALUE <> 25);
+
+CREATE DOMAIN target.dom_type_diff
+    AS numeric(8,4);
+
+ALTER DOMAIN target.dom_type_diff OWNER TO enterprisedb;
+
+ALTER DOMAIN target.dom_type_diff
+    ADD CONSTRAINT cons1 CHECK (VALUE <> 45::numeric);
+
+ALTER DOMAIN target.dom_type_diff
+    ADD CONSTRAINT cons2 CHECK (VALUE <> 50::numeric);
+
+COMMENT ON DOMAIN target.dom_type_diff
+    IS 'Comment';
+
+-- Type Script composite type
+CREATE TYPE target.typ_comp_tar AS
+(
+	m1 bit(5),
+	m2 text COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE target.typ_comp_tar
+    OWNER TO enterprisedb;
+CREATE TYPE target.typ_comp_diff AS
+(
+	m1 bit(5),
+	m2 text COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE target.typ_comp_diff
+    OWNER TO enterprisedb;
+
+-- Type Script ENUM type
+CREATE TYPE target.typ_enum_tar AS ENUM
+    ('test_enum');
+ALTER TYPE target.typ_enum_tar
+    OWNER TO enterprisedb;
+
+CREATE TYPE target.typ_enum_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE target.typ_enum_diff
+    OWNER TO enterprisedb;
+
+-- Type Script RANGE type
+CREATE TYPE target.typ_range_tar AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."POSIX",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE target.typ_range_tar
+    OWNER TO enterprisedb;
+
+CREATE TYPE target.typ_range_col_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."POSIX",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE target.typ_range_col_diff
+    OWNER TO enterprisedb;
+
+CREATE TYPE target.typ_range_subtype_diff AS RANGE
+(
+    SUBTYPE=bool,
+    SUBTYPE_OPCLASS = bool_ops
+);
+ALTER TYPE target.typ_range_subtype_diff
+    OWNER TO enterprisedb;
+
+-- Type Script SHELL type
+CREATE TYPE target.typ_shell_tar;
+ALTER TYPE target.typ_shell_tar
+    OWNER TO enterprisedb;
+
+CREATE TYPE target.typ_shell_diff;
+ALTER TYPE target.typ_shell_diff
+    OWNER TO enterprisedb;
+
+-- Type script to test when Type is different
+CREATE TYPE target.typ_comp_range_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE target.typ_comp_range_diff
+    OWNER TO enterprisedb;
+
+CREATE TYPE target.typ_comp_enum_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE target.typ_comp_enum_diff
+    OWNER TO enterprisedb;
+
+CREATE TYPE target.typ_range_comp_diff AS
+(
+	m1 bigint,
+	m2 text[] COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE target.typ_range_comp_diff
+    OWNER TO enterprisedb;
+
+CREATE TYPE target.typ_range_enum_diff AS ENUM
+    ('test_enum', 'test_enum_1');
+ALTER TYPE target.typ_range_enum_diff
+    OWNER TO enterprisedb;
+
+CREATE TYPE target.typ_enum_comp_diff AS
+(
+	m1 bigint,
+	m2 text[] COLLATE pg_catalog."POSIX"
+);
+ALTER TYPE target.typ_enum_comp_diff
+    OWNER TO enterprisedb;
+
+CREATE TYPE target.typ_enum_range_diff AS RANGE
+(
+    SUBTYPE=text,
+    COLLATION = pg_catalog."C",
+    SUBTYPE_OPCLASS = text_ops
+);
+ALTER TYPE target.typ_enum_range_diff
+    OWNER TO enterprisedb;