diff --git a/src/backend/distributed/sql/downgrades/citus--10.2-1--10.1-1.sql b/src/backend/distributed/sql/downgrades/citus--10.2-1--10.1-1.sql index 7809b80ce..03da11642 100644 --- a/src/backend/distributed/sql/downgrades/citus--10.2-1--10.1-1.sql +++ b/src/backend/distributed/sql/downgrades/citus--10.2-1--10.1-1.sql @@ -1,6 +1,7 @@ -- citus--10.2-1--10.1-1 #include "../../../columnar/sql/downgrades/columnar--10.2-1--10.1-1.sql" +#include "../../../timeseries/sql/downgrades/timeseries--10.2-1--10.1-1.sql" DROP FUNCTION pg_catalog.stop_metadata_sync_to_node(text, integer, bool); diff --git a/src/backend/timeseries/sql/downgrades/timeseries--10.2-1--10.1-1.sql b/src/backend/timeseries/sql/downgrades/timeseries--10.2-1--10.1-1.sql new file mode 100644 index 000000000..eb3cf713c --- /dev/null +++ b/src/backend/timeseries/sql/downgrades/timeseries--10.2-1--10.1-1.sql @@ -0,0 +1,11 @@ +SET search_path TO timeseries; + +DROP FUNCTION pg_catalog.create_missing_partitions(regclass,timestamp with time zone,timestamp with time zone); +DROP FUNCTION pg_catalog.create_timeseries_table(regclass,interval,integer,integer,timestamp with time zone,interval,interval); +DROP FUNCTION pg_catalog.drop_timeseries_table(regclass); +DROP FUNCTION pg_catalog.get_missing_partition_ranges(regclass,timestamp with time zone,timestamp with time zone); + +DROP TABLE tables; + +RESET search_path; +DROP SCHEMA timeseries; diff --git a/src/test/regress/expected/multi_extension.out b/src/test/regress/expected/multi_extension.out index 57eaa002a..91aef0c3e 100644 --- a/src/test/regress/expected/multi_extension.out +++ b/src/test/regress/expected/multi_extension.out @@ -94,7 +94,7 @@ FROM pg_depend AS pgd, WHERE pgd.refclassid = 'pg_extension'::regclass AND pgd.refobjid = pge.oid AND pge.extname = 'citus' AND - pgio.schema NOT IN ('pg_catalog', 'citus', 'citus_internal', 'test', 'columnar') + pgio.schema NOT IN ('pg_catalog', 'citus', 'citus_internal', 'test', 'columnar', 'timeseries') ORDER BY 1, 2; type | identity --------------------------------------------------------------------- @@ -823,7 +823,7 @@ FROM pg_depend AS pgd, WHERE pgd.refclassid = 'pg_extension'::regclass AND pgd.refobjid = pge.oid AND pge.extname = 'citus' AND - pgio.schema NOT IN ('pg_catalog', 'citus', 'citus_internal', 'test', 'columnar') + pgio.schema NOT IN ('pg_catalog', 'citus', 'citus_internal', 'test', 'columnar', 'timeseries') ORDER BY 1, 2; type | identity --------------------------------------------------------------------- diff --git a/src/test/regress/expected/upgrade_list_citus_objects.out b/src/test/regress/expected/upgrade_list_citus_objects.out index 6bc173450..18a093a0c 100644 --- a/src/test/regress/expected/upgrade_list_citus_objects.out +++ b/src/test/regress/expected/upgrade_list_citus_objects.out @@ -221,8 +221,8 @@ ORDER BY 1; function worker_save_query_explain_analyze(text,jsonb) schema citus schema citus_internal - schema citus_timeseries schema columnar + schema timeseries sequence columnar.storageid_seq sequence pg_dist_colocationid_seq sequence pg_dist_groupid_seq @@ -230,7 +230,6 @@ ORDER BY 1; sequence pg_dist_placement_placementid_seq sequence pg_dist_shardid_seq table citus.pg_dist_object - table timeseries.tables table columnar.chunk table columnar.chunk_group table columnar.options @@ -246,6 +245,7 @@ ORDER BY 1; table pg_dist_rebalance_strategy table pg_dist_shard table pg_dist_transaction + table timeseries.tables type citus.distribution_type type citus.shard_transfer_mode type citus_copy_format diff --git a/src/test/regress/sql/multi_extension.sql b/src/test/regress/sql/multi_extension.sql index 8c54452bb..7f7aa625b 100644 --- a/src/test/regress/sql/multi_extension.sql +++ b/src/test/regress/sql/multi_extension.sql @@ -92,7 +92,7 @@ FROM pg_depend AS pgd, WHERE pgd.refclassid = 'pg_extension'::regclass AND pgd.refobjid = pge.oid AND pge.extname = 'citus' AND - pgio.schema NOT IN ('pg_catalog', 'citus', 'citus_internal', 'test', 'columnar') + pgio.schema NOT IN ('pg_catalog', 'citus', 'citus_internal', 'test', 'columnar', 'timeseries') ORDER BY 1, 2; @@ -330,7 +330,7 @@ FROM pg_depend AS pgd, WHERE pgd.refclassid = 'pg_extension'::regclass AND pgd.refobjid = pge.oid AND pge.extname = 'citus' AND - pgio.schema NOT IN ('pg_catalog', 'citus', 'citus_internal', 'test', 'columnar') + pgio.schema NOT IN ('pg_catalog', 'citus', 'citus_internal', 'test', 'columnar', 'timeseries') ORDER BY 1, 2; -- see incompatible version errors out