Update patch for DEFAULT on Views.

bmomjian · bmomjian · commit 244693744f46 · 2002-04-24T02:42:27.000Z
Apparently, you need to make two calls to appendPQExpBuffer() to
use fmtId() twice, because it uses a static buffer (thanks for
spotting this Tom).

Another revision of the patch is attached.

Neil Conway &lt;neilconway@rogers.com&gt;
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -22,7 +22,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.252 2002/04/24 02:38:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.253 2002/04/24 02:42:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -4376,10 +4376,12 @@ dumpTables(Archive *fout, TableInfo *tblinfo, int numTables,
 				 */
 				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],
+					if (tblinfo[i].adef_expr[j] != NULL && tblinfo[i].inhAttrDef[j] == 0) {
+						appendPQExpBuffer(q, "ALTER TABLE %s ", fmtId(tblinfo[i].relname, force_quotes));
+						appendPQExpBuffer(q, "ALTER COLUMN %s SET DEFAULT %s;\n",
+										  fmtId(tblinfo[i].attnames[j], force_quotes),
 										  tblinfo[i].adef_expr[j]);
+					}
 				}
 
 				commentDeps = malloc(sizeof(char *) * 2);

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`*`
`23`	`23`	`*`
`24`	`24`	`* IDENTIFICATION`
`25`		`- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.252 2002/04/24 02:38:58 momjian Exp $`
	`25`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.253 2002/04/24 02:42:27 momjian Exp $`
`26`	`26`	`*`
`27`	`27`	`*-------------------------------------------------------------------------`
`28`	`28`	`*/`
`@@ -4376,10 +4376,12 @@ dumpTables(Archive fout, TableInfo tblinfo, int numTables,`
`4376`	`4376`	`*/`
`4377`	`4377`	`for (j = 0; j < tblinfo[i].numatts; j++)`
`4378`	`4378`	`{`
`4379`		`- if (tblinfo[i].adef_expr[j] != NULL && tblinfo[i].inhAttrDef[j] == 0)`
`4380`		`- appendPQExpBuffer(q, "ALTER TABLE %s ALTER COLUMN %s SET DEFAULT %s;\n",`
`4381`		`- tblinfo[i].relname, tblinfo[i].attnames[j],`
	`4379`	`+ if (tblinfo[i].adef_expr[j] != NULL && tblinfo[i].inhAttrDef[j] == 0) {`
	`4380`	`+ appendPQExpBuffer(q, "ALTER TABLE %s ", fmtId(tblinfo[i].relname, force_quotes));`
	`4381`	`+ appendPQExpBuffer(q, "ALTER COLUMN %s SET DEFAULT %s;\n",`
	`4382`	`+ fmtId(tblinfo[i].attnames[j], force_quotes),`
`4382`	`4383`	`tblinfo[i].adef_expr[j]);`
	`4384`	`+ }`
`4383`	`4385`	`}`
`4384`	`4386`
`4385`	`4387`	`commentDeps = malloc(sizeof(char ) 2);`