Remove unnecessary ABORT commands in dblink regression tests.

diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out
index de09f6a8e0721794a04c4c9d62275bbf04a3b95d..cd2d4b1845030d1ecd2493fa01349ee59cae2ed6 100644 (file)
--- a/contrib/dblink/expected/dblink.out
+++ b/contrib/dblink/expected/dblink.out
@@ -223,13 +223,6 @@ DETAIL:  ERROR:  cursor "rmt_foobar_cursor" does not exist
  ERROR
 (1 row)
 
--- reset remote transaction state
-SELECT dblink_exec('ABORT');
- dblink_exec 
--------------
- ROLLBACK
-(1 row)
-
 -- should generate 'cursor "rmt_foo_cursor" not found' error
 SELECT *
 FROM dblink_fetch('rmt_foo_cursor',4) AS t(a int, b text, c text[]);
@@ -310,13 +303,6 @@ DETAIL:  ERROR:  relation "foobar" does not exist
 ---+---+---
 (0 rows)
 
--- reset remote transaction state
-SELECT dblink_exec('ABORT');
- dblink_exec 
--------------
- ROLLBACK
-(1 row)
-
 -- change some data
 SELECT dblink_exec('UPDATE foo SET f3[2] = ''b99'' WHERE f1 = 11');
  dblink_exec 
@@ -343,13 +329,6 @@ DETAIL:  ERROR:  relation "foobar" does not exist
  ERROR
 (1 row)
 
--- reset remote transaction state
-SELECT dblink_exec('ABORT');
- dblink_exec 
--------------
- ROLLBACK
-(1 row)
-
 -- delete some data
 SELECT dblink_exec('DELETE FROM foo WHERE f1 = 11');
  dblink_exec 
@@ -411,13 +390,6 @@ DETAIL:  ERROR:  relation "foobar" does not exist
 ---+---+---
 (0 rows)
 
--- reset remote transaction state
-SELECT dblink_exec('myconn','ABORT');
- dblink_exec 
--------------
- ROLLBACK
-(1 row)
-
 -- create a second named persistent connection
 -- should error with "duplicate connection name"
 SELECT dblink_connect('myconn','dbname=contrib_regression');

diff --git a/contrib/dblink/sql/dblink.sql b/contrib/dblink/sql/dblink.sql
index b574869569790fc20c2f8937c0b14d3d459376e2..db9dd6582fde9f30d9505d7d96ffaee4d1e51201 100644 (file)
--- a/contrib/dblink/sql/dblink.sql
+++ b/contrib/dblink/sql/dblink.sql
@@ -117,9 +117,6 @@ SELECT dblink_exec('ABORT');
 -- close the wrong cursor
 SELECT dblink_close('rmt_foobar_cursor',false);
 
--- reset remote transaction state
-SELECT dblink_exec('ABORT');
-
 -- should generate 'cursor "rmt_foo_cursor" not found' error
 SELECT *
 FROM dblink_fetch('rmt_foo_cursor',4) AS t(a int, b text, c text[]);
@@ -155,9 +152,6 @@ FROM dblink('SELECT * FROM foo') AS t(a int, b text, c text[]);
 SELECT *
 FROM dblink('SELECT * FROM foobar',false) AS t(a int, b text, c text[]);
 
--- reset remote transaction state
-SELECT dblink_exec('ABORT');
-
 -- change some data
 SELECT dblink_exec('UPDATE foo SET f3[2] = ''b99'' WHERE f1 = 11');
 
@@ -169,9 +163,6 @@ WHERE a = 11;
 -- botch a change to some other data
 SELECT dblink_exec('UPDATE foobar SET f3[2] = ''b99'' WHERE f1 = 11',false);
 
--- reset remote transaction state
-SELECT dblink_exec('ABORT');
-
 -- delete some data
 SELECT dblink_exec('DELETE FROM foo WHERE f1 = 11');
 
@@ -205,9 +196,6 @@ SELECT *
 FROM dblink('myconn','SELECT * FROM foobar',false) AS t(a int, b text, c text[])
 WHERE t.a > 7;
 
--- reset remote transaction state
-SELECT dblink_exec('myconn','ABORT');
-
 -- create a second named persistent connection
 -- should error with "duplicate connection name"
 SELECT dblink_connect('myconn','dbname=contrib_regression');