mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update the foreign_key_check pragma so that when a parent table is undefined

Browse Source 
it is treated as an empty table.

FossilOrigin-Name: 208b259ad73b51e7df163fee3d7ed2bd79767597
This commit is contained in:
drh 2013-10-14 14:30:02 +00:00
commit 71d5338c5d
4 changed files with 59 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifest
View File

@ -1,5 +1,5 @@
C Corrects\sto\scomments\son\sthe\sSTAT4\simplementation.
D 2013-10-14T14:21:59.159
C Update\sthe\sforeign_key_check\spragma\sso\sthat\swhen\sa\sparent\stable\sis\sundefined\nit\sis\streated\sas\san\sempty\stable.
D 2013-10-14T14:30:02.391
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in e2d28ec95bd17ab4f3b6ee40b7102e9d7a0857b9
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -211,7 +211,7 @@ F src/parse.y a97566d6da75075589a7c716d1bda14b586cf8da
F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
F src/pcache1.c a467393909a4ed7ca9de066d85ba5c5b04a5be63
F src/pragma.c 1c00ed0dea8bc119d248e26e648d438e16e92010
F src/pragma.c 64d3d1f8b4ed144ba85c061d00d96d6be8aa2fea
F src/prepare.c fa6988589f39af8504a61731614cd4f6ae71554f
F src/printf.c da9119eb31a187a4b99f60aa4a225141c0ebb74b
F src/random.c 0b2dbc37fdfbfa6bd455b091dfcef5bdb32dba68
@ -462,7 +462,7 @@ F test/fkey1.test e1d1fa84cde579185ea01358436839703e415a5b
F test/fkey2.test 06e0b4cc9e1b3271ae2ae6feeb19755468432111
F test/fkey3.test 5ec899d12b13bcf1e9ef40eff7fb692fdb91392e
F test/fkey4.test 86446017011273aad8f9a99c1a65019e7bd9ca9d
F test/fkey5.test 2b8c761ad23bb6a95b9cf8366c9a982a80a439c2
F test/fkey5.test 8a1fde4e7721ae00b05b3178888833726ca2df8d
F test/fkey6.test 18e8c024d39f68f8d4bb1177c992bcffdc273464
F test/fkey7.test e31d0e71a41c1d29349a16448d6c420e2c53a8fc
F test/fkey_malloc.test bb74c9cb8f8fceed03b58f8a7ef2df98520bbd51
@ -1123,7 +1123,8 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
P 1660efbe46439734c7dc1674994ceb86a9b41d1a
R f477aeb6857af43b8fdd44c053eea21e
P e06f74d32d44f281dd21908d401184f35f9455a4 8c13a7fd738e5441af370537649b0bfa97679cda
R 569f3fd7fb4e81f584789e4d94c2c097
T +closed 8c13a7fd738e5441af370537649b0bfa97679cda
U drh
Z 5a50d5097c4b6be57e9ef1781ac233fc
Z 337ac35bfd11421ae22a03d4fa2d5ecb

2
manifest.uuid
View File

@ -1 +1 @@
e06f74d32d44f281dd21908d401184f35f9455a4
208b259ad73b51e7df163fee3d7ed2bd79767597

28
src/pragma.c
View File

