drop pg14 support, delete alternative test outputs pt2

Author: naisila

src/test/regress/expected/local_shard_execution.out

@@ -1,17 +1,6 @@
 --
 -- LOCAL_SHARD_EXECUTION
 --
--- This test file has an alternative output because of the change in the
--- display of SQL-standard function's arguments in INSERT/SELECT in PG15.
--- The alternative output can be deleted when we drop support for PG14
---
-SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int >= 15 AS server_version_ge_15;
- server_version_ge_15
----------------------------------------------------------------------
- t
-(1 row)
-
 CREATE SCHEMA local_shard_execution;
 SET search_path TO local_shard_execution;
 SET citus.shard_count TO 4;

src/test/regress/expected/local_shard_execution_0.out

@@ -1,17 +1,6 @@
 --
 -- LOCAL_SHARD_EXECUTION_REPLICATED
 --
--- This test file has an alternative output because of the change in the
--- display of SQL-standard function's arguments in INSERT/SELECT in PG15.
--- The alternative output can be deleted when we drop support for PG14
---
-SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int >= 15 AS server_version_ge_15;
- server_version_ge_15
----------------------------------------------------------------------
- t
-(1 row)
-
 CREATE SCHEMA local_shard_execution_replicated;
 SET search_path TO local_shard_execution_replicated;
 SET citus.shard_count TO 4;

src/test/regress/expected/local_shard_execution_replicated.out

@@ -1,10 +1,3 @@
-SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int >= 15 AS server_version_ge_15
-\gset
-\if :server_version_ge_15
-\else
-\q
-\endif
 -- MERGE command performs a join from data_source to target_table_name
 DROP SCHEMA IF EXISTS merge_schema CASCADE;
 NOTICE:  schema "merge_schema" does not exist, skipping

src/test/regress/expected/local_shard_execution_replicated_0.out

@@ -1,10 +1,3 @@
-SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int >= 15 AS server_version_ge_15
-\gset
-\if :server_version_ge_15
-\else
-\q
-\endif
 SET search_path TO merge_arbitrary_schema;
 INSERT INTO target_cj VALUES (1, 'target', 0);
 INSERT INTO target_cj VALUES (2, 'target', 0);

src/test/regress/expected/merge.out

@@ -1,10 +1,3 @@
-SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int >= 15 AS server_version_ge_15
-\gset
-\if :server_version_ge_15
-\else
-\q
-\endif
 DROP SCHEMA IF EXISTS merge_arbitrary_schema CASCADE;
 CREATE SCHEMA merge_arbitrary_schema;
 SET search_path TO merge_arbitrary_schema;

src/test/regress/expected/merge_0.out

@@ -1,10 +1,3 @@
-SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int >= 15 AS server_version_ge_15
-\gset
-\if :server_version_ge_15
-\else
-\q
-\endif
 -- We create two sets of source and target tables, one set in Postgres and
 -- the other in Citus distributed. We run the _exact_ MERGE SQL on both sets
 -- and compare the final results of the target tables in Postgres and Citus.

src/test/regress/expected/merge_arbitrary.out

@@ -1,10 +1,3 @@
-SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int >= 15 AS server_version_ge_15
-\gset
-\if :server_version_ge_15
-\else
-\q
-\endif
 -- We create two sets of source and target tables, one set in Postgres and
 -- the other in Citus distributed. We run the _exact_ MERGE SQL on both sets
 -- and compare the final results of the target tables in Postgres and Citus.

src/test/regress/expected/merge_arbitrary_0.out

@@ -1,10 +1,3 @@
-SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int >= 15 AS server_version_ge_15
-\gset
-\if :server_version_ge_15
-\else
-\q
-\endif
 -- We create two sets of source and target tables, one set in Postgres and
 -- the other in Citus distributed. We run the _exact_ MERGE SQL on both sets
 -- and compare the final results of the target tables in Postgres and Citus.

src/test/regress/expected/merge_arbitrary_create.out

@@ -1,10 +1,3 @@
-SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int >= 15 AS server_version_ge_15
-\gset
-\if :server_version_ge_15
-\else
-\q
-\endif
 -- MERGE command performs a join from data_source to target_table_name
 DROP SCHEMA IF EXISTS schema_shard_table1 CASCADE;
 NOTICE:  schema "schema_shard_table1" does not exist, skipping

src/test/regress/expected/merge_arbitrary_create_0.out

@@ -1,10 +1,3 @@
-SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int >= 15 AS server_version_ge_15
-\gset
-\if :server_version_ge_15
-\else
-\q
-\endif
 -- MERGE command performs a join from data_source to target_table_name
 DROP SCHEMA IF EXISTS merge_vcore_schema CASCADE;
 NOTICE:  schema "merge_vcore_schema" does not exist, skipping

src/test/regress/expected/merge_partition_tables.out

@@ -214,13 +214,8 @@ SELECT con.conname
 \c - - :master_host :master_port
 ALTER TABLE AT_AddConstNoName.products DROP CONSTRAINT products_product_no_key;
 -- Check "ADD UNIQUE NULLS NOT DISTICT"
-SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int >= 15 AS server_version_ge_15
-\gset
-\if :server_version_ge_15
 ALTER TABLE AT_AddConstNoName.products ADD UNIQUE NULLS NOT DISTINCT (product_no, price);
 ALTER TABLE AT_AddConstNoName.products DROP CONSTRAINT products_product_no_price_key;
-\endif
 -- Check "ADD UNIQUE ... DEFERRABLE"
 ALTER TABLE AT_AddConstNoName.products ADD UNIQUE(product_no) INCLUDE(price) DEFERRABLE;
 \c - - :public_worker_1_host :worker_1_port

src/test/regress/expected/merge_partition_tables_0.out

@@ -1,17 +1,6 @@
 --
 -- MULTI_DEPARSE_SHARD_QUERY
 --
--- This test file has an alternative output because of the change in the
--- display of SQL-standard function's arguments in INSERT/SELECT in PG15.
--- The alternative output can be deleted when we drop support for PG14
---
-SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int >= 15 AS server_version_ge_15;
- server_version_ge_15
----------------------------------------------------------------------
- t
-(1 row)
-
 CREATE SCHEMA multi_deparse_shard_query;
 SET search_path TO multi_deparse_shard_query;
 SET citus.next_shard_id TO 13100000;