Fix failure to reconnect as sequence's owner before issuing setval().

tglsfdc · tglsfdc · commit 6a67d9def0de · 2002-02-06T17:27:50.000Z
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
@@ -15,7 +15,7 @@
  *
  *
  * IDENTIFICATION
- *		$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.40 2002/01/18 19:17:04 momjian Exp $
+ *		$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.41 2002/02/06 17:27:50 tgl Exp $
  *
  * Modifications - 28-Jun-2000 - pjw@rhyme.com.au
  *
@@ -311,9 +311,6 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
 
 		if ((reqs & REQ_SCHEMA) != 0)	/* We want the schema */
 		{
-			/* Reconnect if necessary */
-			_reconnectAsOwner(AH, NULL, te);
-
 			ahlog(AH, 1, "creating %s %s\n", te->desc, te->name);
 			_printTocEntry(AH, te, ropt, false);
 			defnDumped = true;
@@ -2033,6 +2030,9 @@ _printTocEntry(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt, bool isDat
 {
 	char	   *pfx;
 
+	/* Reconnect if necessary */
+	_reconnectAsOwner(AH, NULL, te);
+
 	if (isData)
 		pfx = "Data for ";
 	else
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.239 2002/01/25 18:49:31 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.240 2002/02/06 17:27:50 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -4765,7 +4765,8 @@ dumpSequence(Archive *fout, TableInfo tbinfo, const bool schemaOnly, const bool
 						  last, (called ? "true" : "false"));
 
 		ArchiveEntry(fout, tbinfo.oid, tbinfo.relname, "SEQUENCE SET", NULL,
-					 query->data, "" /* Del */ , "", "", NULL, NULL);
+					 query->data, "" /* Del */ , "", tbinfo.usename,
+					 NULL, NULL);
 	}
 
 	if (!dataOnly)

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`*`
`17`	`17`	`* IDENTIFICATION`
`18`		`- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.40 2002/01/18 19:17:04 momjian Exp $`
	`18`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.41 2002/02/06 17:27:50 tgl Exp $`
`19`	`19`	`*`
`20`	`20`	`* Modifications - 28-Jun-2000 - pjw@rhyme.com.au`
`21`	`21`	`*`
`@@ -311,9 +311,6 @@ RestoreArchive(Archive AHX, RestoreOptions ropt)`
`311`	`311`
`312`	`312`	`if ((reqs & REQ_SCHEMA) != 0) /* We want the schema */`
`313`	`313`	`{`
`314`		`- /* Reconnect if necessary */`
`315`		`- _reconnectAsOwner(AH, NULL, te);`
`316`		`-`
`317`	`314`	`ahlog(AH, 1, "creating %s %s\n", te->desc, te->name);`
`318`	`315`	`_printTocEntry(AH, te, ropt, false);`
`319`	`316`	`defnDumped = true;`
`@@ -2033,6 +2030,9 @@ _printTocEntry(ArchiveHandle AH, TocEntry te, RestoreOptions *ropt, bool isDat`
`2033`	`2030`	`{`
`2034`	`2031`	`char *pfx;`
`2035`	`2032`
	`2033`	`+ /* Reconnect if necessary */`
	`2034`	`+ _reconnectAsOwner(AH, NULL, te);`
	`2035`	`+`
`2036`	`2036`	`if (isData)`
`2037`	`2037`	`pfx = "Data for ";`
`2038`	`2038`	`else`
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.239 2002/01/25 18:49:31 tgl Exp $`
	`25`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.240 2002/02/06 17:27:50 tgl Exp $`
`26`	`26`	`*`
`27`	`27`	`*-------------------------------------------------------------------------`
`28`	`28`	`*/`
`@@ -4765,7 +4765,8 @@ dumpSequence(Archive *fout, TableInfo tbinfo, const bool schemaOnly, const bool`
`4765`	`4765`	`last, (called ? "true" : "false"));`
`4766`	`4766`
`4767`	`4767`	`ArchiveEntry(fout, tbinfo.oid, tbinfo.relname, "SEQUENCE SET", NULL,`
`4768`		`- query->data, "" /* Del */ , "", "", NULL, NULL);`
	`4768`	`+ query->data, "" /* Del */ , "", tbinfo.usename,`
	`4769`	`+ NULL, NULL);`
`4769`	`4770`	`}`
`4770`	`4771`
`4771`	`4772`	`if (!dataOnly)`