summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorNeil Conway2007-04-26 16:13:15 +0000
committerNeil Conway2007-04-26 16:13:15 +0000
commit16efdb5ec7f28bed9541fc773330e3e2ebe2ed9a (patch)
tree6ec0d0c7b08584ef53bf340e4d71a156e9655eba /src/test
parent5ea27a4b2812d148f2516d130aee9dbaba45cedc (diff)
Rename the newly-added commands for discarding session state.
RESET SESSION, RESET PLANS, and RESET TEMP are now DISCARD ALL, DISCARD PLANS, and DISCARD TEMP, respectively. This is to avoid confusion with the pre-existing RESET variants: the DISCARD commands are not actually similar to RESET. Patch from Marko Kreen, with some minor editorialization.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/regress/expected/guc.out10
-rw-r--r--src/test/regress/sql/guc.sql10
2 files changed, 10 insertions, 10 deletions
diff --git a/src/test/regress/expected/guc.out b/src/test/regress/expected/guc.out
index 484cc356e7..d8ad5667ab 100644
--- a/src/test/regress/expected/guc.out
+++ b/src/test/regress/expected/guc.out
@@ -426,7 +426,7 @@ SELECT '2006-08-13 12:34:56'::timestamptz;
(1 row)
--
--- Test RESET TEMP
+-- Test DISCARD TEMP
--
CREATE TEMP TABLE reset_test ( data text ) ON COMMIT DELETE ROWS;
SELECT relname FROM pg_class WHERE relname = 'reset_test';
@@ -435,14 +435,14 @@ SELECT relname FROM pg_class WHERE relname = 'reset_test';
reset_test
(1 row)
-RESET TEMP;
+DISCARD TEMP;
SELECT relname FROM pg_class WHERE relname = 'reset_test';
relname
---------
(0 rows)
--
--- Test RESET SESSION
+-- Test DISCARD ALL
--
-- do changes
DECLARE foo CURSOR WITH HOLD FOR SELECT 1;
@@ -489,8 +489,8 @@ SELECT current_user = 'temp_reset_user';
t
(1 row)
--- big RESET
-RESET SESSION;
+-- discard everything
+DISCARD ALL;
-- look again
SELECT relname FROM pg_listener;
relname
diff --git a/src/test/regress/sql/guc.sql b/src/test/regress/sql/guc.sql
index 274007a2c3..a25a13820d 100644
--- a/src/test/regress/sql/guc.sql
+++ b/src/test/regress/sql/guc.sql
@@ -125,15 +125,15 @@ SHOW datestyle;
SELECT '2006-08-13 12:34:56'::timestamptz;
--
--- Test RESET TEMP
+-- Test DISCARD TEMP
--
CREATE TEMP TABLE reset_test ( data text ) ON COMMIT DELETE ROWS;
SELECT relname FROM pg_class WHERE relname = 'reset_test';
-RESET TEMP;
+DISCARD TEMP;
SELECT relname FROM pg_class WHERE relname = 'reset_test';
--
--- Test RESET SESSION
+-- Test DISCARD ALL
--
-- do changes
@@ -151,8 +151,8 @@ SELECT name FROM pg_cursors;
SHOW vacuum_cost_delay;
SELECT relname from pg_class where relname = 'tmp_foo';
SELECT current_user = 'temp_reset_user';
--- big RESET
-RESET SESSION;
+-- discard everything
+DISCARD ALL;
-- look again
SELECT relname FROM pg_listener;
SELECT name FROM pg_prepared_statements;