diff options
Diffstat (limited to 'src/backend/commands/tablecmds.c')
| -rw-r--r-- | src/backend/commands/tablecmds.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index aafc4d1b2ee..f5bdc35615d 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.225 2007/05/18 23:19:41 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.226 2007/06/03 17:06:25 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -319,7 +319,7 @@ DefineRelation(CreateStmt *stmt, char relkind) } /* - * Select tablespace to use. If not specified, use default_tablespace + * Select tablespace to use. If not specified, use default tablespace * (which may in turn default to database's default). */ if (stmt->tablespacename) @@ -333,17 +333,10 @@ DefineRelation(CreateStmt *stmt, char relkind) } else { - tablespaceId = GetDefaultTablespace(); + tablespaceId = GetDefaultTablespace(stmt->relation->istemp); /* note InvalidOid is OK in this case */ } - /* - * Parse and validate reloptions, if any. - */ - reloptions = transformRelOptions((Datum) 0, stmt->options, true, false); - - (void) heap_reloptions(relkind, reloptions, true); - /* Check permissions except when using database's default */ if (OidIsValid(tablespaceId)) { @@ -357,6 +350,13 @@ DefineRelation(CreateStmt *stmt, char relkind) } /* + * Parse and validate reloptions, if any. + */ + reloptions = transformRelOptions((Datum) 0, stmt->options, true, false); + + (void) heap_reloptions(relkind, reloptions, true); + + /* * Look up inheritance ancestors and generate relation schema, including * inherited attributes. */ |