From e3d9dceef62e072cf9a433ae6c74a1c5a10d94d3 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Thu, 3 Jul 2008 16:01:10 +0000
Subject: [PATCH] Don't refer to the database name "regression" inside the
 regression test scripts, to allow running the test successfully with another
 database name.

---
 src/test/regress/expected/prepare.out    | 8 ++++----
 src/test/regress/expected/privileges.out | 2 +-
 src/test/regress/expected/temp.out       | 2 +-
 src/test/regress/sql/prepare.sql         | 2 +-
 src/test/regress/sql/privileges.sql      | 2 +-
 src/test/regress/sql/temp.sql            | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/test/regress/expected/prepare.out b/src/test/regress/expected/prepare.out
index 9e5f397810..610f259123 100644
--- a/src/test/regress/expected/prepare.out
+++ b/src/test/regress/expected/prepare.out
@@ -58,10 +58,10 @@ SELECT name, statement, parameter_types FROM pg_prepared_statements;
 PREPARE q2(text) AS
 	SELECT datname, datistemplate, datallowconn
 	FROM pg_database WHERE datname = $1;
-EXECUTE q2('regression');
-  datname   | datistemplate | datallowconn 
-------------+---------------+--------------
- regression | f             | t
+EXECUTE q2('postgres');
+ datname  | datistemplate | datallowconn 
+----------+---------------+--------------
+ postgres | f             | t
 (1 row)
 
 PREPARE q3(text, int, float, boolean, oid, smallint) AS
diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out
index 54d6613f28..32dd625f9b 100644
--- a/src/test/regress/expected/privileges.out
+++ b/src/test/regress/expected/privileges.out
@@ -582,7 +582,7 @@ SELECT has_table_privilege('regressuser1', 'atest4', 'SELECT WITH GRANT OPTION')
 (1 row)
 
 -- clean up
-\c regression
+\c
 DROP FUNCTION testfunc2(int);
 DROP FUNCTION testfunc4(boolean);
 DROP VIEW atestv1;
diff --git a/src/test/regress/expected/temp.out b/src/test/regress/expected/temp.out
index 335a48c727..da126a3aff 100644
--- a/src/test/regress/expected/temp.out
+++ b/src/test/regress/expected/temp.out
@@ -42,7 +42,7 @@ SELECT * FROM temptest;
 DROP TABLE temptest;
 -- test temp table deletion
 CREATE TEMP TABLE temptest(col int);
-\c regression
+\c
 SELECT * FROM temptest;
 ERROR:  relation "temptest" does not exist
 -- Test ON COMMIT DELETE ROWS
diff --git a/src/test/regress/sql/prepare.sql b/src/test/regress/sql/prepare.sql
index 96ad9989b6..1dc4db188e 100644
--- a/src/test/regress/sql/prepare.sql
+++ b/src/test/regress/sql/prepare.sql
@@ -34,7 +34,7 @@ PREPARE q2(text) AS
 	SELECT datname, datistemplate, datallowconn
 	FROM pg_database WHERE datname = $1;
 
-EXECUTE q2('regression');
+EXECUTE q2('postgres');
 
 PREPARE q3(text, int, float, boolean, oid, smallint) AS
 	SELECT * FROM tenk1 WHERE string4 = $1 AND (four = $2 OR
diff --git a/src/test/regress/sql/privileges.sql b/src/test/regress/sql/privileges.sql
index 4c0d9c43f2..90b4781f72 100644
--- a/src/test/regress/sql/privileges.sql
+++ b/src/test/regress/sql/privileges.sql
@@ -334,7 +334,7 @@ SELECT has_table_privilege('regressuser1', 'atest4', 'SELECT WITH GRANT OPTION')
 
 -- clean up
 
-\c regression
+\c
 
 DROP FUNCTION testfunc2(int);
 DROP FUNCTION testfunc4(boolean);
diff --git a/src/test/regress/sql/temp.sql b/src/test/regress/sql/temp.sql
index 82d7834bd1..5183c727f5 100644
--- a/src/test/regress/sql/temp.sql
+++ b/src/test/regress/sql/temp.sql
@@ -47,7 +47,7 @@ DROP TABLE temptest;
 
 CREATE TEMP TABLE temptest(col int);
 
-\c regression
+\c
 
 SELECT * FROM temptest;