pg_dump failed on any database containing large objects,

tglsfdc · tglsfdc · commit 58d8584eeaf0 · 1999-06-03T04:01:16.000Z
because it ignored the LOs themselves but failed to ignore the indexes
on the LOs.  How long has this been broken??
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -21,7 +21,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.114 1999/05/29 10:25:31 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.115 1999/06/03 04:01:16 tgl Exp $
  *
  * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
  *
@@ -1419,7 +1419,9 @@ getTables(int *numTables, FuncInfo *finfo, int numFuncs)
 	 * ordering by oid is important so that we always process the parent
 	 * tables before the child tables when traversing the tblinfo*
 	 *
-	 * we ignore tables that start with xinv
+	 * we ignore tables that are not type 'r' (ordinary relation)
+	 * or 'S' (sequence) --- in particular, Large Object relations
+	 * (type 'l') are ignored.
 	 */
 
 	sprintf(query,
@@ -1918,7 +1920,7 @@ getIndices(int *numIndices)
 	 * find all the user-defined indices. We do not handle partial
 	 * indices.
 	 *
-	 * skip 'xinx*' - indices on inversion objects
+	 * Notice we skip indices on inversion objects (relkind 'l')
 	 *
 	 * this is a 4-way join !!
 	 */
@@ -1930,7 +1932,7 @@ getIndices(int *numIndices)
 			"from pg_index i, pg_class t1, pg_class t2, pg_am a "
 			"where t1.oid = i.indexrelid and t2.oid = i.indrelid "
 			"and t1.relam = a.oid and i.indexrelid > '%u'::oid "
-			"and t2.relname !~ '^pg_' and t1.relkind != 'l'",
+			"and t2.relname !~ '^pg_' and t2.relkind != 'l'",
 			g_last_builtin_oid);
 
 	res = PQexec(g_conn, query);

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`*`
`22`	`22`	`*`
`23`	`23`	`* IDENTIFICATION`
`24`		`- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.114 1999/05/29 10:25:31 vadim Exp $`
	`24`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.115 1999/06/03 04:01:16 tgl Exp $`
`25`	`25`	`*`
`26`	`26`	`* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb`
`27`	`27`	`*`
`@@ -1419,7 +1419,9 @@ getTables(int numTables, FuncInfo finfo, int numFuncs)`
`1419`	`1419`	`* ordering by oid is important so that we always process the parent`
`1420`	`1420`	`* tables before the child tables when traversing the tblinfo*`
`1421`	`1421`	`*`
`1422`		`- * we ignore tables that start with xinv`
	`1422`	`+ * we ignore tables that are not type 'r' (ordinary relation)`
	`1423`	`+ * or 'S' (sequence) --- in particular, Large Object relations`
	`1424`	`+ * (type 'l') are ignored.`
`1423`	`1425`	`*/`
`1424`	`1426`
`1425`	`1427`	`sprintf(query,`
`@@ -1918,7 +1920,7 @@ getIndices(int *numIndices)`
`1918`	`1920`	`* find all the user-defined indices. We do not handle partial`
`1919`	`1921`	`* indices.`
`1920`	`1922`	`*`
`1921`		`- * skip 'xinx*' - indices on inversion objects`
	`1923`	`+ * Notice we skip indices on inversion objects (relkind 'l')`
`1922`	`1924`	`*`
`1923`	`1925`	`* this is a 4-way join !!`
`1924`	`1926`	`*/`
`@@ -1930,7 +1932,7 @@ getIndices(int *numIndices)`
`1930`	`1932`	`"from pg_index i, pg_class t1, pg_class t2, pg_am a "`
`1931`	`1933`	`"where t1.oid = i.indexrelid and t2.oid = i.indrelid "`
`1932`	`1934`	`"and t1.relam = a.oid and i.indexrelid > '%u'::oid "`
`1933`		`- "and t2.relname !~ '^pg_' and t1.relkind != 'l'",`
	`1935`	`+ "and t2.relname !~ '^pg_' and t2.relkind != 'l'",`
`1934`	`1936`	`g_last_builtin_oid);`
`1935`	`1937`
`1936`	`1938`	`res = PQexec(g_conn, query);`