From 7cf8a5c302735d193dcf901b87e03e324903c632 Mon Sep 17 00:00:00 2001
From: Simon Riggs <simon@2ndQuadrant.com>
Date: Mon, 2 Apr 2018 21:34:15 +0100
Subject: Revert "Modified files for MERGE"

This reverts commit 354f13855e6381d288dfaa52bcd4f2cb0fd4a5eb.
---
 contrib/test_decoding/sql/ddl.sql | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'contrib/test_decoding/sql/ddl.sql')

diff --git a/contrib/test_decoding/sql/ddl.sql b/contrib/test_decoding/sql/ddl.sql
index 0e608b252f..c4b10a4cf9 100644
--- a/contrib/test_decoding/sql/ddl.sql
+++ b/contrib/test_decoding/sql/ddl.sql
@@ -93,22 +93,6 @@ COMMIT;
 /* display results */
 SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
 
--- MERGE support
-BEGIN;
-MERGE INTO replication_example t
-	USING (SELECT i as id, i as data, i as num FROM generate_series(-20, 5) i) s
-	ON t.id = s.id
-	WHEN MATCHED AND t.id < 0 THEN
-		UPDATE SET somenum = somenum + 1
-	WHEN MATCHED AND t.id >= 0 THEN
-		DELETE
-	WHEN NOT MATCHED THEN
-		INSERT VALUES (s.*);
-COMMIT;
-
-/* display results */
-SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
-
 CREATE TABLE tr_unique(id2 serial unique NOT NULL, data int);
 INSERT INTO tr_unique(data) VALUES(10);
 ALTER TABLE tr_unique RENAME TO tr_pkey;
-- 
cgit v1.2.1

