database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-14 00:22:38 +03:00
Code Activity

Remove an unreachable branch operation from the foreign_key_check pragma.

Browse Source 
FossilOrigin-Name: b5a8f3160b5dc1397312add3c5410e7e0a12b75e
This commit is contained in:
drh
2012-12-20 00:32:49 +00:00
parent 7d22a4d710
commit 83e0dba311
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Added\stest\scases\sfor\sPRAGMA\sforeign_key_check.\s\sFixed\sa\sbug\sthat\sappears\nwhen\sthe\scolumn\sorder\sof\sthe\schild\sand\sparent\sdiffer. C Remove\san\sunreachable\sbranch\soperation\sfrom\sthe\sforeign_key_check\spragma.
D 2012-12-17T22:32:14.381 D 2012-12-20T00:32:49.517
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 690d441a758cbffd13e814dc2724a721a6ebd400 F Makefile.in 690d441a758cbffd13e814dc2724a721a6ebd400
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -168,7 +168,7 @@ F src/parse.y c2b4a6454ad77299b1443e2c483a560a9f16e724
F src/pcache.c f8043b433a57aba85384a531e3937a804432a346 F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c
F src/pcache1.c 9fd22671c270b35131ef480bbc00392b8b5f8ab9 F src/pcache1.c 9fd22671c270b35131ef480bbc00392b8b5f8ab9
F src/pragma.c 312d9ea0d9b98583514f6f8e92cb7e8f526ff4c6 F src/pragma.c 1ff115f620d9496fe5018306b644ab9ef7e26a3c
F src/prepare.c 931ad0d852a0df48f79adcba6ce79ca5f475625c F src/prepare.c 931ad0d852a0df48f79adcba6ce79ca5f475625c
F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f
F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
@@ -1026,7 +1026,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
P 97f7f7377259ecf562019f62ebed0897cfae236e P 25411f83f99803e39feee368703fd20b4ade8eeb
R e825c339f2d84a956eae42ef385eea53 R c79c49ee3d52fd45a5706b357c7b932d
U drh U drh
Z 0751ac95be4abd3e28a98e71458d0c00 Z 478f8348ae468b598dcecb8fdb7894c8

2
manifest.uuid
View File

@@ -1 +1 @@
25411f83f99803e39feee368703fd20b4ade8eeb b5a8f3160b5dc1397312add3c5410e7e0a12b75e

3
src/pragma.c
View File

@@ -1190,7 +1190,8 @@ void sqlite3Pragma(
addrOk = sqlite3VdbeMakeLabel(v); addrOk = sqlite3VdbeMakeLabel(v);
if( pIdx==0 ){ if( pIdx==0 ){
int iKey = pFK->aCol[0].iFrom; int iKey = pFK->aCol[0].iFrom;
if( iKey>=0 && iKey!=pTab->iPKey ){ assert( iKey>=0 && iKey<pTab->nCol );
if( iKey!=pTab->iPKey ){
sqlite3VdbeAddOp3(v, OP_Column, 0, iKey, regRow); sqlite3VdbeAddOp3(v, OP_Column, 0, iKey, regRow);
sqlite3ColumnDefault(v, pTab, iKey, regRow); sqlite3ColumnDefault(v, pTab, iKey, regRow);
sqlite3VdbeAddOp2(v, OP_IsNull, regRow, addrOk); sqlite3VdbeAddOp2(v, OP_IsNull, regRow, addrOk);