Commit e3d9dcee authored by Peter Eisentraut's avatar Peter Eisentraut

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

scripts, to allow running the test successfully with another database name.
parent b11c1876
...@@ -58,10 +58,10 @@ SELECT name, statement, parameter_types FROM pg_prepared_statements; ...@@ -58,10 +58,10 @@ SELECT name, statement, parameter_types FROM pg_prepared_statements;
PREPARE q2(text) AS PREPARE q2(text) AS
SELECT datname, datistemplate, datallowconn SELECT datname, datistemplate, datallowconn
FROM pg_database WHERE datname = $1; FROM pg_database WHERE datname = $1;
EXECUTE q2('regression'); EXECUTE q2('postgres');
datname | datistemplate | datallowconn datname | datistemplate | datallowconn
------------+---------------+-------------- ----------+---------------+--------------
regression | f | t postgres | f | t
(1 row) (1 row)
PREPARE q3(text, int, float, boolean, oid, smallint) AS PREPARE q3(text, int, float, boolean, oid, smallint) AS
......
...@@ -582,7 +582,7 @@ SELECT has_table_privilege('regressuser1', 'atest4', 'SELECT WITH GRANT OPTION') ...@@ -582,7 +582,7 @@ SELECT has_table_privilege('regressuser1', 'atest4', 'SELECT WITH GRANT OPTION')
(1 row) (1 row)
-- clean up -- clean up
\c regression \c
DROP FUNCTION testfunc2(int); DROP FUNCTION testfunc2(int);
DROP FUNCTION testfunc4(boolean); DROP FUNCTION testfunc4(boolean);
DROP VIEW atestv1; DROP VIEW atestv1;
......
...@@ -42,7 +42,7 @@ SELECT * FROM temptest; ...@@ -42,7 +42,7 @@ SELECT * FROM temptest;
DROP TABLE temptest; DROP TABLE temptest;
-- test temp table deletion -- test temp table deletion
CREATE TEMP TABLE temptest(col int); CREATE TEMP TABLE temptest(col int);
\c regression \c
SELECT * FROM temptest; SELECT * FROM temptest;
ERROR: relation "temptest" does not exist ERROR: relation "temptest" does not exist
-- Test ON COMMIT DELETE ROWS -- Test ON COMMIT DELETE ROWS
......
...@@ -34,7 +34,7 @@ PREPARE q2(text) AS ...@@ -34,7 +34,7 @@ PREPARE q2(text) AS
SELECT datname, datistemplate, datallowconn SELECT datname, datistemplate, datallowconn
FROM pg_database WHERE datname = $1; FROM pg_database WHERE datname = $1;
EXECUTE q2('regression'); EXECUTE q2('postgres');
PREPARE q3(text, int, float, boolean, oid, smallint) AS PREPARE q3(text, int, float, boolean, oid, smallint) AS
SELECT * FROM tenk1 WHERE string4 = $1 AND (four = $2 OR SELECT * FROM tenk1 WHERE string4 = $1 AND (four = $2 OR
......
...@@ -334,7 +334,7 @@ SELECT has_table_privilege('regressuser1', 'atest4', 'SELECT WITH GRANT OPTION') ...@@ -334,7 +334,7 @@ SELECT has_table_privilege('regressuser1', 'atest4', 'SELECT WITH GRANT OPTION')
-- clean up -- clean up
\c regression \c
DROP FUNCTION testfunc2(int); DROP FUNCTION testfunc2(int);
DROP FUNCTION testfunc4(boolean); DROP FUNCTION testfunc4(boolean);
......
...@@ -47,7 +47,7 @@ DROP TABLE temptest; ...@@ -47,7 +47,7 @@ DROP TABLE temptest;
CREATE TEMP TABLE temptest(col int); CREATE TEMP TABLE temptest(col int);
\c regression \c
SELECT * FROM temptest; SELECT * FROM temptest;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment