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

Added support of Collation, FTS Configuration, FTS Dictionary, FTS Parser, and FTS Template to the Schema Diff. Fixes #5261

Browse Source
This commit is contained in:
Akshay Joshi
2020-03-19 13:54:25 +05:30
parent 6105fc861d
commit 4fe69e825e
25 changed files with 1329 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -438,3 +438,91 @@ ALTER TABLE source."test view f" OWNER TO postgres;
--
COMMENT ON VIEW source."test view f" IS 'cmn';
-- Collation scripts
CREATE COLLATION source.coll_src
FROM pg_catalog."POSIX";
ALTER COLLATION source.coll_src
OWNER TO postgres;
COMMENT ON COLLATION source.coll_src
IS 'Test Comment';
CREATE COLLATION source.coll_diff
(LC_COLLATE = 'POSIX', LC_CTYPE = 'POSIX');
ALTER COLLATION source.coll_diff
OWNER TO postgres;
COMMENT ON COLLATION source.coll_diff
IS 'Test Comment';
-- FTS Configuration scripts
CREATE TEXT SEARCH CONFIGURATION source.fts_con_src (
COPY=german
);
ALTER TEXT SEARCH CONFIGURATION source.fts_con_src OWNER TO postgres;
COMMENT ON TEXT SEARCH CONFIGURATION source.fts_con_src
IS 'Test Comment';
CREATE TEXT SEARCH CONFIGURATION source.fts_con_diff (
PARSER = default
);
ALTER TEXT SEARCH CONFIGURATION source.fts_con_diff ADD MAPPING FOR asciiword WITH german_stem;
ALTER TEXT SEARCH CONFIGURATION source.fts_con_diff ADD MAPPING FOR email WITH simple;
ALTER TEXT SEARCH CONFIGURATION source.fts_con_diff ADD MAPPING FOR hword WITH dutch_stem;
-- FTS Dictionary scripts
CREATE TEXT SEARCH DICTIONARY source.fts_dict_src (
TEMPLATE = simple,
stopwords = 'english'
);
COMMENT ON TEXT SEARCH DICTIONARY source.fts_dict_src
IS 'Test Comment';
CREATE TEXT SEARCH DICTIONARY source.fts_dict_diff (
TEMPLATE = simple,
stopwords = 'english'
);
COMMENT ON TEXT SEARCH DICTIONARY source.fts_dict_diff
IS 'Test Comment';
-- FTS Parser scripts
CREATE TEXT SEARCH PARSER source.fts_par_src (
START = prsd_start,
GETTOKEN = prsd_nexttoken,
END = prsd_end,
LEXTYPES = prsd_lextype);
COMMENT ON TEXT SEARCH PARSER source.fts_par_src
IS 'Test Comment';
CREATE TEXT SEARCH PARSER source.fts_par_diff (
START = prsd_start,
GETTOKEN = prsd_nexttoken,
END = prsd_end,
LEXTYPES = prsd_lextype);
COMMENT ON TEXT SEARCH PARSER source.fts_par_diff
IS 'Test Comment';
-- FTS Template scripts
CREATE TEXT SEARCH TEMPLATE source.fts_templ_src (
INIT = dispell_init,
LEXIZE = dispell_lexize
);
COMMENT ON TEXT SEARCH TEMPLATE source.fts_templ_src IS 'Test Comment';
CREATE TEXT SEARCH TEMPLATE source.fts_templ_diff (
INIT = dispell_init,
LEXIZE = dispell_lexize
);
COMMENT ON TEXT SEARCH TEMPLATE source.fts_templ_diff IS 'Test Comment';

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

