diff options
| author | Bruce Momjian | 2013-02-02 17:56:14 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2013-02-02 17:56:52 +0000 |
| commit | e8ae01966115a35d3815e0445da5f78878f6dd14 (patch) | |
| tree | 9d19c65b8ec208e3f926ce6308ccc2c80875d56e /src/test | |
| parent | f4987049ef7dd28d810a77c3b15a0a202ad493f8 (diff) | |
Adjust COPY FREEZE error message to be more accurate and consistent.
Per suggestions from Noah and Tom.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/regress/expected/copy2.out | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/regress/expected/copy2.out b/src/test/regress/expected/copy2.out index 5777b242747..34fa131c52b 100644 --- a/src/test/regress/expected/copy2.out +++ b/src/test/regress/expected/copy2.out @@ -334,12 +334,12 @@ SELECT * FROM vistest; COMMIT; TRUNCATE vistest; COPY vistest FROM stdin CSV FREEZE; -ERROR: cannot perform FREEZE because the table was not created or truncated in the current transaction +ERROR: cannot perform FREEZE because the table was not created or truncated in the current subtransaction BEGIN; TRUNCATE vistest; SAVEPOINT s1; COPY vistest FROM stdin CSV FREEZE; -ERROR: cannot perform FREEZE because of transaction activity after table creation or truncation +ERROR: cannot perform FREEZE because the table was not created or truncated in the current subtransaction COMMIT; BEGIN; INSERT INTO vistest VALUES ('z'); @@ -347,7 +347,7 @@ SAVEPOINT s1; TRUNCATE vistest; ROLLBACK TO SAVEPOINT s1; COPY vistest FROM stdin CSV FREEZE; -ERROR: cannot perform FREEZE because the table was not created or truncated in the current transaction +ERROR: cannot perform FREEZE because the table was not created or truncated in the current subtransaction COMMIT; CREATE FUNCTION truncate_in_subxact() RETURNS VOID AS $$ |