/ Check-in [9cdf813c]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Remove a redundant test for disabling RESTRICT with defer_foreign_keys=ON.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 9cdf813c6aaaddc01d2d4e04636c83fcda04d971
User & Date: drh 2016-03-30 14:17:36
Context
2016-03-30
14:26
Increase the version number to 3.13.0 on account of the new session extension. check-in: e9bcd5ac user: drh tags: trunk
14:17
Remove a redundant test for disabling RESTRICT with defer_foreign_keys=ON. check-in: 9cdf813c user: drh tags: trunk
13:43
Incorporate the sessions extension and the SQLITE_ENABLE_PREUPDATE_HOOK compile-time option. check-in: 4af7a90f user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/fkey.c.

  1161   1161     Trigger *pTrigger;              /* Trigger definition to return */
  1162   1162     int iAction = (pChanges!=0);    /* 1 for UPDATE, 0 for DELETE */
  1163   1163   
  1164   1164     action = pFKey->aAction[iAction];
  1165   1165     if( action==OE_Restrict && (db->flags & SQLITE_DeferFKs) ){
  1166   1166       return 0;
  1167   1167     }
  1168         -
  1169   1168     pTrigger = pFKey->apTrigger[iAction];
  1170         -  if( (db->flags & SQLITE_DeferFKs) && action==OE_Restrict ){
  1171         -    return 0;
  1172         -  }
  1173   1169   
  1174   1170     if( action!=OE_None && !pTrigger ){
  1175   1171       char const *zFrom;            /* Name of child table */
  1176   1172       int nFrom;                    /* Length in bytes of zFrom */
  1177   1173       Index *pIdx = 0;              /* Parent key index for this FK */
  1178   1174       int *aiCol = 0;               /* child table cols -> parent key cols */
  1179   1175       TriggerStep *pStep = 0;        /* First (only) step of trigger program */