From ddf509eb4a163aacd59a7bbd44ba2ca9ba691da2 Mon Sep 17 00:00:00 2001
From: Simon Riggs <simon@2ndQuadrant.com>
Date: Sat, 1 Dec 2012 13:46:41 +0000
Subject: [PATCH] Tweak tests in COPY FREEZE
---
src/test/regress/expected/copy2.out | 15 ++++++++++-----
src/test/regress/sql/copy2.sql | 1 -
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/test/regress/expected/copy2.out b/src/test/regress/expected/copy2.out
index d08f8cfdd47..89d38917aa2 100644
--- a/src/test/regress/expected/copy2.out
+++ b/src/test/regress/expected/copy2.out
@@ -297,16 +297,20 @@ SELECT * FROM vistest;
(2 rows)
COMMIT;
+BEGIN;
TRUNCATE vistest;
COPY vistest FROM stdin CSV FREEZE;
-NOTICE: FREEZE option specified but pre-conditions not met
SELECT * FROM vistest;
a
---
- a
- b
+ x
+ y
(2 rows)
+COMMIT;
+TRUNCATE vistest;
+COPY vistest FROM stdin CSV FREEZE;
+NOTICE: FREEZE option specified but pre-conditions not met
BEGIN;
INSERT INTO vistest VALUES ('z');
SAVEPOINT s1;
@@ -318,8 +322,8 @@ NOTICE: FREEZE option specified but pre-conditions not met
SELECT * FROM vistest;
a
---
- a
- b
+ p
+ g
z
d
e
@@ -360,6 +364,7 @@ SELECT * FROM vistest;
(2 rows)
DROP TABLE vistest;
+DROP FUNCTION truncate_in_subxact();
DROP TABLE x, y;
DROP FUNCTION fn_x_before();
DROP FUNCTION fn_x_after();
diff --git a/src/test/regress/sql/copy2.sql b/src/test/regress/sql/copy2.sql
index 3b6da45439d..717c3d081b3 100644
--- a/src/test/regress/sql/copy2.sql
+++ b/src/test/regress/sql/copy2.sql
@@ -229,7 +229,6 @@ INSERT INTO vistest VALUES ('z');
SAVEPOINT s1;
TRUNCATE vistest;
ROLLBACK TO SAVEPOINT s1;
--- FREEZE should be silently ignored here
COPY vistest FROM stdin CSV FREEZE;
d
e
--
GitLab