@@ -427,3 +427,73 @@ ALTER TABLE target."test view f" OWNER TO postgres;
--
COMMENT ON VIEW target."test view f" IS 'cmn';
-- Collation scripts
CREATE COLLATION target.coll_tar
FROM pg_catalog."POSIX";
ALTER COLLATION target.coll_tar
OWNER TO postgres;
CREATE COLLATION target.coll_diff
(LC_COLLATE = 'C', LC_CTYPE = 'C');
ALTER COLLATION target.coll_diff
OWNER TO postgres;
-- FTS Configuration scripts
CREATE TEXT SEARCH CONFIGURATION target.fts_con_tar (
COPY=german
);
ALTER TEXT SEARCH CONFIGURATION target.fts_con_tar OWNER TO postgres;
CREATE TEXT SEARCH CONFIGURATION target.fts_con_diff (
PARSER = default
);
ALTER TEXT SEARCH CONFIGURATION target.fts_con_diff ADD MAPPING FOR asciiword WITH dutch_stem;
ALTER TEXT SEARCH CONFIGURATION target.fts_con_diff ADD MAPPING FOR email WITH simple;
ALTER TEXT SEARCH CONFIGURATION target.fts_con_diff ADD MAPPING FOR hword WITH german_stem;
-- FTS Dictionary scripts
CREATE TEXT SEARCH DICTIONARY target.fts_dict_tar (
TEMPLATE = simple,
stopwords = 'english'
);
CREATE TEXT SEARCH DICTIONARY target.fts_dict_diff (
TEMPLATE = simple,
stopwords = 'german'
);
COMMENT ON TEXT SEARCH DICTIONARY target.fts_dict_diff
IS 'Comment';
-- FTS Parser scripts
CREATE TEXT SEARCH PARSER target.fts_par_tar (
START = prsd_start,
GETTOKEN = prsd_nexttoken,
END = prsd_end,
LEXTYPES = prsd_lextype);
CREATE TEXT SEARCH PARSER target.fts_par_diff (
START = int4_accum,
GETTOKEN = inet_gist_penalty,
END = btint2sortsupport,
LEXTYPES = dispell_init);
COMMENT ON TEXT SEARCH PARSER target.fts_par_diff
IS 'Comment';
-- FTS Template scripts
CREATE TEXT SEARCH TEMPLATE target.fts_templ_tar (
INIT = dispell_init,
LEXIZE = dispell_lexize
);
CREATE TEXT SEARCH TEMPLATE target.fts_templ_diff (
INIT = dsimple_init,
LEXIZE = dsimple_lexize
);
COMMENT ON TEXT SEARCH TEMPLATE target.fts_templ_diff IS 'Comment';

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

@@ -437,3 +437,91 @@ ALTER TABLE source."test view f" OWNER TO postgres;
--
COMMENT ON VIEW source."test view f" IS 'cmn';
-- Collation scripts
CREATE COLLATION source.coll_src
FROM pg_catalog."POSIX";
ALTER COLLATION source.coll_src
OWNER TO postgres;
COMMENT ON COLLATION source.coll_src
IS 'Test Comment';
CREATE COLLATION source.coll_diff
(LC_COLLATE = 'POSIX', LC_CTYPE = 'POSIX');
ALTER COLLATION source.coll_diff
OWNER TO postgres;
COMMENT ON COLLATION source.coll_diff
IS 'Test Comment';
-- FTS Configuration scripts
CREATE TEXT SEARCH CONFIGURATION source.fts_con_src (
COPY=german
);
ALTER TEXT SEARCH CONFIGURATION source.fts_con_src OWNER TO postgres;
COMMENT ON TEXT SEARCH CONFIGURATION source.fts_con_src
IS 'Test Comment';
CREATE TEXT SEARCH CONFIGURATION source.fts_con_diff (
PARSER = default
);
ALTER TEXT SEARCH CONFIGURATION source.fts_con_diff ADD MAPPING FOR asciiword WITH german_stem;
ALTER TEXT SEARCH CONFIGURATION source.fts_con_diff ADD MAPPING FOR email WITH simple;
ALTER TEXT SEARCH CONFIGURATION source.fts_con_diff ADD MAPPING FOR hword WITH dutch_stem;
-- FTS Dictionary scripts
CREATE TEXT SEARCH DICTIONARY source.fts_dict_src (
TEMPLATE = simple,
stopwords = 'english'
);
COMMENT ON TEXT SEARCH DICTIONARY source.fts_dict_src
IS 'Test Comment';
CREATE TEXT SEARCH DICTIONARY source.fts_dict_diff (
TEMPLATE = simple,
stopwords = 'english'
);
COMMENT ON TEXT SEARCH DICTIONARY source.fts_dict_diff
IS 'Test Comment';
-- FTS Parser scripts
CREATE TEXT SEARCH PARSER source.fts_par_src (
START = prsd_start,
GETTOKEN = prsd_nexttoken,
END = prsd_end,
LEXTYPES = prsd_lextype);
COMMENT ON TEXT SEARCH PARSER source.fts_par_src
IS 'Test Comment';
CREATE TEXT SEARCH PARSER source.fts_par_diff (
START = prsd_start,
GETTOKEN = prsd_nexttoken,
END = prsd_end,
LEXTYPES = prsd_lextype);
COMMENT ON TEXT SEARCH PARSER source.fts_par_diff
IS 'Test Comment';
-- FTS Template scripts
CREATE TEXT SEARCH TEMPLATE source.fts_templ_src (
INIT = dispell_init,
LEXIZE = dispell_lexize
);
COMMENT ON TEXT SEARCH TEMPLATE source.fts_templ_src IS 'Test Comment';
CREATE TEXT SEARCH TEMPLATE source.fts_templ_diff (
INIT = dispell_init,
LEXIZE = dispell_lexize
);
COMMENT ON TEXT SEARCH TEMPLATE source.fts_templ_diff IS 'Test Comment';

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

