mirror of
https://github.com/sqlite/sqlite.git
synced 2025-11-12 13:01:09 +03:00
Merge latest trunk changes into this branch.
FossilOrigin-Name: d6cd3c780c6bc718d37e0f0b884e3e9a423d57be
This commit is contained in:
dan
21
manifest
21
manifest
@@ -1,5 +1,5 @@
|
||||
C Merge\srecent\schanges\sto\strunk\sinto\ssessions\sbranch.
|
||||
D 2013-03-12T11:38:59.574
|
||||
C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
|
||||
D 2013-03-13T06:34:51.061
|
||||
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
|
||||
F Makefile.in 9a804abbd3cae82d196e4d33aba13239e32522a5
|
||||
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
|
||||
@@ -142,7 +142,7 @@ F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
|
||||
F src/ctime.c 72a70dcfda75d3a1f81041ce4573e7afddcd8e4e
|
||||
F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
|
||||
F src/delete.c 39a770e9729b1acd2de347f8f614584841d0083e
|
||||
F src/expr.c a23b4aac2a455b2e76b55bef5dcfbe62b665375c
|
||||
F src/expr.c d488bb60e54c9305d9fca1fa6fcc7bfbd23b13a2
|
||||
F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
|
||||
F src/fkey.c e16942bd5c8a868ac53287886464a5ed0e72b179
|
||||
F src/func.c 48987c025d69399f59a1c2a553cea5da41bf105d
|
||||
@@ -188,10 +188,10 @@ F src/resolve.c 9079da7d59aed2bb14ec8315bc7f720dd85b5b65
|
||||
F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
|
||||
F src/select.c e1c6f6abdf9f359f4e735cb8ae11d2f359bf52a9
|
||||
F src/shell.c 7c41bfcd9e5bf9d96b9215f79b03a5b2b44a3bca
|
||||
F src/sqlite.h.in 7c9b66c397025a9e93e1ec1faa03324b757a2880
|
||||
F src/sqlite.h.in 095fc633527cb18e5196ea5adc31370dc6aa389e
|
||||
F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
|
||||
F src/sqlite3ext.h 7183ab832e23db0f934494f16928da127a571d75
|
||||
F src/sqliteInt.h 8515d149d4b20fb89d4c5bd2ce57f005e4ced42f
|
||||
F src/sqliteInt.h a0a6b155f5e9748dfb5876d892e03a07eb056d7b
|
||||
F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
|
||||
F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
|
||||
F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
|
||||
@@ -264,7 +264,7 @@ F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83
|
||||
F src/wal.c f5c7b5027d0ed0e9bc9afeb4a3a8dfea762ec7d2
|
||||
F src/wal.h 29c197540b19044e6cd73487017e5e47a1d3dac6
|
||||
F src/walker.c 3d75ba73de15e0f8cd0737643badbeb0e002f07b
|
||||
F src/where.c 8b7690cae8700b385d8a53a39387cf8054d8cc47
|
||||
F src/where.c bdbbfa7ef4ea04c8d9b09585b45d4717a72f980a
|
||||
F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
|
||||
F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
|
||||
F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
|
||||
@@ -388,7 +388,7 @@ F test/delete2.test 3a03f2cca1f9a67ec469915cb8babd6485db43fa
|
||||
F test/delete3.test 555e84a00a99230b7d049d477a324a631126a6ab
|
||||
F test/descidx1.test 533dcbda614b0463b0ea029527fd27e5a9ab2d66
|
||||
F test/descidx2.test 9f1a0c83fd57f8667c82310ca21b30a350888b5d
|
||||
F test/descidx3.test fe720e8b37d59f4cef808b0bf4e1b391c2e56b6f
|
||||
F test/descidx3.test 09ddbe3f5295f482d2f8b687cf6db8bad7acd9a2
|
||||
F test/diskfull.test 106391384780753ea6896b7b4f005d10e9866b6e
|
||||
F test/distinct.test 84da1414b2e6887fffd5ed571311b344c5b082ce
|
||||
F test/distinctagg.test 1a6ef9c87a58669438fc771450d7a72577417376
|
||||
@@ -791,6 +791,7 @@ F test/tkt-3998683a16.test 6d1d04d551ed1704eb3396ca87bb9ccc8c5c1eb7
|
||||
F test/tkt-3a77c9714e.test 32bb28afa8c63fc76e972e996193139b63551ed9
|
||||
F test/tkt-3fe897352e.test 10de1a67bd5c66b238a4c96abe55531b37bb4f00
|
||||
F test/tkt-4a03edc4c8.test 2865e4edbc075b954daa82f8da7cc973033ec76e
|
||||
F test/tkt-4dd95f6943.test b7fad82ce61a2650fa4861f903ee002c253730c3
|
||||
F test/tkt-54844eea3f.test a12b851128f46a695e4e378cca67409b9b8f5894
|
||||
F test/tkt-5d863f876e.test c9f36ca503fa154a3655f92a69d2c30da1747bfa
|
||||
F test/tkt-5e10420e8d.test 904d1687b3c06d43e5b3555bbcf6802e7c0ffd84
|
||||
@@ -1050,7 +1051,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
|
||||
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
|
||||
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
|
||||
F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
|
||||
P d69d21903b883067c66dbcdefe6b369a6fe328b0 f9027cb47bdec8dcebf1f038921b28d9e9928c18
|
||||
R f222f57c93ab273cf35121a2470c5e52
|
||||
P 62adb0e0d70e619becb68ffd2625d979bcc777cd 839aa91faf1db7025d90fa3c65e50efb829b053b
|
||||
R f971c8bcbe5e7e01d3f1960cb48792c9
|
||||
U dan
|
||||
Z c5f2b4d72ddf45f3699f5c346c8949b7
|
||||
Z 72580c54b4ef9e18ca4a1b86983b9c48
|
||||
|
||||
@@ -1 +1 @@
|
||||
62adb0e0d70e619becb68ffd2625d979bcc777cd
|
||||
d6cd3c780c6bc718d37e0f0b884e3e9a423d57be
|
||||
12
src/expr.c
12
src/expr.c
@@ -1456,10 +1456,11 @@ int sqlite3CodeOnce(Parse *pParse){
|
||||
**
|
||||
** The returned value of this function indicates the b-tree type, as follows:
|
||||
**
|
||||
** IN_INDEX_ROWID - The cursor was opened on a database table.
|
||||
** IN_INDEX_INDEX - The cursor was opened on a database index.
|
||||
** IN_INDEX_EPH - The cursor was opened on a specially created and
|
||||
** populated epheremal table.
|
||||
** IN_INDEX_ROWID - The cursor was opened on a database table.
|
||||
** IN_INDEX_INDEX_ASC - The cursor was opened on an ascending index.
|
||||
** IN_INDEX_INDEX_DESC - The cursor was opened on a descending index.
|
||||
** IN_INDEX_EPH - The cursor was opened on a specially created and
|
||||
** populated epheremal table.
|
||||
**
|
||||
** An existing b-tree might be used if the RHS expression pX is a simple
|
||||
** subquery such as:
|
||||
@@ -1582,7 +1583,8 @@ int sqlite3FindInIndex(Parse *pParse, Expr *pX, int *prNotFound){
|
||||
sqlite3VdbeAddOp4(v, OP_OpenRead, iTab, pIdx->tnum, iDb,
|
||||
pKey,P4_KEYINFO_HANDOFF);
|
||||
VdbeComment((v, "%s", pIdx->zName));
|
||||
eType = IN_INDEX_INDEX;
|
||||
assert( IN_INDEX_INDEX_DESC == IN_INDEX_INDEX_ASC+1 );
|
||||
eType = IN_INDEX_INDEX_ASC + pIdx->aSortOrder[0];
|
||||
|
||||
sqlite3VdbeJumpHere(v, iAddr);
|
||||
if( prNotFound && !pTab->aCol[iCol].notNull ){
|
||||
|
||||
@@ -283,7 +283,7 @@ typedef sqlite_uint64 sqlite3_uint64;
|
||||
** [sqlite3_blob_close | close] all [BLOB handles], and
|
||||
** [sqlite3_backup_finish | finish] all [sqlite3_backup] objects associated
|
||||
** with the [sqlite3] object prior to attempting to close the object. ^If
|
||||
** sqlite3_close() is called on a [database connection] that still has
|
||||
** sqlite3_close_v2() is called on a [database connection] that still has
|
||||
** outstanding [prepared statements], [BLOB handles], and/or
|
||||
** [sqlite3_backup] objects then it returns SQLITE_OK but the deallocation
|
||||
** of resources is deferred until all [prepared statements], [BLOB handles],
|
||||
|
||||
@@ -3275,7 +3275,8 @@ const char *sqlite3JournalModename(int);
|
||||
|
||||
#define IN_INDEX_ROWID 1
|
||||
#define IN_INDEX_EPH 2
|
||||
#define IN_INDEX_INDEX 3
|
||||
#define IN_INDEX_INDEX_ASC 3
|
||||
#define IN_INDEX_INDEX_DESC 4
|
||||
int sqlite3FindInIndex(Parse *, Expr *, int*);
|
||||
|
||||
#ifdef SQLITE_ENABLE_ATOMIC_WRITE
|
||||
|
||||
22
src/where.c
22
src/where.c
@@ -3775,7 +3775,8 @@ static void codeApplyAffinity(Parse *pParse, int base, int n, char *zAff){
|
||||
static int codeEqualityTerm(
|
||||
Parse *pParse, /* The parsing context */
|
||||
WhereTerm *pTerm, /* The term of the WHERE clause to be coded */
|
||||
WhereLevel *pLevel, /* When level of the FROM clause we are working on */
|
||||
WhereLevel *pLevel, /* The level of the FROM clause we are working on */
|
||||
int iEq, /* Index of the equality term within this level */
|
||||
int iTarget /* Attempt to leave results in this register */
|
||||
){
|
||||
Expr *pX = pTerm->pExpr;
|
||||
@@ -3795,9 +3796,22 @@ static int codeEqualityTerm(
|
||||
struct InLoop *pIn;
|
||||
u8 bRev = (pLevel->plan.wsFlags & WHERE_REVERSE)!=0;
|
||||
|
||||
if( (pLevel->plan.wsFlags & WHERE_INDEXED)!=0
|
||||
&& pLevel->plan.u.pIdx->aSortOrder[iEq]
|
||||
){
|
||||
testcase( iEq==0 );
|
||||
testcase( iEq==pLevel->plan.u.pIdx->nColumn-1 );
|
||||
testcase( iEq>0 && iEq+1<pLevel->plan.u.pIdx->nColumn );
|
||||
testcase( bRev );
|
||||
bRev = !bRev;
|
||||
}
|
||||
assert( pX->op==TK_IN );
|
||||
iReg = iTarget;
|
||||
eType = sqlite3FindInIndex(pParse, pX, 0);
|
||||
if( eType==IN_INDEX_INDEX_DESC ){
|
||||
testcase( bRev );
|
||||
bRev = !bRev;
|
||||
}
|
||||
iTab = pX->iTable;
|
||||
sqlite3VdbeAddOp2(v, bRev ? OP_Last : OP_Rewind, iTab, 0);
|
||||
assert( pLevel->plan.wsFlags & WHERE_IN_ABLE );
|
||||
@@ -3912,7 +3926,7 @@ static int codeAllEqualityTerms(
|
||||
** Ex: CREATE INDEX i1 ON t1(a,b,a); SELECT * FROM t1 WHERE a=0 AND b=0; */
|
||||
testcase( (pTerm->wtFlags & TERM_CODED)!=0 );
|
||||
testcase( pTerm->wtFlags & TERM_VIRTUAL ); /* EV: R-30575-11662 */
|
||||
r1 = codeEqualityTerm(pParse, pTerm, pLevel, regBase+j);
|
||||
r1 = codeEqualityTerm(pParse, pTerm, pLevel, j, regBase+j);
|
||||
if( r1!=regBase+j ){
|
||||
if( nReg==1 ){
|
||||
sqlite3ReleaseTempReg(pParse, regBase);
|
||||
@@ -4189,7 +4203,7 @@ static Bitmask codeOneLoopStart(
|
||||
int iTarget = iReg+j+1;
|
||||
pTerm = &pWC->a[aConstraint[k].iTermOffset];
|
||||
if( pTerm->eOperator & WO_IN ){
|
||||
codeEqualityTerm(pParse, pTerm, pLevel, iTarget);
|
||||
codeEqualityTerm(pParse, pTerm, pLevel, k, iTarget);
|
||||
addrNotFound = pLevel->addrNxt;
|
||||
}else{
|
||||
sqlite3ExprCode(pParse, pTerm->pExpr->pRight, iTarget);
|
||||
@@ -4230,7 +4244,7 @@ static Bitmask codeOneLoopStart(
|
||||
assert( pTerm->pExpr!=0 );
|
||||
assert( omitTable==0 );
|
||||
testcase( pTerm->wtFlags & TERM_VIRTUAL ); /* EV: R-30575-11662 */
|
||||
iRowidReg = codeEqualityTerm(pParse, pTerm, pLevel, iReleaseReg);
|
||||
iRowidReg = codeEqualityTerm(pParse, pTerm, pLevel, 0, iReleaseReg);
|
||||
addrNxt = pLevel->addrNxt;
|
||||
sqlite3VdbeAddOp2(v, OP_MustBeInt, iRowidReg, addrNxt);
|
||||
sqlite3VdbeAddOp3(v, OP_NotExists, iCur, addrNxt, iRowidReg);
|
||||
|
||||
@@ -132,11 +132,11 @@ ifcapable subquery {
|
||||
# the IN(...) operator is not available. Hence these tests cannot be
|
||||
# run.
|
||||
do_test descidx3-4.1 {
|
||||
execsql {
|
||||
lsort [execsql {
|
||||
UPDATE t1 SET a=2 WHERE i<6;
|
||||
SELECT i FROM t1 WHERE a IN (1,2) AND b>0 AND b<'zzz';
|
||||
}
|
||||
} {8 6 2 4 3}
|
||||
}]
|
||||
} {2 3 4 6 8}
|
||||
do_test descidx3-4.2 {
|
||||
execsql {
|
||||
UPDATE t1 SET a=1;
|
||||
|
||||
101
test/tkt-4dd95f6943.test
Normal file
101
test/tkt-4dd95f6943.test
Normal file
@@ -0,0 +1,101 @@
|
||||
# 2013 March 13
|
||||
#
|
||||
# The author disclaims copyright to this source code. In place of
|
||||
# a legal notice, here is a blessing:
|
||||
#
|
||||
# May you do good and not evil.
|
||||
# May you find forgiveness for yourself and forgive others.
|
||||
# May you share freely, never taking more than you give.
|
||||
#
|
||||
#***********************************************************************
|
||||
# This file implements regression tests for SQLite library.
|
||||
#
|
||||
|
||||
set testdir [file dirname $argv0]
|
||||
source $testdir/tester.tcl
|
||||
set ::testprefix tkt-4dd95f6943
|
||||
|
||||
do_execsql_test 1.0 {
|
||||
CREATE TABLE t1(x);
|
||||
INSERT INTO t1 VALUES (3), (4), (2), (1), (5), (6);
|
||||
}
|
||||
|
||||
foreach {tn1 idx} {
|
||||
1 { CREATE INDEX i1 ON t1(x ASC) }
|
||||
2 { CREATE INDEX i1 ON t1(x DESC) }
|
||||
} {
|
||||
do_execsql_test 1.$tn1.1 { DROP INDEX IF EXISTS i1; }
|
||||
do_execsql_test 1.$tn1.2 $idx
|
||||
|
||||
do_execsql_test 1.$tn1.3 {
|
||||
SELECT x FROM t1 WHERE x IN(2, 4, 5) ORDER BY x ASC;
|
||||
} {2 4 5}
|
||||
|
||||
do_execsql_test 1.$tn1.4 {
|
||||
SELECT x FROM t1 WHERE x IN(2, 4, 5) ORDER BY x DESC;
|
||||
} {5 4 2}
|
||||
}
|
||||
|
||||
|
||||
do_execsql_test 2.0 {
|
||||
CREATE TABLE t2(x, y);
|
||||
INSERT INTO t2 VALUES (5, 3), (5, 4), (5, 2), (5, 1), (5, 5), (5, 6);
|
||||
INSERT INTO t2 VALUES (1, 3), (1, 4), (1, 2), (1, 1), (1, 5), (1, 6);
|
||||
INSERT INTO t2 VALUES (3, 3), (3, 4), (3, 2), (3, 1), (3, 5), (3, 6);
|
||||
INSERT INTO t2 VALUES (2, 3), (2, 4), (2, 2), (2, 1), (2, 5), (2, 6);
|
||||
INSERT INTO t2 VALUES (4, 3), (4, 4), (4, 2), (4, 1), (4, 5), (4, 6);
|
||||
INSERT INTO t2 VALUES (6, 3), (6, 4), (6, 2), (6, 1), (6, 5), (6, 6);
|
||||
|
||||
CREATE TABLE t3(a, b);
|
||||
INSERT INTO t3 VALUES (2, 2), (4, 4), (5, 5);
|
||||
CREATE INDEX t3i1 ON t3(a ASC);
|
||||
CREATE INDEX t3i2 ON t3(b DESC);
|
||||
}
|
||||
|
||||
foreach {tn1 idx} {
|
||||
1 { CREATE INDEX i1 ON t2(x ASC, y ASC) }
|
||||
2 { CREATE INDEX i1 ON t2(x ASC, y DESC) }
|
||||
3 { CREATE INDEX i1 ON t2(x DESC, y ASC) }
|
||||
4 { CREATE INDEX i1 ON t2(x DESC, y DESC) }
|
||||
|
||||
5 { CREATE INDEX i1 ON t2(y ASC, x ASC) }
|
||||
6 { CREATE INDEX i1 ON t2(y ASC, x DESC) }
|
||||
7 { CREATE INDEX i1 ON t2(y DESC, x ASC) }
|
||||
8 { CREATE INDEX i1 ON t2(y DESC, x DESC) }
|
||||
} {
|
||||
do_execsql_test 2.$tn1.1 { DROP INDEX IF EXISTS i1; }
|
||||
do_execsql_test 2.$tn1.2 $idx
|
||||
|
||||
foreach {tn2 inexpr} {
|
||||
1 "(2, 4, 5)"
|
||||
2 "(SELECT a FROM t3)"
|
||||
3 "(SELECT b FROM t3)"
|
||||
} {
|
||||
do_execsql_test 2.$tn1.3 "
|
||||
SELECT x, y FROM t2 WHERE x = 1 AND y IN $inexpr ORDER BY x ASC, y ASC;
|
||||
" {1 2 1 4 1 5}
|
||||
do_execsql_test 2.$tn1.4 "
|
||||
SELECT x, y FROM t2 WHERE x = 2 AND y IN $inexpr ORDER BY x ASC, y DESC;
|
||||
" {2 5 2 4 2 2}
|
||||
do_execsql_test 2.$tn1.5 "
|
||||
SELECT x, y FROM t2 WHERE x = 3 AND y IN $inexpr ORDER BY x DESC, y ASC;
|
||||
" {3 2 3 4 3 5}
|
||||
do_execsql_test 2.$tn1.6 "
|
||||
SELECT x, y FROM t2 WHERE x = 4 AND y IN $inexpr ORDER BY x DESC, y DESC;
|
||||
" {4 5 4 4 4 2}
|
||||
}
|
||||
}
|
||||
|
||||
do_execsql_test 3.0 {
|
||||
CREATE TABLE t7(x);
|
||||
INSERT INTO t7 VALUES (1), (2), (3);
|
||||
CREATE INDEX i7 ON t7(x);
|
||||
|
||||
CREATE TABLE t8(y);
|
||||
INSERT INTO t8 VALUES (1), (2), (3);
|
||||
|
||||
CREATE UNIQUE INDEX i8 ON t8(y DESC);
|
||||
SELECT x FROM t7 WHERE x IN (SELECT y FROM t8) ORDER BY x ASC;
|
||||
} {1 2 3}
|
||||
|
||||
finish_test
|
||||
Reference in New Issue
Block a user