Merge pull request #722 from bigplaice/support-pg_upgrade-for-V4

gaoxueyu · web-flow · commit a4c028b389b9 · 2024-12-26T15:15:48.000+08:00
pg_upgrade supports IvorySQL V4
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
@@ -143,8 +143,11 @@ getSchemaData(Archive *fout, int *numTablesPtr)
 	pg_log_info("reading schemas");
 	(void) getNamespaces(fout, &numNamespaces);
 
-	pg_log_info("reading user-defined packages");
-	getPackages(fout, &numPkgs);
+	if(fout->remoteVersion > 170000)
+	{
+		pg_log_info("reading user-defined packages");
+		getPackages(fout, &numPkgs);
+	}
 
 	/*
 	 * getTables should be done as soon as possible, so as to minimize the
diff --git a/src/bin/pg_upgrade/info.c b/src/bin/pg_upgrade/info.c
@@ -489,7 +489,7 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo)
 			 "    ((n.nspname !~ '^pg_temp_' AND "
 			 "      n.nspname !~ '^pg_toast_temp_' AND "
 			 "      n.nspname NOT IN ('pg_catalog', 'information_schema', "
-			 "                        'binary_upgrade', 'pg_toast') AND "
+			 "                        'binary_upgrade', 'pg_toast', 'sys') AND "
 			 "      c.oid >= %u::pg_catalog.oid) OR "
 			 "     (n.nspname = 'pg_catalog' AND "
 			 "      relname IN ('pg_largeobject') ))), ",
