Improve new AND CHAIN tests

Tweak the tests so that we're not just testing the default setting of
transaction_read_only.

Reported-by: fn ln <emuser20140816@gmail.com>

diff --git a/src/test/regress/expected/transactions.out b/src/test/regress/expected/transactions.out
index 213de4be6b0a1c79f67a860cc9ae6aabb6d486b7..1b033100298d4f04d3a8304b57835f56649cfcf0 100644 (file)
--- a/src/test/regress/expected/transactions.out
+++ b/src/test/regress/expected/transactions.out
@@ -940,7 +940,7 @@ ERROR:  RELEASE SAVEPOINT can only be used in transaction blocks
 -- but this is OK, because the BEGIN converts it to a regular xact
 SELECT 1\; BEGIN\; SAVEPOINT sp\; ROLLBACK TO SAVEPOINT sp\; COMMIT;
 -- Tests for AND CHAIN in implicit transaction blocks
-SET TRANSACTION READ WRITE\; COMMIT AND CHAIN;  -- error
+SET TRANSACTION READ ONLY\; COMMIT AND CHAIN;  -- error
 ERROR:  COMMIT AND CHAIN can only be used in transaction blocks
 SHOW transaction_read_only;
  transaction_read_only 
@@ -948,7 +948,7 @@ SHOW transaction_read_only;
  off
 (1 row)
 
-SET TRANSACTION READ WRITE\; ROLLBACK AND CHAIN;  -- error
+SET TRANSACTION READ ONLY\; ROLLBACK AND CHAIN;  -- error
 ERROR:  ROLLBACK AND CHAIN can only be used in transaction blocks
 SHOW transaction_read_only;
  transaction_read_only 

diff --git a/src/test/regress/sql/transactions.sql b/src/test/regress/sql/transactions.sql
index ba96f0f36f9c72b862eb2957c92b92bf0293aa53..bf1016489d1ec91d4f6d350077fa7152c843266b 100644 (file)
--- a/src/test/regress/sql/transactions.sql
+++ b/src/test/regress/sql/transactions.sql
@@ -542,10 +542,10 @@ SELECT 1\; BEGIN\; SAVEPOINT sp\; ROLLBACK TO SAVEPOINT sp\; COMMIT;
 
 -- Tests for AND CHAIN in implicit transaction blocks
 
-SET TRANSACTION READ WRITE\; COMMIT AND CHAIN;  -- error
+SET TRANSACTION READ ONLY\; COMMIT AND CHAIN;  -- error
 SHOW transaction_read_only;
 
-SET TRANSACTION READ WRITE\; ROLLBACK AND CHAIN;  -- error
+SET TRANSACTION READ ONLY\; ROLLBACK AND CHAIN;  -- error
 SHOW transaction_read_only;
 
 CREATE TABLE abc (a int);