@@ -426,3 +426,73 @@ ALTER TABLE target."test view f" OWNER TO postgres;
--
COMMENT ON VIEW target."test view f" IS 'cmn';
-- Collation scripts
CREATE COLLATION target.coll_tar
FROM pg_catalog."POSIX";
ALTER COLLATION target.coll_tar
OWNER TO postgres;
CREATE COLLATION target.coll_diff
(LC_COLLATE = 'C', LC_CTYPE = 'C');
ALTER COLLATION target.coll_diff
OWNER TO postgres;
-- FTS Configuration scripts
CREATE TEXT SEARCH CONFIGURATION target.fts_con_tar (
COPY=german
);
ALTER TEXT SEARCH CONFIGURATION target.fts_con_tar OWNER TO postgres;
CREATE TEXT SEARCH CONFIGURATION target.fts_con_diff (
PARSER = default
);
ALTER TEXT SEARCH CONFIGURATION target.fts_con_diff ADD MAPPING FOR asciiword WITH dutch_stem;
ALTER TEXT SEARCH CONFIGURATION target.fts_con_diff ADD MAPPING FOR email WITH simple;
ALTER TEXT SEARCH CONFIGURATION target.fts_con_diff ADD MAPPING FOR hword WITH german_stem;
-- FTS Dictionary scripts
CREATE TEXT SEARCH DICTIONARY target.fts_dict_tar (
TEMPLATE = simple,
stopwords = 'english'
);
CREATE TEXT SEARCH DICTIONARY target.fts_dict_diff (
TEMPLATE = simple,
stopwords = 'german'
);
COMMENT ON TEXT SEARCH DICTIONARY target.fts_dict_diff
IS 'Comment';
-- FTS Parser scripts
CREATE TEXT SEARCH PARSER target.fts_par_tar (
START = prsd_start,
GETTOKEN = prsd_nexttoken,
END = prsd_end,
LEXTYPES = prsd_lextype);
CREATE TEXT SEARCH PARSER target.fts_par_diff (
START = int4_accum,
GETTOKEN = inet_gist_penalty,
END = btint2sortsupport,
LEXTYPES = dispell_init);
COMMENT ON TEXT SEARCH PARSER target.fts_par_diff
IS 'Comment';
-- FTS Template scripts
CREATE TEXT SEARCH TEMPLATE target.fts_templ_tar (
INIT = dispell_init,
LEXIZE = dispell_lexize
);
CREATE TEXT SEARCH TEMPLATE target.fts_templ_diff (
INIT = dsimple_init,
LEXIZE = dsimple_lexize
);
COMMENT ON TEXT SEARCH TEMPLATE target.fts_templ_diff IS 'Comment';

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

@@ -438,3 +438,91 @@ CREATE PROCEDURE source.proc1(arg1 bigint)
ALTER PROCEDURE source.proc1(arg1 bigint) OWNER TO postgres;
-- Collation scripts
CREATE COLLATION source.coll_src
FROM pg_catalog."POSIX";
ALTER COLLATION source.coll_src
OWNER TO postgres;
COMMENT ON COLLATION source.coll_src
IS 'Test Comment';
CREATE COLLATION source.coll_diff
(LC_COLLATE = 'POSIX', LC_CTYPE = 'POSIX');
ALTER COLLATION source.coll_diff
OWNER TO postgres;
COMMENT ON COLLATION source.coll_diff
IS 'Test Comment';
-- FTS Configuration scripts
CREATE TEXT SEARCH CONFIGURATION source.fts_con_src (
COPY=german
);
ALTER TEXT SEARCH CONFIGURATION source.fts_con_src OWNER TO postgres;
COMMENT ON TEXT SEARCH CONFIGURATION source.fts_con_src
IS 'Test Comment';
CREATE TEXT SEARCH CONFIGURATION source.fts_con_diff (
PARSER = default
);
ALTER TEXT SEARCH CONFIGURATION source.fts_con_diff ADD MAPPING FOR asciiword WITH german_stem;
ALTER TEXT SEARCH CONFIGURATION source.fts_con_diff ADD MAPPING FOR email WITH simple;
ALTER TEXT SEARCH CONFIGURATION source.fts_con_diff ADD MAPPING FOR hword WITH dutch_stem;
-- FTS Dictionary scripts
CREATE TEXT SEARCH DICTIONARY source.fts_dict_src (
TEMPLATE = simple,
stopwords = 'english'
);
COMMENT ON TEXT SEARCH DICTIONARY source.fts_dict_src
IS 'Test Comment';
CREATE TEXT SEARCH DICTIONARY source.fts_dict_diff (
TEMPLATE = simple,
stopwords = 'english'
);
COMMENT ON TEXT SEARCH DICTIONARY source.fts_dict_diff
IS 'Test Comment';
-- FTS Parser scripts
CREATE TEXT SEARCH PARSER source.fts_par_src (
START = prsd_start,
GETTOKEN = prsd_nexttoken,
END = prsd_end,
LEXTYPES = prsd_lextype);
COMMENT ON TEXT SEARCH PARSER source.fts_par_src
IS 'Test Comment';
CREATE TEXT SEARCH PARSER source.fts_par_diff (
START = prsd_start,
GETTOKEN = prsd_nexttoken,
END = prsd_end,
LEXTYPES = prsd_lextype);
COMMENT ON TEXT SEARCH PARSER source.fts_par_diff
IS 'Test Comment';
-- FTS Template scripts
CREATE TEXT SEARCH TEMPLATE source.fts_templ_src (
INIT = dispell_init,
LEXIZE = dispell_lexize
);
COMMENT ON TEXT SEARCH TEMPLATE source.fts_templ_src IS 'Test Comment';
CREATE TEXT SEARCH TEMPLATE source.fts_templ_diff (
INIT = dispell_init,
LEXIZE = dispell_lexize
);
COMMENT ON TEXT SEARCH TEMPLATE source.fts_templ_diff IS 'Test Comment';

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

