From: dan Date: Tue, 7 Dec 2010 07:57:49 +0000 (+0000) Subject: Add tests to tkt-80ba201079.test. X-Git-Tag: version-3.7.4~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c60982408cf067c960b15afab469ca6d90c25287;p=thirdparty%2Fsqlite.git Add tests to tkt-80ba201079.test. FossilOrigin-Name: c370338c772bcd0797a23f83c3f6dc019640c6dd --- diff --git a/manifest b/manifest index e830dbc07b..8b63d0fbd9 100644 --- a/manifest +++ b/manifest @@ -1,8 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -C Fix\sthe\sbuild\sso\sthat\sit\sonce\sagain\sworks\swith\sSQLITE_OMIT_SHARED_CACHE\nand\sSQLITE_OMIT_AUTOVACUUM. -D 2010-12-06T21:09:59 +C Add\stests\sto\stkt-80ba201079.test. +D 2010-12-07T07:57:50 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 4547616ad2286053af6ccccefa242dc925e49bf0 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -689,7 +686,7 @@ F test/tkt-4a03edc4c8.test 2865e4edbc075b954daa82f8da7cc973033ec76e F test/tkt-5e10420e8d.test 904d1687b3c06d43e5b3555bbcf6802e7c0ffd84 F test/tkt-5ee23731f.test 3581260f2a71e51db94e1506ba6b0f7311d002a9 F test/tkt-78e04e52ea.test ab52f0c1e2de6e46c910f4cc16b086bba05952b7 -F test/tkt-80ba201079.test 5618c9ae2dee98215b2e4b9eee0d08228c05f1c7 +F test/tkt-80ba201079.test a09684db1a0bd55b8838f606adccee456a51ddbf F test/tkt-80e031a00f.test 9a154173461a4dbe2de49cda73963e04842d52f7 F test/tkt-8454a207b9.test c583a9f814a82a2b5ba95207f55001c9f0cd816c F test/tkt-94c04eaadb.test be5ea61cb04dfdc047d19b5c5a9e75fa3da67a7f @@ -897,14 +894,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P ad8bc68197f2b47435149c3dbc035f4e7210fc76 -R 4b664154e6f347208b2861ee9c998570 -U drh -Z 4a3c7cadea77cbd775c498c77a581cba ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQFM/VEqoxKgR168RlERAgXIAJwM/TycNiJyhMNbNqXiGSf83rEVJwCfazZZ -iNcjqzcUUyMybJuVyQGnSDY= -=QnBb ------END PGP SIGNATURE----- +P fabcb6b95e1d4059d1e6c6183f65846f6cbd5749 +R a62680e5755d8abc6c8d1de652b8a83d +U dan +Z 863ac080b5a3ea11bc9de517f38f2c30 diff --git a/manifest.uuid b/manifest.uuid index 784ffe4b8e..35d5878672 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -fabcb6b95e1d4059d1e6c6183f65846f6cbd5749 \ No newline at end of file +c370338c772bcd0797a23f83c3f6dc019640c6dd \ No newline at end of file diff --git a/test/tkt-80ba201079.test b/test/tkt-80ba201079.test index 7abeeb6495..95e99b5a5b 100644 --- a/test/tkt-80ba201079.test +++ b/test/tkt-80ba201079.test @@ -17,6 +17,7 @@ set testdir [file dirname $argv0] source $testdir/tester.tcl +set ::testprefix tkt-80ba2 do_test tkt-80ba2-100 { db eval { @@ -137,4 +138,54 @@ do_test tkt-80ba2-202 { } } {300 object_change 2048} +#------------------------------------------------------------------------- +# + +drop_all_tables +do_execsql_test 301 { + CREATE TABLE t1(a, b, c); + CREATE INDEX i1 ON t1(a); + CREATE INDEX i2 ON t1(b); + CREATE TABLE t2(d, e); + + INSERT INTO t1 VALUES('A', 'B', 'C'); + INSERT INTO t2 VALUES('D', 'E'); +} + +do_execsql_test 302 { + SELECT * FROM t1, t2 WHERE + (a='A' AND d='E') OR + (b='B' AND c IN ('C', 'D', 'E')) +} {A B C D E} + +do_execsql_test 303 { + SELECT * FROM t1, t2 WHERE + (a='A' AND d='E') OR + (b='B' AND c IN (SELECT c FROM t1)) +} {A B C D E} + +do_execsql_test 304 { + SELECT * FROM t1, t2 WHERE + (a='A' AND d='E') OR + (b='B' AND c IN (SELECT 'B' UNION SELECT 'C' UNION SELECT 'D')) +} {A B C D E} + +do_execsql_test 305 { + SELECT * FROM t1, t2 WHERE + (b='B' AND c IN ('C', 'D', 'E')) OR + (a='A' AND d='E') +} {A B C D E} + +do_execsql_test 306 { + SELECT * FROM t1, t2 WHERE + (b='B' AND c IN (SELECT c FROM t1)) OR + (a='A' AND d='E') +} {A B C D E} + +do_execsql_test 307 { + SELECT * FROM t1, t2 WHERE + (b='B' AND c IN (SELECT 'B' UNION SELECT 'C' UNION SELECT 'D')) OR + (a='A' AND d='E') +} {A B C D E} + finish_test