Remove useless MERGE test

This was trying to exercise an ERROR we don't actually have.

Backpatch to 15.

Reported by Teja Mupparti <[email protected]>
Discussion: https://postgr.es/m/SN6PR2101MB1040BDAF740EA4389484E92BF0079@SN6PR2101MB1040.namprd21.prod.outlook.com

diff --git a/src/test/regress/expected/merge.out b/src/test/regress/expected/merge.out
index 787af41dfe5b8bdf1c7255ad0e1c191af5cf9a85..d2e333772720eafecdcabd590e1fddc4756b7387 100644 (file)
--- a/src/test/regress/expected/merge.out
+++ b/src/test/regress/expected/merge.out
@@ -843,22 +843,6 @@ SELECT * FROM wq_target;
    1 |     499
 (1 row)
 
--- test preventing WHEN conditions from writing to the database
-create or replace function merge_when_and_write() returns boolean
-language plpgsql as
-$$
-BEGIN
-   INSERT INTO target VALUES (100, 100);
-   RETURN TRUE;
-END;
-$$;
-BEGIN;
-MERGE INTO wq_target t
-USING wq_source s ON t.tid = s.sid
-WHEN MATCHED AND (merge_when_and_write()) THEN
-   UPDATE SET balance = t.balance + s.balance;
-ROLLBACK;
-drop function merge_when_and_write();
 DROP TABLE wq_target, wq_source;
 -- test triggers
 create or replace function merge_trigfunc () returns trigger

diff --git a/src/test/regress/sql/merge.sql b/src/test/regress/sql/merge.sql
index 4d486b4433d4d4de710a63d5a63ad458b837a521..e5754f3cd9cd120c99f2adcb40204e3c88c0ff4c 100644 (file)
--- a/src/test/regress/sql/merge.sql
+++ b/src/test/regress/sql/merge.sql
@@ -564,24 +564,6 @@ WHEN MATCHED AND t.tableoid >= 0 THEN
    UPDATE SET balance = t.balance + s.balance;
 SELECT * FROM wq_target;
 
--- test preventing WHEN conditions from writing to the database
-create or replace function merge_when_and_write() returns boolean
-language plpgsql as
-$$
-BEGIN
-   INSERT INTO target VALUES (100, 100);
-   RETURN TRUE;
-END;
-$$;
-
-BEGIN;
-MERGE INTO wq_target t
-USING wq_source s ON t.tid = s.sid
-WHEN MATCHED AND (merge_when_and_write()) THEN
-   UPDATE SET balance = t.balance + s.balance;
-ROLLBACK;
-drop function merge_when_and_write();
-
 DROP TABLE wq_target, wq_source;
 
 -- test triggers