pg_dump: Fix dump of generated columns in partitions

petere · petere · commit feb270d1005f · 2021-05-04T14:18:16.000+02:00
The previous fix for dumping of inherited generated columns (0bf8364) must not be applied to partitions, since, unlike normal inherited tables, they are always dumped separately and reattached. Reported-by: Santosh Udupi <email@hitha.net> Discussion: https://www.postgresql.org/message-id/flat/CACLRvHZ4a-%2BSM_159%2BtcrHdEqxFrG%3DW4gwTRnwf7Oj0UNj5R2A%40mail.gmail.com
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
@@ -480,9 +480,11 @@ flagInhIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
  * - Detect child columns that have a generation expression when their parents
  *   also have one.  Generation expressions are always inherited, so there is
  *   no need to set them again in child tables, and there is no syntax for it
- *   either.  (Exception: In binary upgrade mode we dump them because
- *   inherited tables are recreated standalone first and then reattached to
- *   the parent.)
+ *   either.  Exceptions: If it's a partition or we are in binary upgrade
+ *   mode, we dump them because in those cases inherited tables are recreated
+ *   standalone first and then reattached to the parent.  (See also the logic
+ *   in dumpTableSchema().)  In that situation, the generation expressions
+ *   must match the parent, enforced by ALTER TABLE.
  *
  * modifies tblinfo
  */
@@ -585,7 +587,7 @@ flagInhAttrs(DumpOptions *dopt, TableInfo *tblinfo, int numTables)
 			}
 
 			/* Remove generation expression from child */
-			if (foundGenerated && !dopt->binary_upgrade)
+			if (foundGenerated && !tbinfo->ispartition && !dopt->binary_upgrade)
 				tbinfo->attrdefs[j] = NULL;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -480,9 +480,11 @@ flagInhIndexes(Archive *fout, TableInfo tblinfo[], int numTables)`
`480`	`480`	`* - Detect child columns that have a generation expression when their parents`
`481`	`481`	`* also have one. Generation expressions are always inherited, so there is`
`482`	`482`	`* no need to set them again in child tables, and there is no syntax for it`
`483`		`- * either. (Exception: In binary upgrade mode we dump them because`
`484`		`- * inherited tables are recreated standalone first and then reattached to`
`485`		`- * the parent.)`
	`483`	`+ * either. Exceptions: If it's a partition or we are in binary upgrade`
	`484`	`+ * mode, we dump them because in those cases inherited tables are recreated`
	`485`	`+ * standalone first and then reattached to the parent. (See also the logic`
	`486`	`+ * in dumpTableSchema().) In that situation, the generation expressions`
	`487`	`+ * must match the parent, enforced by ALTER TABLE.`
`486`	`488`	`*`
`487`	`489`	`* modifies tblinfo`
`488`	`490`	`*/`
`@@ -585,7 +587,7 @@ flagInhAttrs(DumpOptions dopt, TableInfo tblinfo, int numTables)`
`585`	`587`	`}`
`586`	`588`
`587`	`589`	`/* Remove generation expression from child */`
`588`		`- if (foundGenerated && !dopt->binary_upgrade)`
	`590`	`+ if (foundGenerated && !tbinfo->ispartition && !dopt->binary_upgrade)`
`589`	`591`	`tbinfo->attrdefs[j] = NULL;`
`590`	`592`	`}`
`591`	`593`	`}`