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

Fix some problems with multi-column IN(SELECT...) processing.

Browse Source 
FossilOrigin-Name: 719a3b2035a335ca8b9704646b1d641011e3ea0e
This commit is contained in:
dan
2016-07-27 19:33:04 +00:00
parent d9ed09d47b d93ba6271b
commit d49fd4e89a
8 changed files with 195 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/rowvalue3.test
+123 -6
View File
@@ -17,6 +17,14 @@ set testdir [file dirname $argv0]
source $testdir/tester.tcl
set ::testprefix rowvalue3
# Drop all auxiliary indexes from the main database opened by handle [db].
#
proc drop_all_indexes {} {
set L [db eval {
SELECT name FROM sqlite_master WHERE type='index' AND sql LIKE 'create%'
}]
foreach idx $L { db eval "DROP INDEX $idx" }
}
do_execsql_test 1.0 {
CREATE TABLE t1(a, b, c);
@@ -60,8 +68,9 @@ do_execsql_test 2.0 {
foreach {tn idx} {
1 { }
2 { CREATE INDEX z1idx ON z1(x, y) }
3 { CREATE UNIQUE INDEX z1idx ON z1(x, y) }
2 { CREATE INDEX z1idx ON z1(x, y) }
3 { CREATE UNIQUE INDEX z1idx ON z1(x, y) }
4 { CREATE INDEX z1idx ON kk(a, b) }
} {
execsql "DROP INDEX IF EXISTS z1idx"
execsql $idx
@@ -87,11 +96,119 @@ foreach {tn idx} {
} {d e f}
}
explain_i {
SELECT * FROM z1 WHERE (x, y) IN (SELECT a, b FROM kk)
}
#-------------------------------------------------------------------------
#
do_execsql_test 3.0 {
CREATE TABLE c1(a, b, c, d);
INSERT INTO c1(rowid, a, b) VALUES(1, NULL, 1);
INSERT INTO c1(rowid, a, b) VALUES(2, 2, NULL);
INSERT INTO c1(rowid, a, b) VALUES(3, 2, 2);
INSERT INTO c1(rowid, a, b) VALUES(4, 3, 3);
INSERT INTO c1(rowid, a, b, c, d) VALUES(101, 'a', 'b', 1, 1);
INSERT INTO c1(rowid, a, b, c, d) VALUES(102, 'a', 'b', 1, 2);
INSERT INTO c1(rowid, a, b, c, d) VALUES(103, 'a', 'b', 1, 3);
INSERT INTO c1(rowid, a, b, c, d) VALUES(104, 'a', 'b', 2, 1);
INSERT INTO c1(rowid, a, b, c, d) VALUES(105, 'a', 'b', 2, 2);
INSERT INTO c1(rowid, a, b, c, d) VALUES(106, 'a', 'b', 2, 3);
INSERT INTO c1(rowid, a, b, c, d) VALUES(107, 'a', 'b', 3, 1);
INSERT INTO c1(rowid, a, b, c, d) VALUES(108, 'a', 'b', 3, 2);
INSERT INTO c1(rowid, a, b, c, d) VALUES(109, 'a', 'b', 3, 3);
}
foreach {tn idx} {
1 { }
2 { CREATE INDEX c1ab ON c1(a, b); }
3 { CREATE INDEX c1ba ON c1(b, a); }
4 { CREATE INDEX c1cd ON c1(c, d); }
5 { CREATE INDEX c1dc ON c1(d, c); }
} {
drop_all_indexes
foreach {tn2 sql res} {
1 "SELECT (1, 2) IN (SELECT a, b FROM c1)" {0}
2 "SELECT (1, 1) IN (SELECT a, b FROM c1)" {{}}
3 "SELECT (2, 1) IN (SELECT a, b FROM c1)" {{}}
4 "SELECT (2, 2) IN (SELECT a, b FROM c1)" {1}
5 "SELECT c, d FROM c1 WHERE (c, d) IN (SELECT d, c FROM c1)"
{ 1 1 1 2 1 3 2 1 2 2 2 3 3 1 3 2 3 3 }
6 "SELECT c, d FROM c1 WHERE (c,d) IN (SELECT d, c FROM c1) ORDER BY c DESC"
{ 3 1 3 2 3 3 2 1 2 2 2 3 1 1 1 2 1 3 }
7 {
SELECT c, d FROM c1 WHERE (c,d) IN (SELECT d, c FROM c1)
ORDER BY c DESC, d ASC
} { 3 1 3 2 3 3 2 1 2 2 2 3 1 1 1 2 1 3 }
8 {
SELECT c, d FROM c1 WHERE (c,d) IN (SELECT d, c FROM c1)
ORDER BY c ASC, d DESC
} { 1 3 1 2 1 1 2 3 2 2 2 1 3 3 3 2 3 1 }
9 {
SELECT c, d FROM c1 WHERE (c,d) IN (SELECT d, c FROM c1)
ORDER BY c ASC, d ASC
} { 1 1 1 2 1 3 2 1 2 2 2 3 3 1 3 2 3 3 }
10 {
SELECT c, d FROM c1 WHERE (c,d) IN (SELECT d, c FROM c1)
ORDER BY c DESC, d DESC
} { 3 3 3 2 3 1 2 3 2 2 2 1 1 3 1 2 1 1 }
} {
do_execsql_test 3.$tn.$tn2 $sql $res
}
}
#-------------------------------------------------------------------------
do_execsql_test 4.0 {
CREATE TABLE hh(a, b, c);
INSERT INTO hh VALUES('a', 'a', 1);
INSERT INTO hh VALUES('a', 'b', 2);
INSERT INTO hh VALUES('b', 'a', 3);
INSERT INTO hh VALUES('b', 'b', 4);
CREATE TABLE k1(x, y);
INSERT INTO k1 VALUES('a', 'a');
INSERT INTO k1 VALUES('b', 'b');
INSERT INTO k1 VALUES('a', 'b');
INSERT INTO k1 VALUES('b', 'a');
}
foreach {tn idx} {
1 { }
2 { CREATE INDEX h1 ON hh(a, b); }
3 { CREATE UNIQUE INDEX k1idx ON k1(x, y) }
4 { CREATE UNIQUE INDEX k1idx ON k1(x, y DESC) }
5 {
CREATE INDEX h1 ON hh(a, b);
CREATE UNIQUE INDEX k1idx ON k1(x, y);
}
6 {
CREATE INDEX h1 ON hh(a, b);
CREATE UNIQUE INDEX k1idx ON k1(x, y DESC);
}
} {
drop_all_indexes
execsql $idx
foreach {tn2 orderby res} {
1 "a ASC, b ASC" {1 2 3 4}
2 "a ASC, b DESC" {2 1 4 3}
3 "a DESC, b ASC" {3 4 1 2}
4 "a DESC, b DESC" {4 3 2 1}
} {
do_execsql_test 4.$tn.$tn2 "
SELECT c FROM hh WHERE (a, b) in (SELECT x, y FROM k1) ORDER BY $orderby
" $res
}
}
finish_test