Make FKs valid at creation when added as column constraints.

simonat2ndQuadrant · simonat2ndQuadrant · commit ec497a5ad6a0 · 2011-03-22T23:10:35.000Z
Bug report from Alvaro Herrera
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
@@ -5595,7 +5595,7 @@ ATAddForeignKeyConstraint(AlteredTableInfo *tab, Relation rel,
 									  CONSTRAINT_FOREIGN,
 									  fkconstraint->deferrable,
 									  fkconstraint->initdeferred,
-									  !fkconstraint->skip_validation,
+									  fkconstraint->initially_valid,
 									  RelationGetRelid(rel),
 									  fkattnum,
 									  numfks,
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
@@ -2341,6 +2341,7 @@ _copyConstraint(Constraint *from)
 	COPY_SCALAR_FIELD(fk_upd_action);
 	COPY_SCALAR_FIELD(fk_del_action);
 	COPY_SCALAR_FIELD(skip_validation);
+	COPY_SCALAR_FIELD(initially_valid);
 
 	return newnode;
 }
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
@@ -2270,6 +2270,7 @@ _equalConstraint(Constraint *a, Constraint *b)
 	COMPARE_SCALAR_FIELD(fk_upd_action);
 	COMPARE_SCALAR_FIELD(fk_del_action);
 	COMPARE_SCALAR_FIELD(skip_validation);
+	COMPARE_SCALAR_FIELD(initially_valid);
 
 	return true;
 }
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
@@ -2625,6 +2625,7 @@ _outConstraint(StringInfo str, Constraint *node)
 			WRITE_CHAR_FIELD(fk_upd_action);
 			WRITE_CHAR_FIELD(fk_del_action);
 			WRITE_BOOL_FIELD(skip_validation);
+			WRITE_BOOL_FIELD(initially_valid);
 			break;
 
 		case CONSTR_ATTR_DEFERRABLE:
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -2621,6 +2621,7 @@ ColConstraintElem:
 					n->fk_upd_action	= (char) ($5 >> 8);
 					n->fk_del_action	= (char) ($5 & 0xFF);
 					n->skip_validation  = FALSE;
+					n->initially_valid  = true;
 					$$ = (Node *)n;
 				}
 		;
@@ -2820,6 +2821,7 @@ ConstraintElem:
 					n->deferrable		= ($11 & 1) != 0;
 					n->initdeferred		= ($11 & 2) != 0;
 					n->skip_validation  = false;
+					n->initially_valid  = true;
 					$$ = (Node *)n;
 				}
 			| FOREIGN KEY '(' columnList ')' REFERENCES qualified_name
@@ -2836,6 +2838,7 @@ ConstraintElem:
 					n->fk_upd_action	= (char) ($10 >> 8);
 					n->fk_del_action	= (char) ($10 & 0xFF);
 					n->skip_validation  = true;
+					n->initially_valid  = false;
 					$$ = (Node *)n;
 				}
 		;
diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c
@@ -1696,6 +1696,7 @@ transformFKConstraints(CreateStmtContext *cxt,
 			Constraint *constraint = (Constraint *) lfirst(fkclist);
 
 			constraint->skip_validation = true;
+			constraint->initially_valid  = true;
 		}
 	}
 
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
@@ -1536,6 +1536,7 @@ typedef struct Constraint
 	char		fk_upd_action;	/* ON UPDATE action */
 	char		fk_del_action;	/* ON DELETE action */
 	bool		skip_validation;	/* skip validation of existing rows? */
+	bool		initially_valid;	/* start the new constraint as valid */
 } Constraint;
 
 /* ----------------------

Original file line number	Diff line number	Diff line change
`@@ -2341,6 +2341,7 @@ _copyConstraint(Constraint *from)`
`2341`	`2341`	`COPY_SCALAR_FIELD(fk_upd_action);`
`2342`	`2342`	`COPY_SCALAR_FIELD(fk_del_action);`
`2343`	`2343`	`COPY_SCALAR_FIELD(skip_validation);`
	`2344`	`+ COPY_SCALAR_FIELD(initially_valid);`
`2344`	`2345`
`2345`	`2346`	`return newnode;`
`2346`	`2347`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2270,6 +2270,7 @@ _equalConstraint(Constraint a, Constraint b)`
`2270`	`2270`	`COMPARE_SCALAR_FIELD(fk_upd_action);`
`2271`	`2271`	`COMPARE_SCALAR_FIELD(fk_del_action);`
`2272`	`2272`	`COMPARE_SCALAR_FIELD(skip_validation);`
	`2273`	`+ COMPARE_SCALAR_FIELD(initially_valid);`
`2273`	`2274`
`2274`	`2275`	`return true;`
`2275`	`2276`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2621,6 +2621,7 @@ ColConstraintElem:`
`2621`	`2621`	`n->fk_upd_action = (char) ($5 >> 8);`
`2622`	`2622`	`n->fk_del_action = (char) ($5 & 0xFF);`
`2623`	`2623`	`n->skip_validation = FALSE;`
	`2624`	`+ n->initially_valid = true;`
`2624`	`2625`	`$$ = (Node *)n;`
`2625`	`2626`	`}`
`2626`	`2627`	`;`
`@@ -2820,6 +2821,7 @@ ConstraintElem:`
`2820`	`2821`	`n->deferrable = ($11 & 1) != 0;`
`2821`	`2822`	`n->initdeferred = ($11 & 2) != 0;`
`2822`	`2823`	`n->skip_validation = false;`
	`2824`	`+ n->initially_valid = true;`
`2823`	`2825`	`$$ = (Node *)n;`
`2824`	`2826`	`}`
`2825`	`2827`	`\| FOREIGN KEY '(' columnList ')' REFERENCES qualified_name`
`@@ -2836,6 +2838,7 @@ ConstraintElem:`
`2836`	`2838`	`n->fk_upd_action = (char) ($10 >> 8);`
`2837`	`2839`	`n->fk_del_action = (char) ($10 & 0xFF);`
`2838`	`2840`	`n->skip_validation = true;`
	`2841`	`+ n->initially_valid = false;`
`2839`	`2842`	`$$ = (Node *)n;`
`2840`	`2843`	`}`
`2841`	`2844`	`;`
Original file line number	Diff line number	Diff line change
`@@ -1696,6 +1696,7 @@ transformFKConstraints(CreateStmtContext *cxt,`
`1696`	`1696`	`Constraint constraint = (Constraint ) lfirst(fkclist);`
`1697`	`1697`
`1698`	`1698`	`constraint->skip_validation = true;`
	`1699`	`+ constraint->initially_valid = true;`
`1699`	`1700`	`}`
`1700`	`1701`	`}`
`1701`	`1702`