Make pgdump_oid a temp table. Rename to pg_dump_oid.

bmomjian · bmomjian · commit edbe00a720a2 · 2000-07-04T16:57:18.000Z
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.154 2000/07/04 14:25:28 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.155 2000/07/04 16:57:18 momjian Exp $
  *
  * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
  *
@@ -3599,20 +3599,20 @@ setMaxOid(Archive *fout)
 	char		sql[1024];
 	int		pos;
 
-	res = PQexec(g_conn, "CREATE TABLE pgdump_oid (dummy int4)");
+	res = PQexec(g_conn, "CREATE TEMP TABLE pg_dump_oid (dummy int4)");
 	if (!res ||
 		PQresultStatus(res) != PGRES_COMMAND_OK)
 	{
-		fprintf(stderr, "Can not create pgdump_oid table.  "
+		fprintf(stderr, "Can not create pg_dump_oid table.  "
 					"Explanation from backend: '%s'.\n", PQerrorMessage(g_conn));
 		exit_nicely(g_conn);
 	}
 	PQclear(res);
-	res = PQexec(g_conn, "INSERT INTO pgdump_oid VALUES (0)");
+	res = PQexec(g_conn, "INSERT INTO pg_dump_oid VALUES (0)");
 	if (!res ||
 		PQresultStatus(res) != PGRES_COMMAND_OK)
 	{
-		fprintf(stderr, "Can not insert into pgdump_oid table.  "
+		fprintf(stderr, "Can not insert into pg_dump_oid table.  "
 					"Explanation from backend: '%s'.\n", PQerrorMessage(g_conn));
 		exit_nicely(g_conn);
 	}
@@ -3623,23 +3623,23 @@ setMaxOid(Archive *fout)
 		exit_nicely(g_conn);
 	}
 	PQclear(res);
-	res = PQexec(g_conn, "DROP TABLE pgdump_oid;");
+	res = PQexec(g_conn, "DROP TABLE pg_dump_oid;");
 	if (!res ||
 		PQresultStatus(res) != PGRES_COMMAND_OK)
 	{
-		fprintf(stderr, "Can not drop pgdump_oid table.  "
+		fprintf(stderr, "Can not drop pg_dump_oid table.  "
 							"Explanation from backend: '%s'.\n", PQerrorMessage(g_conn));
 		exit_nicely(g_conn);
 	}
 	PQclear(res);
 	if (g_verbose)
 		fprintf(stderr, "%s maximum system oid is %u %s\n",
 				g_comment_start, max_oid, g_comment_end);
-	pos = snprintf(sql, 1024, "CREATE TABLE pgdump_oid (dummy int4);\n");
-	pos = pos + snprintf(sql+pos, 1024-pos, "COPY pgdump_oid WITH OIDS FROM stdin;\n");
+	pos = snprintf(sql, 1024, "CREATE TEMP TABLE pg_dump_oid (dummy int4);\n");
+	pos = pos + snprintf(sql+pos, 1024-pos, "COPY pg_dump_oid WITH OIDS FROM stdin;\n");
 	pos = pos + snprintf(sql+pos, 1024-pos, "%-d\t0\n", max_oid);
 	pos = pos + snprintf(sql+pos, 1024-pos, "\\.\n");
-	pos = pos + snprintf(sql+pos, 1024-pos, "DROP TABLE pgdump_oid;\n");
+	pos = pos + snprintf(sql+pos, 1024-pos, "DROP TABLE pg_dump_oid;\n");
 
 	ArchiveEntry(fout, "0", "Max OID", "<Init>", NULL, sql, "","", NULL, NULL);
 }

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.154 2000/07/04 14:25:28 momjian Exp $`
	`25`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.155 2000/07/04 16:57:18 momjian Exp $`
`26`	`26`	`*`
`27`	`27`	`* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb`
`28`	`28`	`*`
`@@ -3599,20 +3599,20 @@ setMaxOid(Archive *fout)`
`3599`	`3599`	`char sql[1024];`
`3600`	`3600`	`int pos;`
`3601`	`3601`
`3602`		`- res = PQexec(g_conn, "CREATE TABLE pgdump_oid (dummy int4)");`
	`3602`	`+ res = PQexec(g_conn, "CREATE TEMP TABLE pg_dump_oid (dummy int4)");`
`3603`	`3603`	`if (!res \|\|`
`3604`	`3604`	`PQresultStatus(res) != PGRES_COMMAND_OK)`
`3605`	`3605`	`{`
`3606`		`- fprintf(stderr, "Can not create pgdump_oid table. "`
	`3606`	`+ fprintf(stderr, "Can not create pg_dump_oid table. "`
`3607`	`3607`	`"Explanation from backend: '%s'.\n", PQerrorMessage(g_conn));`
`3608`	`3608`	`exit_nicely(g_conn);`
`3609`	`3609`	`}`
`3610`	`3610`	`PQclear(res);`
`3611`		`- res = PQexec(g_conn, "INSERT INTO pgdump_oid VALUES (0)");`
	`3611`	`+ res = PQexec(g_conn, "INSERT INTO pg_dump_oid VALUES (0)");`
`3612`	`3612`	`if (!res \|\|`
`3613`	`3613`	`PQresultStatus(res) != PGRES_COMMAND_OK)`
`3614`	`3614`	`{`
`3615`		`- fprintf(stderr, "Can not insert into pgdump_oid table. "`
	`3615`	`+ fprintf(stderr, "Can not insert into pg_dump_oid table. "`
`3616`	`3616`	`"Explanation from backend: '%s'.\n", PQerrorMessage(g_conn));`
`3617`	`3617`	`exit_nicely(g_conn);`
`3618`	`3618`	`}`
`@@ -3623,23 +3623,23 @@ setMaxOid(Archive *fout)`
`3623`	`3623`	`exit_nicely(g_conn);`
`3624`	`3624`	`}`
`3625`	`3625`	`PQclear(res);`
`3626`		`- res = PQexec(g_conn, "DROP TABLE pgdump_oid;");`
	`3626`	`+ res = PQexec(g_conn, "DROP TABLE pg_dump_oid;");`
`3627`	`3627`	`if (!res \|\|`
`3628`	`3628`	`PQresultStatus(res) != PGRES_COMMAND_OK)`
`3629`	`3629`	`{`
`3630`		`- fprintf(stderr, "Can not drop pgdump_oid table. "`
	`3630`	`+ fprintf(stderr, "Can not drop pg_dump_oid table. "`
`3631`	`3631`	`"Explanation from backend: '%s'.\n", PQerrorMessage(g_conn));`
`3632`	`3632`	`exit_nicely(g_conn);`
`3633`	`3633`	`}`
`3634`	`3634`	`PQclear(res);`
`3635`	`3635`	`if (g_verbose)`
`3636`	`3636`	`fprintf(stderr, "%s maximum system oid is %u %s\n",`
`3637`	`3637`	`g_comment_start, max_oid, g_comment_end);`
`3638`		`- pos = snprintf(sql, 1024, "CREATE TABLE pgdump_oid (dummy int4);\n");`
`3639`		`- pos = pos + snprintf(sql+pos, 1024-pos, "COPY pgdump_oid WITH OIDS FROM stdin;\n");`
	`3638`	`+ pos = snprintf(sql, 1024, "CREATE TEMP TABLE pg_dump_oid (dummy int4);\n");`
	`3639`	`+ pos = pos + snprintf(sql+pos, 1024-pos, "COPY pg_dump_oid WITH OIDS FROM stdin;\n");`
`3640`	`3640`	`pos = pos + snprintf(sql+pos, 1024-pos, "%-d\t0\n", max_oid);`
`3641`	`3641`	`pos = pos + snprintf(sql+pos, 1024-pos, "\\.\n");`
`3642`		`- pos = pos + snprintf(sql+pos, 1024-pos, "DROP TABLE pgdump_oid;\n");`
	`3642`	`+ pos = pos + snprintf(sql+pos, 1024-pos, "DROP TABLE pg_dump_oid;\n");`
`3643`	`3643`
`3644`	`3644`	`ArchiveEntry(fout, "0", "Max OID", "<Init>", NULL, sql, "","", NULL, NULL);`
`3645`	`3645`	`}`