Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Fix a problem with row-value IN(...) operators and virtual tables. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
aa57d7abac0bb92d4d5fd4e093a11cf8 |
User & Date: | dan 2019-10-14 15:15:50 |
Context
2019-10-14
| ||
15:24 | New test cases in test/fuzzdata8.db. (check-in: 344d9cb0 user: drh tags: trunk) | |
15:15 | Fix a problem with row-value IN(...) operators and virtual tables. (check-in: aa57d7ab user: dan tags: trunk) | |
2019-10-12
| ||
23:38 | When Select-Trace is enabled (in debugging builds only) do not show the result of Window function tree rewrites if there are no window functions. (check-in: d1acf72a user: drh tags: trunk) | |
Changes
Changes to ext/fts5/test/fts5misc.test.
︙ | ︙ | |||
188 189 190 191 192 193 194 195 196 197 | INSERT INTO vt0(vt0, rank) VALUES('crisismerge', 2000); INSERT INTO vt0(vt0, rank) VALUES('automerge', 0); } {} do_execsql_test 6.1 { INSERT INTO vt0(vt0) VALUES('rebuild'); } finish_test | > > > > > > > > > > > > > > > > > > > > > > > > > > | 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 | INSERT INTO vt0(vt0, rank) VALUES('crisismerge', 2000); INSERT INTO vt0(vt0, rank) VALUES('automerge', 0); } {} do_execsql_test 6.1 { INSERT INTO vt0(vt0) VALUES('rebuild'); } #------------------------------------------------------------------------- # reset_db do_execsql_test 7.0 { CREATE VIRTUAL TABLE t1 USING fts5(x); INSERT INTO t1(rowid, x) VALUES(1, 'hello world'); INSERT INTO t1(rowid, x) VALUES(2, 'well said'); INSERT INTO t1(rowid, x) VALUES(3, 'hello said'); INSERT INTO t1(rowid, x) VALUES(4, 'well world'); CREATE TABLE t2 (a, b); INSERT INTO t2 VALUES(1, 'hello'); INSERT INTO t2 VALUES(2, 'world'); INSERT INTO t2 VALUES(3, 'said'); INSERT INTO t2 VALUES(4, 'hello'); } do_execsql_test 7.1 { SELECT rowid FROM t1 WHERE (rowid, x) IN (SELECT a, b FROM t2); } do_execsql_test 7.2 { SELECT rowid FROM t1 WHERE rowid=2 AND t1 = 'hello'; } finish_test |
Changes to src/wherecode.c.
︙ | ︙ | |||
1303 1304 1305 1306 1307 1308 1309 | pLevel->op = pWInfo->eOnePass ? OP_Noop : OP_VNext; pLevel->p2 = sqlite3VdbeCurrentAddr(v); iIn = pLevel->u.in.nIn; for(j=nConstraint-1; j>=0; j--){ pTerm = pLoop->aLTerm[j]; if( j<16 && (pLoop->u.vtab.omitMask>>j)&1 ){ disableTerm(pLevel, pTerm); | | > > | 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 | pLevel->op = pWInfo->eOnePass ? OP_Noop : OP_VNext; pLevel->p2 = sqlite3VdbeCurrentAddr(v); iIn = pLevel->u.in.nIn; for(j=nConstraint-1; j>=0; j--){ pTerm = pLoop->aLTerm[j]; if( j<16 && (pLoop->u.vtab.omitMask>>j)&1 ){ disableTerm(pLevel, pTerm); }else if( (pTerm->eOperator & WO_IN)!=0 && sqlite3ExprVectorSize(pTerm->pExpr->pLeft)==1 ){ Expr *pCompare; /* The comparison operator */ Expr *pRight; /* RHS of the comparison */ VdbeOp *pOp; /* Opcode to access the value of the IN constraint */ /* Reload the constraint value into reg[iReg+j+2]. The same value ** was loaded into the same register prior to the OP_VFilter, but ** the xFilter implementation might have changed the datatype or |
︙ | ︙ |
Added test/rowvaluevtab.test.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 | # 2018 October 14 # # 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. # #*********************************************************************** # set testdir [file dirname $argv0] source $testdir/tester.tcl set ::testprefix rowvaluevtab register_echo_module db do_execsql_test 1.0 { CREATE TABLE t1(a, b, c); CREATE INDEX t1b ON t1(b); INSERT INTO t1 VALUES('one', 1, 1); INSERT INTO t1 VALUES('two', 1, 2); INSERT INTO t1 VALUES('three', 1, 3); INSERT INTO t1 VALUES('four', 2, 1); INSERT INTO t1 VALUES('five', 2, 2); INSERT INTO t1 VALUES('six', 2, 3); INSERT INTO t1 VALUES('seven', 3, 1); INSERT INTO t1 VALUES('eight', 3, 2); INSERT INTO t1 VALUES('nine', 3, 3); WITH s(i) AS ( SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<10000 ) INSERT INTO t1 SELECT NULL, NULL, NULL FROM s; CREATE VIRTUAL TABLE e1 USING echo(t1); } proc do_vfilter4_test {tn sql expected} { set res [list] db eval "explain $sql" { if {$opcode=="VFilter"} { lappend res $p4 } } uplevel [list do_test $tn [list set {} $res] [list {*}$expected]] } do_execsql_test 1.1 { SELECT a FROM e1 WHERE (b, c) = (2, 2) } {five} do_vfilter4_test 1.1f { SELECT a FROM e1 WHERE (b, c) = (?, ?) } {{SELECT rowid, a, b, c FROM 't1' WHERE b = ?}} do_execsql_test 1.2 { SELECT a FROM e1 WHERE (b, c) > (2, 2) } {six seven eight nine} do_vfilter4_test 1.2f { SELECT a FROM e1 WHERE (b, c) > (2, 2) } { {SELECT rowid, a, b, c FROM 't1' WHERE b >= ?} } do_execsql_test 1.3 { SELECT a FROM e1 WHERE (b, c) >= (2, 2) } {five six seven eight nine} do_vfilter4_test 1.3f { SELECT a FROM e1 WHERE (b, c) >= (2, 2) } { {SELECT rowid, a, b, c FROM 't1' WHERE b >= ?} } do_execsql_test 1.3 { SELECT a FROM e1 WHERE (b, c) BETWEEN (1, 2) AND (2, 3) } {two three four five six} do_vfilter4_test 1.3f { SELECT a FROM e1 WHERE (b, c) BETWEEN (1, 2) AND (2, 3) } { {SELECT rowid, a, b, c FROM 't1' WHERE b >= ? AND b <= ?} } do_execsql_test 1.4 { SELECT a FROM e1 WHERE (b, c) IN ( VALUES(2, 2) ) } {five} do_vfilter4_test 1.4f { SELECT a FROM e1 WHERE (b, c) IN ( VALUES(2, 2) ) } {{SELECT rowid, a, b, c FROM 't1' WHERE b = ?}} finish_test |