@@ -415,3 +415,73 @@ CREATE PROCEDURE target.dodaj_klijenta(v_naziv character varying, v_oib characte
ALTER PROCEDURE target.dodaj_klijenta(v_naziv character varying, v_oib character varying, v_pdv_id character varying, v_adresa character varying, v_mjesto integer, v_drzava character varying, v_tip_p_sub character varying, v_vlasnik character varying, v_pdv boolean, v_fisk boolean, v_iban character varying, v_k_osoba character varying, v_email character varying, v_br_tel character varying, v_radna_god numeric, v_schema character varying) OWNER TO postgres;
-- Collation scripts
CREATE COLLATION target.coll_tar
FROM pg_catalog."POSIX";
ALTER COLLATION target.coll_tar
OWNER TO postgres;
CREATE COLLATION target.coll_diff
(LC_COLLATE = 'C', LC_CTYPE = 'C');
ALTER COLLATION target.coll_diff
OWNER TO postgres;
-- FTS Configuration scripts
CREATE TEXT SEARCH CONFIGURATION target.fts_con_tar (
COPY=german
);
ALTER TEXT SEARCH CONFIGURATION target.fts_con_tar OWNER TO postgres;
CREATE TEXT SEARCH CONFIGURATION target.fts_con_diff (
PARSER = default
);
ALTER TEXT SEARCH CONFIGURATION target.fts_con_diff ADD MAPPING FOR asciiword WITH dutch_stem;
ALTER TEXT SEARCH CONFIGURATION target.fts_con_diff ADD MAPPING FOR email WITH simple;
ALTER TEXT SEARCH CONFIGURATION target.fts_con_diff ADD MAPPING FOR hword WITH german_stem;
-- FTS Dictionary scripts
CREATE TEXT SEARCH DICTIONARY target.fts_dict_tar (
TEMPLATE = simple,
stopwords = 'english'
);
CREATE TEXT SEARCH DICTIONARY target.fts_dict_diff (
TEMPLATE = simple,
stopwords = 'german'
);
COMMENT ON TEXT SEARCH DICTIONARY target.fts_dict_diff
IS 'Comment';
-- FTS Parser scripts
CREATE TEXT SEARCH PARSER target.fts_par_tar (
START = prsd_start,
GETTOKEN = prsd_nexttoken,
END = prsd_end,
LEXTYPES = prsd_lextype);
CREATE TEXT SEARCH PARSER target.fts_par_diff (
START = int4_accum,
GETTOKEN = inet_gist_penalty,
END = btint2sortsupport,
LEXTYPES = dispell_init);
COMMENT ON TEXT SEARCH PARSER target.fts_par_diff
IS 'Comment';
-- FTS Template scripts
CREATE TEXT SEARCH TEMPLATE target.fts_templ_tar (
INIT = dispell_init,
LEXIZE = dispell_lexize
);
CREATE TEXT SEARCH TEMPLATE target.fts_templ_diff (
INIT = dsimple_init,
LEXIZE = dsimple_lexize
);
COMMENT ON TEXT SEARCH TEMPLATE target.fts_templ_diff IS 'Comment';

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

@@ -309,3 +309,89 @@ COMMENT ON RULE rule1 ON source.table_for_rule IS 'comments';
CREATE RULE rule2 AS
ON INSERT TO source.table_for_rule DO NOTHING;
-- Collation scripts
CREATE COLLATION source.coll_src
FROM pg_catalog."POSIX";
ALTER COLLATION source.coll_src
OWNER TO postgres;
COMMENT ON COLLATION source.coll_src
IS 'Test Comment';
CREATE COLLATION source.coll_diff
(LC_COLLATE = 'POSIX', LC_CTYPE = 'POSIX');
ALTER COLLATION source.coll_diff
OWNER TO postgres;
COMMENT ON COLLATION source.coll_diff
IS 'Test Comment';
-- FTS Configuration scripts
CREATE TEXT SEARCH CONFIGURATION source.fts_con_src (
COPY=german
);
ALTER TEXT SEARCH CONFIGURATION source.fts_con_src OWNER TO postgres;
COMMENT ON TEXT SEARCH CONFIGURATION source.fts_con_src
IS 'Test Comment';
CREATE TEXT SEARCH CONFIGURATION source.fts_con_diff (
PARSER = default
);
ALTER TEXT SEARCH CONFIGURATION source.fts_con_diff ADD MAPPING FOR asciiword WITH german_stem;
ALTER TEXT SEARCH CONFIGURATION source.fts_con_diff ADD MAPPING FOR email WITH simple;
ALTER TEXT SEARCH CONFIGURATION source.fts_con_diff ADD MAPPING FOR hword WITH dutch_stem;
-- FTS Dictionary scripts
CREATE TEXT SEARCH DICTIONARY source.fts_dict_src (
TEMPLATE = simple,
stopwords = 'english'
);
COMMENT ON TEXT SEARCH DICTIONARY source.fts_dict_src
IS 'Test Comment';
CREATE TEXT SEARCH DICTIONARY source.fts_dict_diff (
TEMPLATE = simple,
stopwords = 'english'
);
COMMENT ON TEXT SEARCH DICTIONARY source.fts_dict_diff
IS 'Test Comment';
-- FTS Parser scripts
CREATE TEXT SEARCH PARSER source.fts_par_src (
START = prsd_start,
GETTOKEN = prsd_nexttoken,
END = prsd_end,
LEXTYPES = prsd_lextype);
COMMENT ON TEXT SEARCH PARSER source.fts_par_src
IS 'Test Comment';
CREATE TEXT SEARCH PARSER source.fts_par_diff (
START = prsd_start,
GETTOKEN = prsd_nexttoken,
END = prsd_end,
LEXTYPES = prsd_lextype);
COMMENT ON TEXT SEARCH PARSER source.fts_par_diff
IS 'Test Comment';
-- FTS Template scripts
CREATE TEXT SEARCH TEMPLATE source.fts_templ_src (
INIT = dispell_init,
LEXIZE = dispell_lexize
);
COMMENT ON TEXT SEARCH TEMPLATE source.fts_templ_src IS 'Test Comment';
CREATE TEXT SEARCH TEMPLATE source.fts_templ_diff (
INIT = dispell_init,
LEXIZE = dispell_lexize
);
COMMENT ON TEXT SEARCH TEMPLATE source.fts_templ_diff IS 'Test Comment';

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

@@ -335,3 +335,73 @@ CREATE RULE rule3 AS
--
REFRESH MATERIALIZED VIEW target."MView";
-- Collation scripts
CREATE COLLATION target.coll_tar
FROM pg_catalog."POSIX";
ALTER COLLATION target.coll_tar
OWNER TO postgres;
CREATE COLLATION target.coll_diff
(LC_COLLATE = 'C', LC_CTYPE = 'C');
ALTER COLLATION target.coll_diff
OWNER TO postgres;
-- FTS Configuration scripts
CREATE TEXT SEARCH CONFIGURATION target.fts_con_tar (
COPY=german
);
ALTER TEXT SEARCH CONFIGURATION target.fts_con_tar OWNER TO postgres;
CREATE TEXT SEARCH CONFIGURATION target.fts_con_diff (
PARSER = default
);
ALTER TEXT SEARCH CONFIGURATION target.fts_con_diff ADD MAPPING FOR asciiword WITH dutch_stem;
ALTER TEXT SEARCH CONFIGURATION target.fts_con_diff ADD MAPPING FOR email WITH simple;
ALTER TEXT SEARCH CONFIGURATION target.fts_con_diff ADD MAPPING FOR hword WITH german_stem;
-- FTS Dictionary scripts
CREATE TEXT SEARCH DICTIONARY target.fts_dict_tar (
TEMPLATE = simple,
stopwords = 'english'
);
CREATE TEXT SEARCH DICTIONARY target.fts_dict_diff (
TEMPLATE = simple,
stopwords = 'german'
);
COMMENT ON TEXT SEARCH DICTIONARY target.fts_dict_diff
IS 'Comment';
-- FTS Parser scripts
CREATE TEXT SEARCH PARSER target.fts_par_tar (
START = prsd_start,
GETTOKEN = prsd_nexttoken,
END = prsd_end,
LEXTYPES = prsd_lextype);
CREATE TEXT SEARCH PARSER target.fts_par_diff (
START = int4_accum,
GETTOKEN = inet_gist_penalty,
END = btint2sortsupport,
LEXTYPES = dispell_init);
COMMENT ON TEXT SEARCH PARSER target.fts_par_diff
IS 'Comment';
-- FTS Template scripts
CREATE TEXT SEARCH TEMPLATE target.fts_templ_tar (
INIT = dispell_init,
LEXIZE = dispell_lexize
);
CREATE TEXT SEARCH TEMPLATE target.fts_templ_diff (
INIT = dsimple_init,
LEXIZE = dsimple_lexize
);
COMMENT ON TEXT SEARCH TEMPLATE target.fts_templ_diff IS 'Comment';

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

@@ -374,3 +374,91 @@ COMMENT ON RULE rule1 ON source.table_for_rule IS 'comments';
CREATE RULE rule2 AS
ON INSERT TO source.table_for_rule DO NOTHING;
-- Collation scripts
CREATE COLLATION source.coll_src
FROM pg_catalog."POSIX";
ALTER COLLATION source.coll_src
OWNER TO enterprisedb;
COMMENT ON COLLATION source.coll_src
IS 'Test Comment';
CREATE COLLATION source.coll_diff
(LC_COLLATE = 'POSIX', LC_CTYPE = 'POSIX');
ALTER COLLATION source.coll_diff
OWNER TO enterprisedb;
COMMENT ON COLLATION source.coll_diff
IS 'Test Comment';
-- FTS Configuration scripts
CREATE TEXT SEARCH CONFIGURATION source.fts_con_src (
COPY=german
);
ALTER TEXT SEARCH CONFIGURATION source.fts_con_src OWNER TO enterprisedb;
COMMENT ON TEXT SEARCH CONFIGURATION source.fts_con_src
IS 'Test Comment';
CREATE TEXT SEARCH CONFIGURATION source.fts_con_diff (
PARSER = default
);
ALTER TEXT SEARCH CONFIGURATION source.fts_con_diff ADD MAPPING FOR asciiword WITH german_stem;
ALTER TEXT SEARCH CONFIGURATION source.fts_con_diff ADD MAPPING FOR email WITH simple;
ALTER TEXT SEARCH CONFIGURATION source.fts_con_diff ADD MAPPING FOR hword WITH dutch_stem;
-- FTS Dictionary scripts
CREATE TEXT SEARCH DICTIONARY source.fts_dict_src (
TEMPLATE = simple,
stopwords = 'english'
);
COMMENT ON TEXT SEARCH DICTIONARY source.fts_dict_src
IS 'Test Comment';
CREATE TEXT SEARCH DICTIONARY source.fts_dict_diff (
TEMPLATE = simple,
stopwords = 'english'
);
COMMENT ON TEXT SEARCH DICTIONARY source.fts_dict_diff
IS 'Test Comment';
-- FTS Parser scripts
CREATE TEXT SEARCH PARSER source.fts_par_src (
START = prsd_start,
GETTOKEN = prsd_nexttoken,
END = prsd_end,
LEXTYPES = prsd_lextype);
COMMENT ON TEXT SEARCH PARSER source.fts_par_src
IS 'Test Comment';
CREATE TEXT SEARCH PARSER source.fts_par_diff (
START = prsd_start,
GETTOKEN = prsd_nexttoken,
END = prsd_end,
LEXTYPES = prsd_lextype);
COMMENT ON TEXT SEARCH PARSER source.fts_par_diff
IS 'Test Comment';
-- FTS Template scripts
CREATE TEXT SEARCH TEMPLATE source.fts_templ_src (
INIT = dispell_init,
LEXIZE = dispell_lexize
);
COMMENT ON TEXT SEARCH TEMPLATE source.fts_templ_src IS 'Test Comment';
CREATE TEXT SEARCH TEMPLATE source.fts_templ_diff (
INIT = dispell_init,
LEXIZE = dispell_lexize
);
COMMENT ON TEXT SEARCH TEMPLATE source.fts_templ_diff IS 'Test Comment';

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

@@ -362,3 +362,73 @@ CREATE RULE rule3 AS
--
REFRESH MATERIALIZED VIEW target."MView";
-- Collation scripts
CREATE COLLATION target.coll_tar
FROM pg_catalog."POSIX";
ALTER COLLATION target.coll_tar
OWNER TO enterprisedb;
CREATE COLLATION target.coll_diff
(LC_COLLATE = 'C', LC_CTYPE = 'C');
ALTER COLLATION target.coll_diff
OWNER TO enterprisedb;
-- FTS Configuration scripts
CREATE TEXT SEARCH CONFIGURATION target.fts_con_tar (
COPY=german
);
ALTER TEXT SEARCH CONFIGURATION target.fts_con_tar OWNER TO enterprisedb;
CREATE TEXT SEARCH CONFIGURATION target.fts_con_diff (
PARSER = default
);
ALTER TEXT SEARCH CONFIGURATION target.fts_con_diff ADD MAPPING FOR asciiword WITH dutch_stem;
ALTER TEXT SEARCH CONFIGURATION target.fts_con_diff ADD MAPPING FOR email WITH simple;
ALTER TEXT SEARCH CONFIGURATION target.fts_con_diff ADD MAPPING FOR hword WITH german_stem;
-- FTS Dictionary scripts
CREATE TEXT SEARCH DICTIONARY target.fts_dict_tar (
TEMPLATE = simple,
stopwords = 'english'
);
CREATE TEXT SEARCH DICTIONARY target.fts_dict_diff (
TEMPLATE = simple,
stopwords = 'german'
);
COMMENT ON TEXT SEARCH DICTIONARY target.fts_dict_diff
IS 'Comment';
-- FTS Parser scripts
CREATE TEXT SEARCH PARSER target.fts_par_tar (
START = prsd_start,
GETTOKEN = prsd_nexttoken,
END = prsd_end,
LEXTYPES = prsd_lextype);
CREATE TEXT SEARCH PARSER target.fts_par_diff (
START = int4_accum,
GETTOKEN = inet_gist_penalty,
END = btint2sortsupport,
LEXTYPES = dispell_init);
COMMENT ON TEXT SEARCH PARSER target.fts_par_diff
IS 'Comment';
-- FTS Template scripts
CREATE TEXT SEARCH TEMPLATE target.fts_templ_tar (
INIT = dispell_init,
LEXIZE = dispell_lexize
);
CREATE TEXT SEARCH TEMPLATE target.fts_templ_diff (
INIT = dsimple_init,
LEXIZE = dsimple_lexize
);
COMMENT ON TEXT SEARCH TEMPLATE target.fts_templ_diff IS 'Comment';

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

@@ -309,3 +309,90 @@ COMMENT ON RULE rule1 ON source.table_for_rule IS 'comments';
CREATE RULE rule2 AS
ON INSERT TO source.table_for_rule DO NOTHING;
-- Collation scripts
CREATE COLLATION source.coll_src
FROM pg_catalog."default";
ALTER COLLATION source.coll_src
OWNER TO enterprisedb;
COMMENT ON COLLATION source.coll_src
IS 'Test Comment';
CREATE COLLATION source.coll_diff
FROM pg_catalog."default";
ALTER COLLATION source.coll_diff
OWNER TO enterprisedb;
COMMENT ON COLLATION source.coll_diff
IS 'Test Comment';
-- FTS Configuration scripts
CREATE TEXT SEARCH CONFIGURATION source.fts_con_src (
COPY=german
);
ALTER TEXT SEARCH CONFIGURATION source.fts_con_src OWNER TO enterprisedb;
COMMENT ON TEXT SEARCH CONFIGURATION source.fts_con_src
IS 'Test Comment';
CREATE TEXT SEARCH CONFIGURATION source.fts_con_diff (
PARSER = default
);
ALTER TEXT SEARCH CONFIGURATION source.fts_con_diff ADD MAPPING FOR asciiword WITH german_stem;
ALTER TEXT SEARCH CONFIGURATION source.fts_con_diff ADD MAPPING FOR email WITH simple;
ALTER TEXT SEARCH CONFIGURATION source.fts_con_diff ADD MAPPING FOR hword WITH dutch_stem;
-- FTS Dictionary scripts
CREATE TEXT SEARCH DICTIONARY source.fts_dict_src (
TEMPLATE = simple,
stopwords = 'english'
);
COMMENT ON TEXT SEARCH DICTIONARY source.fts_dict_src
IS 'Test Comment';
CREATE TEXT SEARCH DICTIONARY source.fts_dict_diff (
TEMPLATE = simple,
stopwords = 'english'
);
COMMENT ON TEXT SEARCH DICTIONARY source.fts_dict_diff
IS 'Test Comment';
-- FTS Parser scripts
CREATE TEXT SEARCH PARSER source.fts_par_src (
START = prsd_start,
GETTOKEN = prsd_nexttoken,
END = prsd_end,
LEXTYPES = prsd_lextype);
COMMENT ON TEXT SEARCH PARSER source.fts_par_src
IS 'Test Comment';
CREATE TEXT SEARCH PARSER source.fts_par_diff (
START = prsd_start,
GETTOKEN = prsd_nexttoken,
END = prsd_end,
LEXTYPES = prsd_lextype);
COMMENT ON TEXT SEARCH PARSER source.fts_par_diff
IS 'Test Comment';
-- FTS Template scripts
CREATE TEXT SEARCH TEMPLATE source.fts_templ_src (
INIT = dispell_init,
LEXIZE = dispell_lexize
);
COMMENT ON TEXT SEARCH TEMPLATE source.fts_templ_src IS 'Test Comment';
CREATE TEXT SEARCH TEMPLATE source.fts_templ_diff (
INIT = dispell_init,
LEXIZE = dispell_lexize
);
COMMENT ON TEXT SEARCH TEMPLATE source.fts_templ_diff IS 'Test Comment';

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

@@ -335,3 +335,73 @@ CREATE RULE rule3 AS
--
REFRESH MATERIALIZED VIEW target."MView";
-- Collation scripts
CREATE COLLATION target.coll_tar
FROM pg_catalog."default";
ALTER COLLATION target.coll_tar
OWNER TO enterprisedb;
CREATE COLLATION target.coll_diff
(LC_COLLATE = 'C', LC_CTYPE = 'C');
ALTER COLLATION target.coll_diff
OWNER TO enterprisedb;
-- FTS Configuration scripts
CREATE TEXT SEARCH CONFIGURATION target.fts_con_tar (
COPY=german
);
ALTER TEXT SEARCH CONFIGURATION target.fts_con_tar OWNER TO enterprisedb;
CREATE TEXT SEARCH CONFIGURATION target.fts_con_diff (
PARSER = default
);
ALTER TEXT SEARCH CONFIGURATION target.fts_con_diff ADD MAPPING FOR asciiword WITH dutch_stem;
ALTER TEXT SEARCH CONFIGURATION target.fts_con_diff ADD MAPPING FOR email WITH simple;
ALTER TEXT SEARCH CONFIGURATION target.fts_con_diff ADD MAPPING FOR hword WITH german_stem;
-- FTS Dictionary scripts
CREATE TEXT SEARCH DICTIONARY target.fts_dict_tar (
TEMPLATE = simple,
stopwords = 'english'
);
CREATE TEXT SEARCH DICTIONARY target.fts_dict_diff (
TEMPLATE = simple,
stopwords = 'german'
);
COMMENT ON TEXT SEARCH DICTIONARY target.fts_dict_diff
IS 'Comment';
-- FTS Parser scripts
CREATE TEXT SEARCH PARSER target.fts_par_tar (
START = prsd_start,
GETTOKEN = prsd_nexttoken,
END = prsd_end,
LEXTYPES = prsd_lextype);
CREATE TEXT SEARCH PARSER target.fts_par_diff (
START = int4_accum,
GETTOKEN = inet_gist_penalty,
END = btint2sortsupport,
LEXTYPES = dispell_init);
COMMENT ON TEXT SEARCH PARSER target.fts_par_diff
IS 'Comment';
-- FTS Template scripts
CREATE TEXT SEARCH TEMPLATE target.fts_templ_tar (
INIT = dispell_init,
LEXIZE = dispell_lexize
);
CREATE TEXT SEARCH TEMPLATE target.fts_templ_diff (
INIT = dsimple_init,
LEXIZE = dsimple_lexize
);
COMMENT ON TEXT SEARCH TEMPLATE target.fts_templ_diff IS 'Comment';

2
web/pgadmin/tools/schema_diff/tests/test_schema_diff_comp.py
View File

@@ -165,6 +165,8 @@ class SchemaDiffTestCase(BaseTestGenerator):
self.assertEquals(response.status_code, 200)
response_data = json.loads(response.data.decode('utf-8'))
file_obj.write(response_data['diff_ddl'])
elif 'diff_ddl' in diff:
file_obj.write(diff['diff_ddl'])
file_obj.close()
try: