Don't refer to the database name "regression" inside the regression test

scripts, to allow running the test successfully with another database name.

diff --git a/src/test/regress/expected/prepare.out b/src/test/regress/expected/prepare.out
index 9e5f397810c5a008176592018f7138f90f859e59..610f25912358bc929ea95199f4ca7635fd937751 100644 (file)
--- 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 54d6613f28a22707ef2a1e7b2550ee57e581733a..32dd625f9bfcad36fd37937ee9e6a53204a1f5a6 100644 (file)
--- 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 335a48c7272af9a34622162fed2489d7f8092556..da126a3affd8d1588879fa6ab8726c6243f7585a 100644 (file)
--- 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 96ad9989b6bdfa0690c75c921c26c709800c17bd..1dc4db188e523999365462d898f6c75c4ed0bd80 100644 (file)
--- 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 4c0d9c43f2783a31e7f6f3a6c5a41275a3450578..90b4781f724088cf77cdccf2e11620c627168305 100644 (file)
--- 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 82d7834bd1409afd5da3b3690966563b51c532bc..5183c727f5e70139d71ab345ce548f8d175baf06 100644 (file)
--- 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;