1 files changed, 30 insertions, 30 deletions

diff --git a/src/test/regress/input/tablespace.source b/src/test/regress/input/tablespace.source
index 75ec689498f..041ec974008 100644
--- a/src/test/regress/input/tablespace.source
+++ b/src/test/regress/input/tablespace.source
@@ -1,27 +1,27 @@
 -- create a tablespace using WITH clause
-CREATE TABLESPACE testspacewith LOCATION '@testtablespace@' WITH (some_nonexistent_parameter = true); -- fail
-CREATE TABLESPACE testspacewith LOCATION '@testtablespace@' WITH (random_page_cost = 3.0); -- ok
+CREATE TABLESPACE regress_tblspacewith LOCATION '@testtablespace@' WITH (some_nonexistent_parameter = true); -- fail
+CREATE TABLESPACE regress_tblspacewith LOCATION '@testtablespace@' WITH (random_page_cost = 3.0); -- ok
 
 -- check to see the parameter was used
-SELECT spcoptions FROM pg_tablespace WHERE spcname = 'testspacewith';
+SELECT spcoptions FROM pg_tablespace WHERE spcname = 'regress_tblspacewith';
 
 -- drop the tablespace so we can re-use the location
-DROP TABLESPACE testspacewith;
+DROP TABLESPACE regress_tblspacewith;
 
 -- create a tablespace we can use
-CREATE TABLESPACE testspace LOCATION '@testtablespace@';
+CREATE TABLESPACE regress_tblspace LOCATION '@testtablespace@';
 
 -- try setting and resetting some properties for the new tablespace
-ALTER TABLESPACE testspace SET (random_page_cost = 1.0);
-ALTER TABLESPACE testspace SET (some_nonexistent_parameter = true);  -- fail
-ALTER TABLESPACE testspace RESET (random_page_cost = 2.0); -- fail
-ALTER TABLESPACE testspace RESET (random_page_cost, seq_page_cost); -- ok
+ALTER TABLESPACE regress_tblspace SET (random_page_cost = 1.0);
+ALTER TABLESPACE regress_tblspace SET (some_nonexistent_parameter = true);  -- fail
+ALTER TABLESPACE regress_tblspace RESET (random_page_cost = 2.0); -- fail
+ALTER TABLESPACE regress_tblspace RESET (random_page_cost, seq_page_cost); -- ok
 
 -- create a schema we can use
 CREATE SCHEMA testschema;
 
 -- try a table
-CREATE TABLE testschema.foo (i int) TABLESPACE testspace;
+CREATE TABLE testschema.foo (i int) TABLESPACE regress_tblspace;
 SELECT relname, spcname FROM pg_catalog.pg_tablespace t, pg_catalog.pg_class c
     where c.reltablespace = t.oid AND c.relname = 'foo';
 
@@ -29,18 +29,18 @@ INSERT INTO testschema.foo VALUES(1);
 INSERT INTO testschema.foo VALUES(2);
 
 -- tables from dynamic sources
-CREATE TABLE testschema.asselect TABLESPACE testspace AS SELECT 1;
+CREATE TABLE testschema.asselect TABLESPACE regress_tblspace AS SELECT 1;
 SELECT relname, spcname FROM pg_catalog.pg_tablespace t, pg_catalog.pg_class c
     where c.reltablespace = t.oid AND c.relname = 'asselect';
 
 PREPARE selectsource(int) AS SELECT $1;
-CREATE TABLE testschema.asexecute TABLESPACE testspace
+CREATE TABLE testschema.asexecute TABLESPACE regress_tblspace
     AS EXECUTE selectsource(2);
 SELECT relname, spcname FROM pg_catalog.pg_tablespace t, pg_catalog.pg_class c
     where c.reltablespace = t.oid AND c.relname = 'asexecute';
 
 -- index
-CREATE INDEX foo_idx on testschema.foo(i) TABLESPACE testspace;
+CREATE INDEX foo_idx on testschema.foo(i) TABLESPACE regress_tblspace;
 SELECT relname, spcname FROM pg_catalog.pg_tablespace t, pg_catalog.pg_class c
     where c.reltablespace = t.oid AND c.relname = 'foo_idx';
 
@@ -48,43 +48,43 @@ SELECT relname, spcname FROM pg_catalog.pg_tablespace t, pg_catalog.pg_class c
 CREATE TABLE testschema.atable AS VALUES (1), (2);
 CREATE UNIQUE INDEX anindex ON testschema.atable(column1);
 
-ALTER TABLE testschema.atable SET TABLESPACE testspace;
-ALTER INDEX testschema.anindex SET TABLESPACE testspace;
+ALTER TABLE testschema.atable SET TABLESPACE regress_tblspace;
+ALTER INDEX testschema.anindex SET TABLESPACE regress_tblspace;
 
 INSERT INTO testschema.atable VALUES(3);	-- ok
 INSERT INTO testschema.atable VALUES(1);	-- fail (checks index)
 SELECT COUNT(*) FROM testschema.atable;		-- checks heap
 
 -- Will fail with bad path
-CREATE TABLESPACE badspace LOCATION '/no/such/location';
+CREATE TABLESPACE regress_badspace LOCATION '/no/such/location';
 
 -- No such tablespace
-CREATE TABLE bar (i int) TABLESPACE nosuchspace;
+CREATE TABLE bar (i int) TABLESPACE regress_nosuchspace;
 
 -- Fail, not empty
-DROP TABLESPACE testspace;
+DROP TABLESPACE regress_tblspace;
 
-CREATE ROLE tablespace_testuser1 login;
-CREATE ROLE tablespace_testuser2 login;
+CREATE ROLE regress_tablespace_user1 login;
+CREATE ROLE regress_tablespace_user2 login;
 
-ALTER TABLESPACE testspace OWNER TO tablespace_testuser1;
+ALTER TABLESPACE regress_tblspace OWNER TO regress_tablespace_user1;
 
-SET SESSION ROLE tablespace_testuser2;
-CREATE TABLE tablespace_table (i int) TABLESPACE testspace; -- fail
+SET SESSION ROLE regress_tablespace_user2;
+CREATE TABLE tablespace_table (i int) TABLESPACE regress_tblspace; -- fail
 RESET ROLE;
 
-ALTER TABLESPACE testspace RENAME TO testspace_renamed;
+ALTER TABLESPACE regress_tblspace RENAME TO regress_tblspace_renamed;
 
-ALTER TABLE ALL IN TABLESPACE testspace_renamed SET TABLESPACE pg_default;
-ALTER INDEX ALL IN TABLESPACE testspace_renamed SET TABLESPACE pg_default;
+ALTER TABLE ALL IN TABLESPACE regress_tblspace_renamed SET TABLESPACE pg_default;
+ALTER INDEX ALL IN TABLESPACE regress_tblspace_renamed SET TABLESPACE pg_default;
 
 -- Should show notice that nothing was done
-ALTER TABLE ALL IN TABLESPACE testspace_renamed SET TABLESPACE pg_default;
+ALTER TABLE ALL IN TABLESPACE regress_tblspace_renamed SET TABLESPACE pg_default;
 
 -- Should succeed
-DROP TABLESPACE testspace_renamed;
+DROP TABLESPACE regress_tblspace_renamed;
 
 DROP SCHEMA testschema CASCADE;
 
-DROP ROLE tablespace_testuser1;
-DROP ROLE tablespace_testuser2;
+DROP ROLE regress_tablespace_user1;
+DROP ROLE regress_tablespace_user2;