In pg_upgrade, avoid dumping orphaned temporary tables. This makes the

bmomjian · bmomjian · commit f239ec57277b · 2011-08-15T22:39:38.000-04:00
pg_upgrade schema matching pattern match pg_dump/pg_dumpall.

Fix for 9.0, 9.1, and 9.2.
diff --git a/contrib/pg_upgrade/info.c b/contrib/pg_upgrade/info.c
@@ -326,7 +326,10 @@ get_rel_infos(migratorContext *ctx, const DbInfo *dbinfo,
 			 "	ON c.relnamespace = n.oid "
 			 "   LEFT OUTER JOIN pg_catalog.pg_tablespace t "
 			 "	ON c.reltablespace = t.oid "
-			 "WHERE (( n.nspname NOT IN ('pg_catalog', 'information_schema') "
+			 "WHERE (( "
+			 /* exclude pg_catalog and pg_temp_ (could be orphaned tables) */
+			 "	n.nspname !~ '^pg_' "
+			 "	AND n.nspname != 'information_schema' "
 			 "	AND c.oid >= %u "
 			 "	) OR ( "
 			 "	n.nspname = 'pg_catalog' "
diff --git a/contrib/pg_upgrade/version_old_8_3.c b/contrib/pg_upgrade/version_old_8_3.c
@@ -61,7 +61,8 @@ old_8_3_check_for_name_data_type_usage(migratorContext *ctx, Cluster whichCluste
 								"		NOT a.attisdropped AND "
 								"		a.atttypid = 'pg_catalog.name'::pg_catalog.regtype AND "
 								"		c.relnamespace = n.oid AND "
-							  "		n.nspname != 'pg_catalog' AND "
+							 /* exclude pg_catalog and pg_temp_ (could be orphaned tables) */
+								"   n.nspname !~ '^pg_' AND "
 						 "		n.nspname != 'information_schema'");
 
 		ntups = PQntuples(res);
@@ -151,7 +152,8 @@ old_8_3_check_for_tsquery_usage(migratorContext *ctx, Cluster whichCluster)
 								"		NOT a.attisdropped AND "
 								"		a.atttypid = 'pg_catalog.tsquery'::pg_catalog.regtype AND "
 								"		c.relnamespace = n.oid AND "
-							  "		n.nspname != 'pg_catalog' AND "
+							 /* exclude pg_catalog and pg_temp_ (could be orphaned tables) */
+								"   n.nspname !~ '^pg_' AND "
 						 "		n.nspname != 'information_schema'");
 
 		ntups = PQntuples(res);
@@ -250,7 +252,8 @@ old_8_3_rebuild_tsvector_tables(migratorContext *ctx, bool check_mode,
 								"		NOT a.attisdropped AND "
 								"		a.atttypid = 'pg_catalog.tsvector'::pg_catalog.regtype AND "
 								"		c.relnamespace = n.oid AND "
-							  "		n.nspname != 'pg_catalog' AND "
+							 /* exclude pg_catalog and pg_temp_ (could be orphaned tables) */
+								"   n.nspname !~ '^pg_' AND "
 						 "		n.nspname != 'information_schema'");
 
 /*
@@ -268,7 +271,7 @@ old_8_3_rebuild_tsvector_tables(migratorContext *ctx, bool check_mode,
 								"		NOT a.attisdropped AND "		\
 								"		a.atttypid = 'pg_catalog.tsvector'::pg_catalog.regtype AND " \
 								"		c.relnamespace = n.oid AND "	\
-								"		n.nspname != 'pg_catalog' AND " \
+								"       n.nspname !~ '^pg_' AND "		\
 								"		n.nspname != 'information_schema') "
 
 		ntups = PQntuples(res);
@@ -638,7 +641,8 @@ old_8_3_create_sequence_script(migratorContext *ctx, Cluster whichCluster)
 								"		pg_catalog.pg_namespace n "
 								"WHERE	c.relkind = 'S' AND "
 								"		c.relnamespace = n.oid AND "
-							  "		n.nspname != 'pg_catalog' AND "
+							 /* exclude pg_catalog and pg_temp_ (could be orphaned tables) */
+								"   n.nspname !~ '^pg_' AND "
 						 "		n.nspname != 'information_schema'");
 
 		ntups = PQntuples(res);
