database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-19 21:43:15 +03:00
Code Activity

Fix to the logic that disables constraints on virtual tables.

Browse Source 
FossilOrigin-Name: 62d382406b28c1347e13114f42215939ddfd7a9d
This commit is contained in:
drh
2013-06-03 16:03:16 +00:00
parent 3a5ba8b1b7
commit 5298630631
3 changed files with 8 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 Fix\san\sissue\sthat\swas\scausing\sORDER\sBY\sDESC\sto\scome\sout\sin\sascending\sorder. C Fix\sto\sthe\slogic\sthat\sdisables\sconstraints\son\svirtual\stables.
D 2013-06-03T15:34:48.695 D 2013-06-03T16:03:16.168
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -289,7 +289,7 @@ F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83
F src/wal.c 436bfceb141b9423c45119e68e444358ee0ed35d F src/wal.c 436bfceb141b9423c45119e68e444358ee0ed35d
F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73 F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73
F src/where.c 078c3aeafacf8544bdc733bf6b60d087d9e6346c F src/where.c b8a41bcd6a61e560d9c45e4a066d3858a06657d8
F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6 F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@ -1093,7 +1093,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 7d91f688815597ff65ec04b7daa21cb9e5d6bf98 P 029840124022387a8f6d2e1a685a003688d0ef3a
R 47cac5b8ea3311240b582844f809143b R 74a79b344cf1d282ed20a762beed972e
U drh U drh
Z d1b03d3fcac2015c05c39b44e5780b67 Z 4d150a08a0845f1055b728ec84c21984

2
manifest.uuid
View File

@@ -1 +1 @@
029840124022387a8f6d2e1a685a003688d0ef3a 62d382406b28c1347e13114f42215939ddfd7a9d

2
src/where.c
View File

@@ -4326,7 +4326,7 @@ static int whereLoopAddVirtual(
pNew->prereq |= pTerm->prereqRight; pNew->prereq |= pTerm->prereqRight;
pNew->aTerm[iTerm] = pTerm; pNew->aTerm[iTerm] = pTerm;
if( iTerm>mxTerm ) mxTerm = iTerm; if( iTerm>mxTerm ) mxTerm = iTerm;
if( iTerm<16 && pUsage[i].omit ) pNew->u.vtab.omitMask |= 1<<i; if( iTerm<16 && pUsage[i].omit ) pNew->u.vtab.omitMask |= 1<<iTerm;
if( (pTerm->eOperator & WO_IN)!=0 ){ if( (pTerm->eOperator & WO_IN)!=0 ){
if( pUsage[i].omit==0 ){ if( pUsage[i].omit==0 ){
/* Do not attempt to use an IN constraint if the virtual table /* Do not attempt to use an IN constraint if the virtual table