Skip to content

P
Postgres FD Implementation
Commit f9429746 authored by Tom Lane's avatar Tom Lane
Browse files
Options

Update SQL spec references in ri_triggers code to match SQL:2008. 

Now that what we're implementing isn't SQL92, we probably shouldn't cite
chapter and verse in that spec anymore.  Also fix some comments that
talked about MATCH FULL but in fact were in code that's also used for
MATCH SIMPLE.

No code changes in this commit, just comments.
parent c75be2ad
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 68 deletions
src/backend/utils/adt/ri_triggers.c
View file @ f9429746
...@@ -309,14 +309,13 @@ RI_FKey_check(PG_FUNCTION_ARGS) ...@@ -309,14 +309,13 @@ RI_FKey_check(PG_FUNCTION_ARGS)
pk_rel = heap_open(riinfo.pk_relid, RowShareLock); pk_rel = heap_open(riinfo.pk_relid, RowShareLock);
/* ---------- /* ----------
* SQL3 11.9 <referential constraint definition> * SQL:2008 4.17.3 <Table constraints>
* General rules 2) a):
* If Rf and Rt are empty (no columns to compare given) * If Rf and Rt are empty (no columns to compare given)
* constraint is true if 0 < (SELECT COUNT(*) FROM T) * constraint is true if 0 < (SELECT COUNT(*) FROM T)
* *
* Note: The special case that no columns are given cannot * Note: The special case that no columns are given cannot
* occur up to now in Postgres, it's just there for * occur at present in Postgres (and is disallowed by the
* future enhancements. * standard too); it's just there for future enhancements.
* ---------- * ----------
*/ */
if (riinfo.nkeys == 0) if (riinfo.nkeys == 0)
...@@ -376,10 +375,8 @@ RI_FKey_check(PG_FUNCTION_ARGS) ...@@ -376,10 +375,8 @@ RI_FKey_check(PG_FUNCTION_ARGS)
case RI_KEYS_ALL_NULL: case RI_KEYS_ALL_NULL:
/* /*
* No check - if NULLs are allowed at all is already checked by * No further check needed - an all-NULL key passes every type of
* NOT NULL constraint. * foreign key constraint.
*
* This is true for MATCH FULL, MATCH PARTIAL, and MATCH SIMPLE.
*/ */
heap_close(pk_rel, RowShareLock); heap_close(pk_rel, RowShareLock);
return PointerGetDatum(NULL); return PointerGetDatum(NULL);
...@@ -410,7 +407,8 @@ RI_FKey_check(PG_FUNCTION_ARGS) ...@@ -410,7 +407,8 @@ RI_FKey_check(PG_FUNCTION_ARGS)
case FKCONSTR_MATCH_SIMPLE: case FKCONSTR_MATCH_SIMPLE:
/* /*
* MATCH SIMPLE - if ANY column is null, we have a match. * MATCH SIMPLE - if ANY column is null, the key passes
* the constraint.
*/ */
heap_close(pk_rel, RowShareLock); heap_close(pk_rel, RowShareLock);
return PointerGetDatum(NULL); return PointerGetDatum(NULL);
...@@ -578,8 +576,8 @@ ri_Check_Pk_Match(Relation pk_rel, Relation fk_rel, ...@@ -578,8 +576,8 @@ ri_Check_Pk_Match(Relation pk_rel, Relation fk_rel,
case FKCONSTR_MATCH_SIMPLE: case FKCONSTR_MATCH_SIMPLE:
/* /*
* MATCH SIMPLE/FULL - if ANY column is null, we * MATCH SIMPLE/FULL - if ANY column is null, nothing
* can't be matching to this row already. * could have been referencing this row.
*/ */
return true; return true;
...@@ -734,10 +732,10 @@ RI_FKey_noaction_del(PG_FUNCTION_ARGS) ...@@ -734,10 +732,10 @@ RI_FKey_noaction_del(PG_FUNCTION_ARGS)
switch (riinfo.confmatchtype) switch (riinfo.confmatchtype)
{ {
/* ---------- /* ----------
* SQL3 11.9 <referential constraint definition> * SQL:2008 15.17 <Execution of referential actions>
* General rules 6) a) iv): * General rules 9) a) iv):
* MATCH SIMPLE/FULL * MATCH SIMPLE/FULL
* ... ON DELETE CASCADE * ... ON DELETE NO ACTION
* ---------- * ----------
*/ */
case FKCONSTR_MATCH_SIMPLE: case FKCONSTR_MATCH_SIMPLE:
...@@ -751,8 +749,8 @@ RI_FKey_noaction_del(PG_FUNCTION_ARGS) ...@@ -751,8 +749,8 @@ RI_FKey_noaction_del(PG_FUNCTION_ARGS)
case RI_KEYS_SOME_NULL: case RI_KEYS_SOME_NULL:
/* /*
* No check - MATCH FULL means there cannot be any * No check needed - there cannot be any reference to old
* reference to old key if it contains NULL * key if it contains a NULL
*/ */
heap_close(fk_rel, RowShareLock); heap_close(fk_rel, RowShareLock);
return PointerGetDatum(NULL); return PointerGetDatum(NULL);
...@@ -905,10 +903,10 @@ RI_FKey_noaction_upd(PG_FUNCTION_ARGS) ...@@ -905,10 +903,10 @@ RI_FKey_noaction_upd(PG_FUNCTION_ARGS)
switch (riinfo.confmatchtype) switch (riinfo.confmatchtype)
{ {
/* ---------- /* ----------
* SQL3 11.9 <referential constraint definition> * SQL:2008 15.17 <Execution of referential actions>
* General rules 6) a) iv): * General rules 10) a) iv):
* MATCH SIMPLE/FULL * MATCH SIMPLE/FULL
* ... ON DELETE CASCADE * ... ON UPDATE NO ACTION
* ---------- * ----------
*/ */
case FKCONSTR_MATCH_SIMPLE: case FKCONSTR_MATCH_SIMPLE:
...@@ -922,8 +920,8 @@ RI_FKey_noaction_upd(PG_FUNCTION_ARGS) ...@@ -922,8 +920,8 @@ RI_FKey_noaction_upd(PG_FUNCTION_ARGS)
case RI_KEYS_SOME_NULL: case RI_KEYS_SOME_NULL:
/* /*
* No check - MATCH FULL means there cannot be any * No check needed - there cannot be any reference to old
* reference to old key if it contains NULL * key if it contains a NULL
*/ */
heap_close(fk_rel, RowShareLock); heap_close(fk_rel, RowShareLock);
return PointerGetDatum(NULL); return PointerGetDatum(NULL);
...@@ -1090,8 +1088,8 @@ RI_FKey_cascade_del(PG_FUNCTION_ARGS) ...@@ -1090,8 +1088,8 @@ RI_FKey_cascade_del(PG_FUNCTION_ARGS)
switch (riinfo.confmatchtype) switch (riinfo.confmatchtype)
{ {
/* ---------- /* ----------
* SQL3 11.9 <referential constraint definition> * SQL:2008 15.17 <Execution of referential actions>
* General rules 6) a) i): * General rules 9) a) i):
* MATCH SIMPLE/FULL * MATCH SIMPLE/FULL
* ... ON DELETE CASCADE * ... ON DELETE CASCADE
* ---------- * ----------
...@@ -1107,8 +1105,8 @@ RI_FKey_cascade_del(PG_FUNCTION_ARGS) ...@@ -1107,8 +1105,8 @@ RI_FKey_cascade_del(PG_FUNCTION_ARGS)
case RI_KEYS_SOME_NULL: case RI_KEYS_SOME_NULL:
/* /*
* No check - MATCH FULL means there cannot be any * No check needed - there cannot be any reference to old
* reference to old key if it contains NULL * key if it contains a NULL
*/ */
heap_close(fk_rel, RowExclusiveLock); heap_close(fk_rel, RowExclusiveLock);
return PointerGetDatum(NULL); return PointerGetDatum(NULL);
...@@ -1209,7 +1207,7 @@ RI_FKey_cascade_del(PG_FUNCTION_ARGS) ...@@ -1209,7 +1207,7 @@ RI_FKey_cascade_del(PG_FUNCTION_ARGS)
/* ---------- /* ----------
* RI_FKey_cascade_upd - * RI_FKey_cascade_upd -
* *
* Cascaded update/delete foreign key references at update event on PK table. * Cascaded update foreign key references at update event on PK table.
* ---------- * ----------
*/ */
Datum Datum
...@@ -1258,8 +1256,8 @@ RI_FKey_cascade_upd(PG_FUNCTION_ARGS) ...@@ -1258,8 +1256,8 @@ RI_FKey_cascade_upd(PG_FUNCTION_ARGS)
switch (riinfo.confmatchtype) switch (riinfo.confmatchtype)
{ {
/* ---------- /* ----------
* SQL3 11.9 <referential constraint definition> * SQL:2008 15.17 <Execution of referential actions>
* General rules 7) a) i): * General rules 10) a) i):
* MATCH SIMPLE/FULL * MATCH SIMPLE/FULL
* ... ON UPDATE CASCADE * ... ON UPDATE CASCADE
* ---------- * ----------
...@@ -1275,8 +1273,8 @@ RI_FKey_cascade_upd(PG_FUNCTION_ARGS) ...@@ -1275,8 +1273,8 @@ RI_FKey_cascade_upd(PG_FUNCTION_ARGS)
case RI_KEYS_SOME_NULL: case RI_KEYS_SOME_NULL:
/* /*
* No update - MATCH FULL means there cannot be any * No check needed - there cannot be any reference to old
* reference to old key if it contains NULL * key if it contains a NULL
*/ */
heap_close(fk_rel, RowExclusiveLock); heap_close(fk_rel, RowExclusiveLock);
return PointerGetDatum(NULL); return PointerGetDatum(NULL);
...@@ -1401,12 +1399,10 @@ RI_FKey_cascade_upd(PG_FUNCTION_ARGS) ...@@ -1401,12 +1399,10 @@ RI_FKey_cascade_upd(PG_FUNCTION_ARGS)
* *
* Restrict delete from PK table to rows unreferenced by foreign key. * Restrict delete from PK table to rows unreferenced by foreign key.
* *
* SQL3 intends that this referential action occur BEFORE the * The SQL standard intends that this referential action occur BEFORE
* update is performed, rather than after. This appears to be * the delete is performed, rather than after. This appears to be
* the only difference between "NO ACTION" and "RESTRICT". * the only difference between "NO ACTION" and "RESTRICT". In Postgres
* * we still implement this as an AFTER trigger, but it's non-deferrable.
* For now, however, we treat "RESTRICT" and "NO ACTION" as
* equivalent.
* ---------- * ----------
*/ */
Datum Datum
...@@ -1451,10 +1447,10 @@ RI_FKey_restrict_del(PG_FUNCTION_ARGS) ...@@ -1451,10 +1447,10 @@ RI_FKey_restrict_del(PG_FUNCTION_ARGS)
switch (riinfo.confmatchtype) switch (riinfo.confmatchtype)
{ {
/* ---------- /* ----------
* SQL3 11.9 <referential constraint definition> * SQL:2008 15.17 <Execution of referential actions>
* General rules 6) a) iv): * General rules 9) a) iv):
* MATCH SIMPLE/FULL * MATCH SIMPLE/FULL
* ... ON DELETE CASCADE * ... ON DELETE RESTRICT
* ---------- * ----------
*/ */
case FKCONSTR_MATCH_SIMPLE: case FKCONSTR_MATCH_SIMPLE:
...@@ -1468,8 +1464,8 @@ RI_FKey_restrict_del(PG_FUNCTION_ARGS) ...@@ -1468,8 +1464,8 @@ RI_FKey_restrict_del(PG_FUNCTION_ARGS)
case RI_KEYS_SOME_NULL: case RI_KEYS_SOME_NULL:
/* /*
* No check - MATCH FULL means there cannot be any * No check needed - there cannot be any reference to old
* reference to old key if it contains NULL * key if it contains a NULL
*/ */
heap_close(fk_rel, RowShareLock); heap_close(fk_rel, RowShareLock);
return PointerGetDatum(NULL); return PointerGetDatum(NULL);
...@@ -1574,12 +1570,10 @@ RI_FKey_restrict_del(PG_FUNCTION_ARGS) ...@@ -1574,12 +1570,10 @@ RI_FKey_restrict_del(PG_FUNCTION_ARGS)
* *
* Restrict update of PK to rows unreferenced by foreign key. * Restrict update of PK to rows unreferenced by foreign key.
* *
* SQL3 intends that this referential action occur BEFORE the * The SQL standard intends that this referential action occur BEFORE
* update is performed, rather than after. This appears to be * the update is performed, rather than after. This appears to be
* the only difference between "NO ACTION" and "RESTRICT". * the only difference between "NO ACTION" and "RESTRICT". In Postgres
* * we still implement this as an AFTER trigger, but it's non-deferrable.
* For now, however, we treat "RESTRICT" and "NO ACTION" as
* equivalent.
* ---------- * ----------
*/ */
Datum Datum
...@@ -1627,10 +1621,10 @@ RI_FKey_restrict_upd(PG_FUNCTION_ARGS) ...@@ -1627,10 +1621,10 @@ RI_FKey_restrict_upd(PG_FUNCTION_ARGS)
switch (riinfo.confmatchtype) switch (riinfo.confmatchtype)
{ {
/* ---------- /* ----------
* SQL3 11.9 <referential constraint definition> * SQL:2008 15.17 <Execution of referential actions>
* General rules 6) a) iv): * General rules 10) a) iv):
* MATCH SIMPLE/FULL * MATCH SIMPLE/FULL
* ... ON DELETE CASCADE * ... ON UPDATE RESTRICT
* ---------- * ----------
*/ */
case FKCONSTR_MATCH_SIMPLE: case FKCONSTR_MATCH_SIMPLE:
...@@ -1644,8 +1638,8 @@ RI_FKey_restrict_upd(PG_FUNCTION_ARGS) ...@@ -1644,8 +1638,8 @@ RI_FKey_restrict_upd(PG_FUNCTION_ARGS)
case RI_KEYS_SOME_NULL: case RI_KEYS_SOME_NULL:
/* /*
* No check - MATCH FULL means there cannot be any * No check needed - there cannot be any reference to old
* reference to old key if it contains NULL * key if it contains a NULL
*/ */
heap_close(fk_rel, RowShareLock); heap_close(fk_rel, RowShareLock);
return PointerGetDatum(NULL); return PointerGetDatum(NULL);
...@@ -1802,8 +1796,8 @@ RI_FKey_setnull_del(PG_FUNCTION_ARGS) ...@@ -1802,8 +1796,8 @@ RI_FKey_setnull_del(PG_FUNCTION_ARGS)
switch (riinfo.confmatchtype) switch (riinfo.confmatchtype)
{ {
/* ---------- /* ----------
* SQL3 11.9 <referential constraint definition> * SQL:2008 15.17 <Execution of referential actions>
* General rules 6) a) ii): * General rules 9) a) ii):
* MATCH SIMPLE/FULL * MATCH SIMPLE/FULL
* ... ON DELETE SET NULL * ... ON DELETE SET NULL
* ---------- * ----------
...@@ -1819,8 +1813,8 @@ RI_FKey_setnull_del(PG_FUNCTION_ARGS) ...@@ -1819,8 +1813,8 @@ RI_FKey_setnull_del(PG_FUNCTION_ARGS)
case RI_KEYS_SOME_NULL: case RI_KEYS_SOME_NULL:
/* /*
* No update - MATCH FULL means there cannot be any * No check needed - there cannot be any reference to old
* reference to old key if it contains NULL * key if it contains a NULL
*/ */
heap_close(fk_rel, RowExclusiveLock); heap_close(fk_rel, RowExclusiveLock);
return PointerGetDatum(NULL); return PointerGetDatum(NULL);
...@@ -1977,8 +1971,8 @@ RI_FKey_setnull_upd(PG_FUNCTION_ARGS) ...@@ -1977,8 +1971,8 @@ RI_FKey_setnull_upd(PG_FUNCTION_ARGS)
switch (riinfo.confmatchtype) switch (riinfo.confmatchtype)
{ {
/* ---------- /* ----------
* SQL3 11.9 <referential constraint definition> * SQL:2008 15.17 <Execution of referential actions>
* General rules 7) a) ii) 2): * General rules 10) a) ii):
* MATCH SIMPLE/FULL * MATCH SIMPLE/FULL
* ... ON UPDATE SET NULL * ... ON UPDATE SET NULL
* ---------- * ----------
...@@ -1994,8 +1988,8 @@ RI_FKey_setnull_upd(PG_FUNCTION_ARGS) ...@@ -1994,8 +1988,8 @@ RI_FKey_setnull_upd(PG_FUNCTION_ARGS)
case RI_KEYS_SOME_NULL: case RI_KEYS_SOME_NULL:
/* /*
* No update - MATCH FULL means there cannot be any * No check needed - there cannot be any reference to old
* reference to old key if it contains NULL * key if it contains a NULL
*/ */
heap_close(fk_rel, RowExclusiveLock); heap_close(fk_rel, RowExclusiveLock);
return PointerGetDatum(NULL); return PointerGetDatum(NULL);
...@@ -2158,8 +2152,8 @@ RI_FKey_setdefault_del(PG_FUNCTION_ARGS) ...@@ -2158,8 +2152,8 @@ RI_FKey_setdefault_del(PG_FUNCTION_ARGS)
switch (riinfo.confmatchtype) switch (riinfo.confmatchtype)
{ {
/* ---------- /* ----------
* SQL3 11.9 <referential constraint definition> * SQL:2008 15.17 <Execution of referential actions>
* General rules 6) a) iii): * General rules 9) a) iii):
* MATCH SIMPLE/FULL * MATCH SIMPLE/FULL
* ... ON DELETE SET DEFAULT * ... ON DELETE SET DEFAULT
* ---------- * ----------
...@@ -2175,8 +2169,8 @@ RI_FKey_setdefault_del(PG_FUNCTION_ARGS) ...@@ -2175,8 +2169,8 @@ RI_FKey_setdefault_del(PG_FUNCTION_ARGS)
case RI_KEYS_SOME_NULL: case RI_KEYS_SOME_NULL:
/* /*
* No update - MATCH FULL means there cannot be any * No check needed - there cannot be any reference to old
* reference to old key if it contains NULL * key if it contains a NULL
*/ */
heap_close(fk_rel, RowExclusiveLock); heap_close(fk_rel, RowExclusiveLock);
return PointerGetDatum(NULL); return PointerGetDatum(NULL);
...@@ -2344,8 +2338,8 @@ RI_FKey_setdefault_upd(PG_FUNCTION_ARGS) ...@@ -2344,8 +2338,8 @@ RI_FKey_setdefault_upd(PG_FUNCTION_ARGS)
switch (riinfo.confmatchtype) switch (riinfo.confmatchtype)
{ {
/* ---------- /* ----------
* SQL3 11.9 <referential constraint definition> * SQL:2008 15.17 <Execution of referential actions>
* General rules 7) a) iii): * General rules 10) a) iii):
* MATCH SIMPLE/FULL * MATCH SIMPLE/FULL
* ... ON UPDATE SET DEFAULT * ... ON UPDATE SET DEFAULT
* ---------- * ----------
...@@ -2361,8 +2355,8 @@ RI_FKey_setdefault_upd(PG_FUNCTION_ARGS) ...@@ -2361,8 +2355,8 @@ RI_FKey_setdefault_upd(PG_FUNCTION_ARGS)
case RI_KEYS_SOME_NULL: case RI_KEYS_SOME_NULL:
/* /*
* No update - MATCH FULL means there cannot be any * No check needed - there cannot be any reference to old
* reference to old key if it contains NULL * key if it contains a NULL
*/ */
heap_close(fk_rel, RowExclusiveLock); heap_close(fk_rel, RowExclusiveLock);
return PointerGetDatum(NULL); return PointerGetDatum(NULL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment