From dc9c5f6ddf995ab8a42f6f70c80f48d641ed8110 Mon Sep 17 00:00:00 2001 From: Sameer Awasekar Date: Thu, 4 Aug 2022 17:18:42 +0530 Subject: [PATCH] Fix multi_extension.out --- .../distributed/sql/downgrades/citus--11.1-1--11.0-3.sql | 7 ++++--- src/test/regress/expected/multi_extension.out | 9 ++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/backend/distributed/sql/downgrades/citus--11.1-1--11.0-3.sql b/src/backend/distributed/sql/downgrades/citus--11.1-1--11.0-3.sql index 07076273b..002ea471b 100644 --- a/src/backend/distributed/sql/downgrades/citus--11.1-1--11.0-3.sql +++ b/src/backend/distributed/sql/downgrades/citus--11.1-1--11.0-3.sql @@ -73,13 +73,14 @@ DROP FUNCTION pg_catalog.worker_split_copy( splitCopyInfos pg_catalog.split_copy_info[]); DROP TYPE pg_catalog.split_copy_info; +DROP FUNCTION pg_catalog.worker_copy_table_to_node( + source_table regclass, + target_node_id integer); + DROP FUNCTION pg_catalog.worker_split_shard_replication_setup( splitShardInfo pg_catalog.split_shard_info[]); DROP TYPE pg_catalog.split_shard_info; DROP TYPE pg_catalog.replication_slot_info; -DROP FUNCTION pg_catalog.worker_copy_table_to_node( - source_table regclass, - target_node_id integer); DROP FUNCTION pg_catalog.get_all_active_transactions(OUT datid oid, OUT process_id int, OUT initiator_node_identifier int4, OUT worker_query BOOL, OUT transaction_number int8, OUT transaction_stamp timestamptz, diff --git a/src/test/regress/expected/multi_extension.out b/src/test/regress/expected/multi_extension.out index ecdbe1cf8..0067bdbad 100644 --- a/src/test/regress/expected/multi_extension.out +++ b/src/test/regress/expected/multi_extension.out @@ -1063,8 +1063,6 @@ SELECT * FROM multi_extension.print_extension_changes(); -- Test downgrade to 11.0-3 from 11.1-1 ALTER EXTENSION citus UPDATE TO '11.1-1'; ALTER EXTENSION citus UPDATE TO '11.0-3'; -ERROR: "options" is not a view -HINT: Use DROP TABLE to remove a table. -- Should be empty result since upgrade+downgrade should be a no-op SELECT * FROM multi_extension.print_extension_changes(); previous_object | current_object @@ -1101,12 +1099,9 @@ SELECT * FROM multi_extension.print_extension_changes(); | function citus_split_shard_by_split_points(bigint,text[],integer[],citus.shard_transfer_mode) void | function worker_copy_table_to_node(regclass,integer) void | function worker_split_copy(bigint,split_copy_info[]) void - | function worker_split_shard_replication_setup(split_shard_info[]) SETOF replication_slot_info - | type replication_slot_info | type split_copy_info - | type split_shard_info | view citus_locks -(30 rows) +(27 rows) DROP TABLE multi_extension.prev_objects, multi_extension.extension_diff; -- show running version @@ -1461,4 +1456,4 @@ DROP TABLE version_mismatch_table; DROP SCHEMA multi_extension; ERROR: cannot drop schema multi_extension because other objects depend on it DETAIL: function multi_extension.print_extension_changes() depends on schema multi_extension -HINT: Use DROP ... CASCADE to drop the dependent objects too. \ No newline at end of file +HINT: Use DROP ... CASCADE to drop the dependent objects too.