Merge pull request #1158 from jiaoshuntian/master_fix_upgrade

gaoxueyu · web-flow · commit 427869d8dcd3 · 2026-01-29T16:39:27.000+08:00
Fix the issue where upgrading from PostgreSQL to IvorySQL fails.
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -6905,6 +6905,28 @@ getPackages(Archive *fout, int *numPkgs)
 	int			i_rolname;
 	int			i_pkgacl;
 	int			i_acldefault;
+
+
+	/*
+	 * Check if pg_package table exists. This is needed for pg_upgrade from
+	 * PostgreSQL to IvorySQL, where the source database is PostgreSQL which
+	 * doesn't have pg_package table.
+	 */
+	res = ExecuteSqlQuery(fout,
+						  "SELECT 1 FROM pg_catalog.pg_class c "
+						  "JOIN pg_catalog.pg_namespace n ON c.relnamespace = n.oid "
+						  "WHERE n.nspname = 'pg_catalog' AND c.relname = 'pg_package'",
+						  PGRES_TUPLES_OK);
+	if (PQntuples(res) == 0)
+	{
+		/* pg_package table doesn't exist, return empty result */
+		PQclear(res);
+		destroyPQExpBuffer(query);
+		*numPkgs = 0;
+		return (PkgInfo *) pg_malloc0(sizeof(PkgInfo));
+	}
+	PQclear(res);
+
 	appendPQExpBuffer(query,
 					"SELECT p.tableoid, p.pkgname, p.oid, p.pkgnamespace,"
 					"p.pkgowner,"
@@ -7142,12 +7164,31 @@ getTables(Archive *fout, int *numTables)
 						 "d.refobjsubid AS owning_col, "
 						 "tsp.spcname AS reltablespace, ");
 
-	if (fout->remoteVersion < 170000)
-		appendPQExpBufferStr(query,
-							 "false AS relhasrowid, ");
-	else
-		appendPQExpBufferStr(query,
-							 "c.relhasrowid, ");
+	/*
+	 * Check if relhasrowid column exists. This column is IvorySQL-specific
+	 * for Oracle ROWID compatibility, and doesn't exist in native PostgreSQL.
+	 * We need to check at runtime rather than relying on remoteVersion because
+	 * when upgrading from PostgreSQL to IvorySQL, the source database is
+	 * PostgreSQL which may have the same version number but lacks this column.
+	 */
+	{
+		PGresult   *res_rowid;
+		bool		relhasrowid_exists = false;
+
+		res_rowid = ExecuteSqlQuery(fout,
+							  "SELECT 1 FROM pg_catalog.pg_attribute "
+							  "WHERE attrelid = 'pg_class'::regclass "
+							  "AND attname = 'relhasrowid' "
+							  "AND attnum > 0 LIMIT 1",
+							  PGRES_TUPLES_OK);
+		relhasrowid_exists = (PQntuples(res_rowid) > 0);
+		PQclear(res_rowid);
+
+		if (relhasrowid_exists)
+			appendPQExpBufferStr(query, "c.relhasrowid, ");
+		else
+			appendPQExpBufferStr(query, "false AS relhasrowid, ");
+	}
 
 	if (fout->remoteVersion >= 120000)
 		appendPQExpBufferStr(query,
@@ -9232,13 +9273,31 @@ getTableAttrs(Archive *fout, TableInfo *tblinfo, int numTables)
 		appendPQExpBufferStr(q,
 							 "'' AS attcompression,\n");
 	
-	if (fout->remoteVersion >= 170000)
-		appendPQExpBuffer(q,
-						"a.attisinvisible,\n");
-	else
-		appendPQExpBuffer(q,
-							"'f' AS attisinvisible,\n");
+	/*
+	 * Check if attisinvisible column exists. This column is IvorySQL-specific
+	 * for Oracle compatibility, and doesn't exist in native PostgreSQL.
+	 * We need to check at runtime rather than relying on remoteVersion because
+	 * when upgrading from PostgreSQL to IvorySQL, the source database is
+	 * PostgreSQL which may have the same version number but lacks this column.
+	 */
+	{
+		PGresult   *res_invisible;
+		bool		attisinvisible_exists = false;
 
+		res_invisible = ExecuteSqlQuery(fout,
+							  "SELECT 1 FROM pg_catalog.pg_attribute "
+							  "WHERE attrelid = 'pg_attribute'::regclass "
+							  "AND attname = 'attisinvisible' "
+							  "AND attnum > 0 LIMIT 1",
+							  PGRES_TUPLES_OK);
+		attisinvisible_exists = (PQntuples(res_invisible) > 0);
+		PQclear(res_invisible);
+
+		if (attisinvisible_exists)
+			appendPQExpBufferStr(q, "a.attisinvisible,\n");
+		else
+			appendPQExpBufferStr(q, "'f' AS attisinvisible,\n");
+	}
 
 	if (fout->remoteVersion >= 100000)
 		appendPQExpBufferStr(q,
diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c
@@ -624,7 +624,7 @@ get_control_data(ClusterInfo *cluster)
 		(!got_large_object &&
 		 cluster->controldata.ctrl_ver >= LARGE_OBJECT_SIZE_PG_CONTROL_VER) ||
 		!got_date_is_int || !got_data_checksum_version ||
-		!got_database_mode_is_oracle ||
+		//!got_database_mode_is_oracle ||
         (!got_default_char_signedness &&
             cluster->controldata.cat_ver >= DEFAULT_CHAR_SIGNEDNESS_CAT_VER))	
 	{
@@ -767,8 +767,8 @@ check_control_data(ControlData *oldctrl,
 	else if (oldctrl->data_checksum_version != newctrl->data_checksum_version)
 		pg_fatal("old and new cluster pg_controldata checksum versions do not match");
 
-	if (oldctrl->database_mode_is_oracle != newctrl->database_mode_is_oracle)
-		pg_fatal("old and new pg_controldata database mode do not match\n");
+//	if (oldctrl->database_mode_is_oracle != newctrl->database_mode_is_oracle)
+//		pg_fatal("old and new pg_controldata database mode do not match\n");
 }
 
 
diff --git a/src/bin/pg_upgrade/option.c b/src/bin/pg_upgrade/option.c
@@ -115,8 +115,8 @@ parseCommandLine(int argc, char *argv[])
 	if (os_user_effective_id == 0)
 		pg_fatal("%s: cannot be run as root", os_info.progname);
 
-	while ((option = getopt_long(argc, argv, "b:B:cd:D:j:kNo:O:p:P:q:Q:rs:U:v",	
-								 long_options, &optindex)) != -1)
+	while ((option = getopt_long(argc, argv, "b:B:cd:D:gj:kNo:O:p:P:q:Q:rs:U:v",
+					long_options, &optindex)) != -1)
 	{
 		switch (option)
 		{

Original file line number	Diff line number	Diff line change
`@@ -115,8 +115,8 @@ parseCommandLine(int argc, char *argv[])`
`115`	`115`	`if (os_user_effective_id == 0)`
`116`	`116`	`pg_fatal("%s: cannot be run as root", os_info.progname);`
`117`	`117`
`118`		`- while ((option = getopt_long(argc, argv, "b:B:cd:D:j:kNo:O:p:P:q:Q:rs:U:v",`
`119`		`- long_options, &optindex)) != -1)`
	`118`	`+ while ((option = getopt_long(argc, argv, "b:B:cd:D:gj:kNo:O:p:P:q:Q:rs:U:v",`
	`119`	`+ long_options, &optindex)) != -1)`
`120`	`120`	`{`
`121`	`121`	`switch (option)`
`122`	`122`	`{`