diff --git a/src/backend/distributed/sql/downgrades/citus--11.0-2--11.0-1.sql b/src/backend/distributed/sql/downgrades/citus--11.0-2--11.0-1.sql index 55fc11e99..3b557beb1 100644 --- a/src/backend/distributed/sql/downgrades/citus--11.0-2--11.0-1.sql +++ b/src/backend/distributed/sql/downgrades/citus--11.0-2--11.0-1.sql @@ -1,4 +1,14 @@ #include "../udfs/citus_shards_on_worker/11.0-1.sql" #include "../udfs/citus_shard_indexes_on_worker/11.0-1.sql" -#include "../udfs/citus_disable_node/11.0-1.sql" +DROP FUNCTION pg_catalog.citus_disable_node(text, integer, bool); +CREATE FUNCTION pg_catalog.citus_disable_node(nodename text, nodeport integer, force bool default false) + RETURNS void + LANGUAGE C STRICT + AS 'MODULE_PATHNAME', $$citus_disable_node$$; +COMMENT ON FUNCTION pg_catalog.citus_disable_node(nodename text, nodeport integer, force bool) + IS 'removes node from the cluster temporarily'; + +REVOKE ALL ON FUNCTION pg_catalog.citus_disable_node(text,int, bool) FROM PUBLIC; + +DROP FUNCTION pg_catalog.citus_is_coordinator(); diff --git a/src/backend/distributed/sql/downgrades/citus--11.1-1--11.0-2.sql b/src/backend/distributed/sql/downgrades/citus--11.1-1--11.0-2.sql index a3e63ea3a..d03733bc7 100644 --- a/src/backend/distributed/sql/downgrades/citus--11.1-1--11.0-2.sql +++ b/src/backend/distributed/sql/downgrades/citus--11.1-1--11.0-2.sql @@ -45,5 +45,3 @@ CREATE FUNCTION pg_catalog.worker_repartition_cleanup(bigint) LANGUAGE c STRICT AS 'MODULE_PATHNAME', $function$worker_repartition_cleanup$function$ - -DROP FUNCTION pg_catalog.citus_is_coordinator(); diff --git a/src/test/regress/expected/multi_extension.out b/src/test/regress/expected/multi_extension.out index 75b5a3074..3f58f9efc 100644 --- a/src/test/regress/expected/multi_extension.out +++ b/src/test/regress/expected/multi_extension.out @@ -1039,6 +1039,14 @@ SELECT * FROM multi_extension.print_extension_changes(); | function citus_is_coordinator() boolean (1 row) +-- Test downgrade script (result should be empty) +ALTER EXTENSION citus UPDATE TO '11.0-1'; +ALTER EXTENSION citus UPDATE TO '11.0-2'; +SELECT * FROM multi_extension.print_extension_changes(); + previous_object | current_object +--------------------------------------------------------------------- +(0 rows) + -- Snapshot of state at 11.1-1 ALTER EXTENSION citus UPDATE TO '11.1-1'; SELECT * FROM multi_extension.print_extension_changes(); @@ -1054,6 +1062,14 @@ SELECT * FROM multi_extension.print_extension_changes(); function worker_repartition_cleanup(bigint) void | (8 rows) +-- Test downgrade script (result should be empty) +ALTER EXTENSION citus UPDATE TO '11.0-2'; +ALTER EXTENSION citus UPDATE TO '11.1-1'; +SELECT * FROM multi_extension.print_extension_changes(); + previous_object | current_object +--------------------------------------------------------------------- +(0 rows) + DROP TABLE multi_extension.prev_objects, multi_extension.extension_diff; -- show running version SHOW citus.version; diff --git a/src/test/regress/sql/multi_extension.sql b/src/test/regress/sql/multi_extension.sql index 7f91de1be..abd508df4 100644 --- a/src/test/regress/sql/multi_extension.sql +++ b/src/test/regress/sql/multi_extension.sql @@ -463,10 +463,20 @@ SELECT * FROM multi_extension.print_extension_changes(); ALTER EXTENSION citus UPDATE TO '11.0-2'; SELECT * FROM multi_extension.print_extension_changes(); +-- Test downgrade script (result should be empty) +ALTER EXTENSION citus UPDATE TO '11.0-1'; +ALTER EXTENSION citus UPDATE TO '11.0-2'; +SELECT * FROM multi_extension.print_extension_changes(); + -- Snapshot of state at 11.1-1 ALTER EXTENSION citus UPDATE TO '11.1-1'; SELECT * FROM multi_extension.print_extension_changes(); +-- Test downgrade script (result should be empty) +ALTER EXTENSION citus UPDATE TO '11.0-2'; +ALTER EXTENSION citus UPDATE TO '11.1-1'; +SELECT * FROM multi_extension.print_extension_changes(); + DROP TABLE multi_extension.prev_objects, multi_extension.extension_diff; -- show running version