Merge pull request #747 from bigplaice/invisible_column_issue_743

gaoxueyu · web-flow · commit ed3f8d9c235b · 2025-03-10T14:38:42.000+08:00
Fix pg_dump for invisible columns
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -9071,7 +9071,7 @@ getTableAttrs(Archive *fout, TableInfo *tblinfo, int numTables)
 			tbinfo->attoptions[j] = pg_strdup(PQgetvalue(res, r, i_attoptions));
 			tbinfo->attcollation[j] = atooid(PQgetvalue(res, r, i_attcollation));
 			tbinfo->attcompression[j] = *(PQgetvalue(res, r, i_attcompression));
-			tbinfo->attisinvisible[j] = (PQgetvalue(res, j, i_attisinvisible)[0] == 't');
+			tbinfo->attisinvisible[j] = (PQgetvalue(res, r, i_attisinvisible)[0] == 't');
 			tbinfo->attfdwoptions[j] = pg_strdup(PQgetvalue(res, r, i_attfdwoptions));
 			tbinfo->attmissingval[j] = pg_strdup(PQgetvalue(res, r, i_attmissingval));
 			tbinfo->attrdefs[j] = NULL; /* fix below */
@@ -16306,6 +16306,10 @@ dumpTableSchema(Archive *fout, const TableInfo *tbinfo)
 							appendPQExpBuffer(q, " COLLATE %s",
 											  fmtQualifiedDumpable(coll));
 					}
+
+					if (tbinfo->attisinvisible[j])
+						appendPQExpBufferStr(q, " INVISIBLE");
+
 					is_ora_identity = false;
 				}
 			}
@@ -16695,12 +16699,6 @@ dumpTableSchema(Archive *fout, const TableInfo *tbinfo)
 								  foreign, qualrelname,
 								  fmtId(tbinfo->attnames[j]));
 
-			/*
-			 * Dump per-column invisible information.
-			 */
-			if (tbinfo->attisinvisible[j])
-				appendPQExpBufferStr(q, " INVISIBLE");
-
 			/*
 			 * Dump per-column statistics information. We only issue an ALTER
 			 * TABLE statement if the attstattarget entry for this column is
