Unbreak unlogged tables.

robertmhaas · robertmhaas · commit 6f1be5a67a75 · 2011-07-22T16:15:43.000-04:00
I broke this in commit 5da7916, which was obviously insufficiently well tested. Add some regression tests in the hope of making future slip-ups more likely to be noticed.
diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c
@@ -506,9 +506,10 @@ RangeVarAdjustRelationPersistence(RangeVar *newRelation, Oid nspid)
 						 errmsg("cannot create relations in temporary schemas of other sessions")));
 			break;
 		default:
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-					 errmsg("only temporary relations may be created in temporary schemas")));
+			if (isAnyTempNamespace(nspid))
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+						 errmsg("only temporary relations may be created in temporary schemas")));
 	}
 }
 
diff --git a/src/test/regress/expected/create_table.out b/src/test/regress/expected/create_table.out
@@ -204,3 +204,14 @@ CREATE TABLE IF NOT EXISTS test_tsvector(
 	t text
 );
 NOTICE:  relation "test_tsvector" already exists, skipping
+CREATE UNLOGGED TABLE unlogged1 (a int);			-- OK
+INSERT INTO unlogged1 VALUES (42);
+CREATE UNLOGGED TABLE public.unlogged2 (a int);		-- also OK
+CREATE UNLOGGED TABLE pg_temp.unlogged3 (a int);	-- not OK
+ERROR:  only temporary relations may be created in temporary schemas
+CREATE TABLE pg_temp.implicity_temp (a int);		-- OK
+CREATE TEMP TABLE explicitly_temp (a int);			-- also OK
+CREATE TEMP TABLE pg_temp.doubly_temp (a int);		-- also OK
+CREATE TEMP TABLE public.temp_to_perm (a int);		-- not OK
+ERROR:  cannot create temporary relation in non-temporary schema
+DROP TABLE unlogged1, public.unlogged2;
diff --git a/src/test/regress/sql/create_table.sql b/src/test/regress/sql/create_table.sql
@@ -240,3 +240,13 @@ CREATE TABLE IF NOT EXISTS test_tsvector(
 CREATE TABLE IF NOT EXISTS test_tsvector(
 	t text
 );
+
+CREATE UNLOGGED TABLE unlogged1 (a int);			-- OK
+INSERT INTO unlogged1 VALUES (42);
+CREATE UNLOGGED TABLE public.unlogged2 (a int);		-- also OK
+CREATE UNLOGGED TABLE pg_temp.unlogged3 (a int);	-- not OK
+CREATE TABLE pg_temp.implicity_temp (a int);		-- OK
+CREATE TEMP TABLE explicitly_temp (a int);			-- also OK
+CREATE TEMP TABLE pg_temp.doubly_temp (a int);		-- also OK
+CREATE TEMP TABLE public.temp_to_perm (a int);		-- not OK
+DROP TABLE unlogged1, public.unlogged2;

Original file line number	Diff line number	Diff line change
`@@ -506,9 +506,10 @@ RangeVarAdjustRelationPersistence(RangeVar *newRelation, Oid nspid)`
`506`	`506`	`errmsg("cannot create relations in temporary schemas of other sessions")));`
`507`	`507`	`break;`
`508`	`508`	`default:`
`509`		`- ereport(ERROR,`
`510`		`- (errcode(ERRCODE_INVALID_TABLE_DEFINITION),`
`511`		`- errmsg("only temporary relations may be created in temporary schemas")));`
	`509`	`+ if (isAnyTempNamespace(nspid))`
	`510`	`+ ereport(ERROR,`
	`511`	`+ (errcode(ERRCODE_INVALID_TABLE_DEFINITION),`
	`512`	`+ errmsg("only temporary relations may be created in temporary schemas")));`
`512`	`513`	`}`
`513`	`514`	`}`
`514`	`515`