diff --git a/src/test/regress/expected/multi_extension.out b/src/test/regress/expected/multi_extension.out index 4ad8db2c6..60e283800 100644 --- a/src/test/regress/expected/multi_extension.out +++ b/src/test/regress/expected/multi_extension.out @@ -7,12 +7,6 @@ -- not done yet. -- -- Upgrade tests verify the objects are added in citus_finish_pg_upgrade() -SELECT 1; - ?column? ---------------------------------------------------------------------- - 1 -(1 row) - SET citus.next_shard_id TO 580000; CREATE SCHEMA multi_extension; SELECT $definition$ diff --git a/src/test/regress/expected/multi_test_helpers.out b/src/test/regress/expected/multi_test_helpers.out index 7786ec7ba..70a541d2a 100644 --- a/src/test/regress/expected/multi_test_helpers.out +++ b/src/test/regress/expected/multi_test_helpers.out @@ -1,10 +1,4 @@ -- File to create functions and helpers needed for subsequent tests -SELECT 1; - ?column? ---------------------------------------------------------------------- - 1 -(1 row) - -- create a helper function to create objects on each node CREATE OR REPLACE FUNCTION run_command_on_master_and_workers(p_sql text) RETURNS void LANGUAGE plpgsql AS $$ @@ -631,4 +625,4 @@ BEGIN ) q2 JOIN pg_dist_node USING (nodeid); END; -$func$ LANGUAGE plpgsql; +$func$ LANGUAGE plpgsql; \ No newline at end of file diff --git a/src/test/regress/expected/upgrade_columnar_after.out b/src/test/regress/expected/upgrade_columnar_after.out index d94925934..768a057f9 100644 --- a/src/test/regress/expected/upgrade_columnar_after.out +++ b/src/test/regress/expected/upgrade_columnar_after.out @@ -1,9 +1,3 @@ -SELECT 1; - ?column? ----------- - 1 -(1 row) - SET search_path TO upgrade_columnar, public; -- test we retained data SELECT * FROM test_retains_data ORDER BY a; diff --git a/src/test/regress/sql/multi_extension.sql b/src/test/regress/sql/multi_extension.sql index 5c3ab08c0..8cbbbc3ed 100644 --- a/src/test/regress/sql/multi_extension.sql +++ b/src/test/regress/sql/multi_extension.sql @@ -8,8 +8,6 @@ -- -- Upgrade tests verify the objects are added in citus_finish_pg_upgrade() -SELECT 1; - SET citus.next_shard_id TO 580000; CREATE SCHEMA multi_extension; diff --git a/src/test/regress/sql/multi_test_helpers.sql b/src/test/regress/sql/multi_test_helpers.sql index ce5a5106e..e67b782a5 100644 --- a/src/test/regress/sql/multi_test_helpers.sql +++ b/src/test/regress/sql/multi_test_helpers.sql @@ -1,7 +1,5 @@ -- File to create functions and helpers needed for subsequent tests -SELECT 1; - -- create a helper function to create objects on each node CREATE OR REPLACE FUNCTION run_command_on_master_and_workers(p_sql text) RETURNS void LANGUAGE plpgsql AS $$ diff --git a/src/test/regress/sql/upgrade_columnar_after.sql b/src/test/regress/sql/upgrade_columnar_after.sql index 196a9cc06..133fcfde0 100644 --- a/src/test/regress/sql/upgrade_columnar_after.sql +++ b/src/test/regress/sql/upgrade_columnar_after.sql @@ -1,5 +1,3 @@ -SELECT 1; - SET search_path TO upgrade_columnar, public; -- test we retained data