@ -1638,8 +1638,8 @@ void sqlite3Pragma(
sqlite3VdbeAddOp4(v, OP_String8, 0, regResult, 0, pTab->zName,
P4_TRANSIENT);
for(i=1, pFK=pTab->pFKey; pFK; i++, pFK=pFK->pNextFrom){
pParent = sqlite3LocateTable(pParse, 0, pFK->zTo, zDb);
if( pParent==0 ) break;
pParent = sqlite3FindTable(db, pFK->zTo, zDb);
if( pParent==0 ) continue;
pIdx = 0;
sqlite3TableLock(pParse, iDb, pParent->tnum, 0, pParent->zName);
x = sqlite3FkLocateIndex(pParse, pParent, pFK, &pIdx, 0);
@ -1656,18 +1656,20 @@ void sqlite3Pragma(
break;
}
}
assert( pParse->nErr>0 || pFK==0 );
if( pFK ) break;
if( pParse->nTab<i ) pParse->nTab = i;
addrTop = sqlite3VdbeAddOp1(v, OP_Rewind, 0);
for(i=1, pFK=pTab->pFKey; pFK; i++, pFK=pFK->pNextFrom){
pParent = sqlite3LocateTable(pParse, 0, pFK->zTo, zDb);
assert( pParent!=0 );
pParent = sqlite3FindTable(db, pFK->zTo, zDb);
pIdx = 0;
aiCols = 0;
x = sqlite3FkLocateIndex(pParse, pParent, pFK, &pIdx, &aiCols);
assert( x==0 );
if( pParent ){
x = sqlite3FkLocateIndex(pParse, pParent, pFK, &pIdx, &aiCols);
assert( x==0 );
}
addrOk = sqlite3VdbeMakeLabel(v);
if( pIdx==0 ){
if( pParent && pIdx==0 ){
int iKey = pFK->aCol[0].iFrom;
assert( iKey>=0 && iKey<pTab->nCol );
if( iKey!=pTab->iPKey ){
@ -1685,13 +1687,15 @@ void sqlite3Pragma(
}else{
for(j=0; j<pFK->nCol; j++){
sqlite3ExprCodeGetColumnOfTable(v, pTab, 0,
aiCols ? aiCols[j] : pFK->aCol[0].iFrom, regRow+j);
aiCols ? aiCols[j] : pFK->aCol[j].iFrom, regRow+j);
sqlite3VdbeAddOp2(v, OP_IsNull, regRow+j, addrOk);
}
sqlite3VdbeAddOp3(v, OP_MakeRecord, regRow, pFK->nCol, regKey);
sqlite3VdbeChangeP4(v, -1,
sqlite3IndexAffinityStr(v,pIdx), P4_TRANSIENT);
sqlite3VdbeAddOp4Int(v, OP_Found, i, addrOk, regKey, 0);
if( pParent ){
sqlite3VdbeAddOp3(v, OP_MakeRecord, regRow, pFK->nCol, regKey);
sqlite3VdbeChangeP4(v, -1,
sqlite3IndexAffinityStr(v,pIdx), P4_TRANSIENT);
sqlite3VdbeAddOp4Int(v, OP_Found, i, addrOk, regKey, 0);
}
}
sqlite3VdbeAddOp2(v, OP_Rowid, 0, regResult+1);
sqlite3VdbeAddOp4(v, OP_String8, 0, regResult+2, 0,

34
test/fkey5.test
View File

@ -17,6 +17,7 @@
set testdir [file dirname $argv0]
source $testdir/tester.tcl
set testprefix fkey5
ifcapable {!foreignkey} {
finish_test
@ -325,5 +326,38 @@ do_test fkey5-8.7 {
} {}
#-------------------------------------------------------------------------
# Tests 9.* verify that missing parent tables are handled correctly.
#
do_execsql_test 9.1.1 {
CREATE TABLE k1(x REFERENCES s1);
PRAGMA foreign_key_check(k1);
} {}
do_execsql_test 9.1.2 {
INSERT INTO k1 VALUES(NULL);
PRAGMA foreign_key_check(k1);
} {}
do_execsql_test 9.1.3 {
INSERT INTO k1 VALUES(1);
PRAGMA foreign_key_check(k1);
} {k1 2 s1 0}
do_execsql_test 9.2.1 {
CREATE TABLE k2(x, y, FOREIGN KEY(x, y) REFERENCES s1(a, b));
PRAGMA foreign_key_check(k2);
} {}
do_execsql_test 9.2 {
INSERT INTO k2 VALUES(NULL, 'five');
PRAGMA foreign_key_check(k2);
} {}
do_execsql_test 9.3 {
INSERT INTO k2 VALUES('one', NULL);
PRAGMA foreign_key_check(k2);
} {}
do_execsql_test 9.4 {
INSERT INTO k2 VALUES('six', 'seven');
PRAGMA foreign_key_check(k2);
} {k2 3 s1 0}
finish_test