aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlvaro Herrera <alvherre@alvh.no-ip.org>2022-11-22 11:26:47 +0100
committerAlvaro Herrera <alvherre@alvh.no-ip.org>2022-11-22 11:26:47 +0100
commit1118a8d2c4f5b6dccf1845c73403d036df679648 (patch)
tree05b23a77e9b3b1d443539343cdfda4427cf49ef6 /src
parent1ad033df16df8d9f9e9f597ca31915266dfbdfb9 (diff)
downloadpostgresql-1118a8d2c4f5b6dccf1845c73403d036df679648.tar.gz
postgresql-1118a8d2c4f5b6dccf1845c73403d036df679648.zip
Remove useless MERGE test
This was trying to exercise an ERROR we don't actually have. Backpatch to 15. Reported by Teja Mupparti <Tejeswar.Mupparti@microsoft.com> Discussion: https://postgr.es/m/SN6PR2101MB1040BDAF740EA4389484E92BF0079@SN6PR2101MB1040.namprd21.prod.outlook.com
Diffstat (limited to 'src')
-rw-r--r--src/test/regress/expected/merge.out16
-rw-r--r--src/test/regress/sql/merge.sql18
2 files changed, 0 insertions, 34 deletions
diff --git a/src/test/regress/expected/merge.out b/src/test/regress/expected/merge.out
index 787af41dfe5..d2e33377272 100644
--- 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 4d486b4433d..e5754f3cd9c 100644
--- 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