sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-22 00:02:02 -04:00
Code Issues Projects Releases Wiki Activity

Doc fix for INSERT ... (DEFAULT, ...)

Browse Source 
Appears I forgot to update the docs earlier.

Rod Taylor
This commit is contained in:
Bruce Momjian 2002-04-24 02:38:58 +00:00
parent 9fcc1159be
commit adf7cc04cb
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/commands/tablecmds.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.7 2002/04/22 21:56:06 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.8 2002/04/24 02:38:58 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -620,8 +620,14 @@ AlterTableAlterColumnDefault(Oid myrelid,
rel = heap_open(myrelid, AccessExclusiveLock); rel = heap_open(myrelid, AccessExclusiveLock);
if (rel->rd_rel->relkind != RELKIND_RELATION) /*
elog(ERROR, "ALTER TABLE: relation \"%s\" is not a table", * We allow defaults on views so that INSERT into a view can have
* default-ish behavior. This works because the rewriter substitutes
* default values into INSERTs before it expands rules.
*/
if (rel->rd_rel->relkind != RELKIND_RELATION &&
rel->rd_rel->relkind != RELKIND_VIEW)
elog(ERROR, "ALTER TABLE: relation \"%s\" is not a table or view",
RelationGetRelationName(rel)); RelationGetRelationName(rel));
if (!allowSystemTableMods if (!allowSystemTableMods

16
src/bin/pg_dump/pg_dump.c
View File

@ -22,7 +22,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.251 2002/04/21 05:21:17 petere Exp $ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.252 2002/04/24 02:38:58 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -4368,6 +4368,20 @@ dumpTables(Archive *fout, TableInfo *tblinfo, int numTables,
objoid = tblinfo[i].viewoid; objoid = tblinfo[i].viewoid;
appendPQExpBuffer(delq, "DROP VIEW %s;\n", fmtId(tblinfo[i].relname, force_quotes)); appendPQExpBuffer(delq, "DROP VIEW %s;\n", fmtId(tblinfo[i].relname, force_quotes));
appendPQExpBuffer(q, "CREATE VIEW %s as %s\n", fmtId(tblinfo[i].relname, force_quotes), tblinfo[i].viewdef); appendPQExpBuffer(q, "CREATE VIEW %s as %s\n", fmtId(tblinfo[i].relname, force_quotes), tblinfo[i].viewdef);
/*
* Views can have default values -- however, they must be
* specified in an ALTER TABLE command after the view has
* been created, not in the view definition itself.
*/
for (j = 0; j < tblinfo[i].numatts; j++)
{
if (tblinfo[i].adef_expr[j] != NULL && tblinfo[i].inhAttrDef[j] == 0)
appendPQExpBuffer(q, "ALTER TABLE %s ALTER COLUMN %s SET DEFAULT %s;\n",
tblinfo[i].relname, tblinfo[i].attnames[j],
tblinfo[i].adef_expr[j]);
}
commentDeps = malloc(sizeof(char *) * 2); commentDeps = malloc(sizeof(char *) * 2);
(*commentDeps)[0] = strdup(objoid); (*commentDeps)[0] = strdup(objoid);
(*commentDeps)[1] = NULL; /* end of list */ (*commentDeps)[1] = NULL; /* end of list */