aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut <peter@eisentraut.org>2019-09-09 10:30:22 +0200
committerPeter Eisentraut <peter@eisentraut.org>2019-09-09 10:31:35 +0200
commitef48a0573bf0fc5c7e23f077788a055aad9f5e9e (patch)
tree4db0b0229de01dbc1fde150e3801d24cb101e310
parent2403e54fff3b47735fc1a77c51e407c3596d3331 (diff)
downloadpostgresql-ef48a0573bf0fc5c7e23f077788a055aad9f5e9e.tar.gz
postgresql-ef48a0573bf0fc5c7e23f077788a055aad9f5e9e.zip
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>
-rw-r--r--src/test/regress/expected/transactions.out4
-rw-r--r--src/test/regress/sql/transactions.sql4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/test/regress/expected/transactions.out b/src/test/regress/expected/transactions.out
index 213de4be6b0..1b033100298 100644
--- 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 ba96f0f36f9..bf1016489d1 100644
--- 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);