Movatterモバイル変換

Skip to content

postgrespro/postgresproPublic

NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commitec497a5

simonat2ndQuadrant

simonat2ndQuadrant

committed

Make FKs valid at creation when added as column constraints.

Bug report from Alvaro Herrera

1 parent5d1d679 commitec497a5Copy full SHA for ec497a5

File tree

7 files changed

+9

-1

lines changed

src
- backend
  - commands
    - tablecmds.c
  - nodes
  - parser
    - gram.y
    - parse_utilcmd.c
- include/nodes
  - parsenodes.h

7 files changed

+9

-1

lines changed

`‎src/backend/commands/tablecmds.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5595,7 +5595,7 @@ ATAddForeignKeyConstraint(AlteredTableInfo *tab, Relation rel,`
`5595`	`5595`	`CONSTRAINT_FOREIGN,`
`5596`	`5596`	`fkconstraint->deferrable,`
`5597`	`5597`	`fkconstraint->initdeferred,`
`5598`		`-!fkconstraint->skip_validation,`
	`5598`	`+fkconstraint->initially_valid,`
`5599`	`5599`	`RelationGetRelid(rel),`
`5600`	`5600`	`fkattnum,`
`5601`	`5601`	`numfks,`

`‎src/backend/nodes/copyfuncs.c‎`

Lines changed: 1 addition & 0 deletions

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`	`returnnewnode;`
`2346`	`2347`	`}`

`‎src/backend/nodes/equalfuncs.c‎`

Lines changed: 1 addition & 0 deletions

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`	`}`

`‎src/backend/nodes/outfuncs.c‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2625,6 +2625,7 @@ _outConstraint(StringInfo str, Constraint *node)`
`2625`	`2625`	`WRITE_CHAR_FIELD(fk_upd_action);`
`2626`	`2626`	`WRITE_CHAR_FIELD(fk_del_action);`
`2627`	`2627`	`WRITE_BOOL_FIELD(skip_validation);`
	`2628`	`+WRITE_BOOL_FIELD(initially_valid);`
`2628`	`2629`	`break;`
`2629`	`2630`
`2630`	`2631`	`caseCONSTR_ATTR_DEFERRABLE:`

`‎src/backend/parser/gram.y‎`

Lines changed: 3 additions & 0 deletions

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`	`\|FOREIGNKEY'('columnList')'REFERENCESqualified_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`	`;`

`‎src/backend/parser/parse_utilcmd.c‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1696,6 +1696,7 @@ transformFKConstraints(CreateStmtContext *cxt,`
`1696`	`1696`	`Constraintconstraint= (Constraint)lfirst(fkclist);`
`1697`	`1697`
`1698`	`1698`	`constraint->skip_validation= true;`
	`1699`	`+constraint->initially_valid= true;`
`1699`	`1700`	`}`
`1700`	`1701`	`}`
`1701`	`1702`

`‎src/include/nodes/parsenodes.h‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1536,6 +1536,7 @@ typedef struct Constraint`
`1536`	`1536`	`charfk_upd_action;/* ON UPDATE action */`
`1537`	`1537`	`charfk_del_action;/* ON DELETE action */`
`1538`	`1538`	`boolskip_validation;/* skip validation of existing rows? */`
	`1539`	`+boolinitially_valid;/* start the new constraint as valid */`
`1539`	`1540`	`}Constraint;`
`1540`	`1541`
`1541`	`1542`	`/* ----------------------`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp