Refactor CAgg migrate regression tests

tsl/test/sql/CMakeLists.txt

@@ -56,12 +56,8 @@ if(CMAKE_BUILD_TYPE MATCHES Debug)
     cagg_drop_chunks.sql
     cagg_dump.sql
     cagg_errors_deprecated.sql
-    cagg_migrate_integer.sql
-    cagg_migrate_integer_dist_ht.sql
-    cagg_migrate_timestamp.sql
-    cagg_migrate_timestamp_dist_ht.sql
-    cagg_migrate_timestamptz.sql
-    cagg_migrate_timestamptz_dist_ht.sql
+    cagg_migrate.sql
+    cagg_migrate_dist_ht.sql
     cagg_multi.sql
     cagg_on_cagg_integer.sql
     cagg_on_cagg_integer_dist_ht.sql

tsl/test/sql/cagg_migrate.sql

@@ -0,0 +1,26 @@
+-- This file and its contents are licensed under the Timescale License.
+-- Please see the included NOTICE for copyright information and
+-- LICENSE-TIMESCALE for a copy of the license.
+
+\set IS_DISTRIBUTED FALSE
+\set IS_TIME_DIMENSION FALSE
+
+-- ########################################################
+-- ## INTEGER data type tests
+-- ########################################################
+\set TIME_DIMENSION_DATATYPE INTEGER
+\ir include/cagg_migrate_common.sql
+
+-- ########################################################
+-- ## TIMESTAMP data type tests
+-- ########################################################
+\set IS_TIME_DIMENSION TRUE
+\set TIME_DIMENSION_DATATYPE TIMESTAMP
+\ir include/cagg_migrate_common.sql
+
+-- ########################################################
+-- ## TIMESTAMPTZ data type tests
+-- ########################################################
+\set IS_TIME_DIMENSION TRUE
+\set TIME_DIMENSION_DATATYPE TIMESTAMPTZ
+\ir include/cagg_migrate_common.sql

tsl/test/sql/cagg_migrate_timestamptz_dist_ht.sql → tsl/test/sql/cagg_migrate_dist_ht.sql

@@ -22,9 +22,26 @@ FROM (
 GRANT USAGE ON FOREIGN SERVER :DATA_NODE_1, :DATA_NODE_2, :DATA_NODE_3 TO PUBLIC;
 
 \set IS_DISTRIBUTED TRUE
+
+-- ########################################################
+-- ## INTEGER data type tests
+-- ########################################################
+\set IS_TIME_DIMENSION FALSE
+\set TIME_DIMENSION_DATATYPE INTEGER
+\ir include/cagg_migrate_common.sql
+
+-- ########################################################
+-- ## TIMESTAMP data type tests
+-- ########################################################
 \set IS_TIME_DIMENSION TRUE
-\set TIME_DIMENSION_DATATYPE TIMESTAMPTZ
+\set TIME_DIMENSION_DATATYPE TIMESTAMP
+\ir include/cagg_migrate_common.sql
 
+-- ########################################################
+-- ## TIMESTAMPTZ data type tests
+-- ########################################################
+\set IS_TIME_DIMENSION TRUE
+\set TIME_DIMENSION_DATATYPE TIMESTAMPTZ
 \ir include/cagg_migrate_common.sql
 
 -- cleanup

tsl/test/sql/include/cagg_migrate_common.sql

@@ -218,7 +218,7 @@ SELECT * FROM conditions_summary_daily
 EXCEPT
 SELECT * FROM conditions_summary_daily_new;
 
-CREATE VIEW cagg_jobs AS
+CREATE OR REPLACE VIEW cagg_jobs AS
 SELECT user_view_schema AS schema, user_view_name AS name, bgw_job.*
 FROM _timescaledb_config.bgw_job
 JOIN _timescaledb_catalog.continuous_agg ON mat_hypertable_id = hypertable_id
@@ -348,7 +348,7 @@ CALL cagg_migrate('conditions_summary_daily');
 ROLLBACK;
 \set ON_ERROR_STOP 1
 
-CREATE FUNCTION execute_migration() RETURNS void AS
+CREATE OR REPLACE FUNCTION execute_migration() RETURNS void AS
 $$
 BEGIN
     CALL cagg_migrate('conditions_summary_daily');
@@ -364,3 +364,10 @@ BEGIN;
 SELECT execute_migration();
 ROLLBACK;
 \set ON_ERROR_STOP 1
+
+-- cleanup
+REVOKE SELECT, INSERT, UPDATE ON TABLE _timescaledb_catalog.continuous_agg_migrate_plan FROM :ROLE_DEFAULT_PERM_USER;
+REVOKE USAGE ON SEQUENCE _timescaledb_catalog.continuous_agg_migrate_plan_step_step_id_seq FROM :ROLE_DEFAULT_PERM_USER;
+TRUNCATE _timescaledb_catalog.continuous_agg_migrate_plan RESTART IDENTITY CASCADE;
+DROP MATERIALIZED VIEW conditions_summary_daily;
+DROP TABLE conditions;