:-) (CVS 83)

FossilOrigin-Name: 2e5786d10148872db47d99e39c3f54597ad777c8
This commit is contained in:
drh 2000-06-08 16:54:40 +00:00
parent c837e70996
commit e840972fcf
4 changed files with 51 additions and 12 deletions

View File

@ -1,5 +1,5 @@
C :-)\s(CVS\s82) C :-)\s(CVS\s83)
D 2000-06-08T16:26:24 D 2000-06-08T16:54:40
F COPYRIGHT 74a8a6531a42e124df07ab5599aad63870fa0bd4 F COPYRIGHT 74a8a6531a42e124df07ab5599aad63870fa0bd4
F Makefile.in 17ba1ccf8d2d40c627796bba8f72952365d6d644 F Makefile.in 17ba1ccf8d2d40c627796bba8f72952365d6d644
F README 51f6a4e7408b34afa5bc1c0485f61b6a4efb6958 F README 51f6a4e7408b34afa5bc1c0485f61b6a4efb6958
@ -31,12 +31,12 @@ F test/dbbe.test 0a8e4293cf816e590dcbb01be4cd4e8f7f95bdc8
F test/delete.test 30edd2c7484274fb2e7dbc4a1ac769bb330b322e F test/delete.test 30edd2c7484274fb2e7dbc4a1ac769bb330b322e
F test/expr.test 2209a2b06ea10ebb844b2c4ae08fe8345e5b87b2 F test/expr.test 2209a2b06ea10ebb844b2c4ae08fe8345e5b87b2
F test/in.test 962a605b6a3a619214f84d1950dfc44fcf0d8b8f F test/in.test 962a605b6a3a619214f84d1950dfc44fcf0d8b8f
F test/index.test 9f99dca2d904b8de330863a978587f136e2df65a F test/index.test 79550e86e5c6954f8b7a8a8c5221224dfd8c3f11
F test/insert.test 66f4c3bd600fec8eb1e733b928cbe6fa885eff0c F test/insert.test 66f4c3bd600fec8eb1e733b928cbe6fa885eff0c
F test/insert2.test 732405e30331635af8d159fccabe835eea5cd0c6 F test/insert2.test 732405e30331635af8d159fccabe835eea5cd0c6
F test/main.test a6c92ebc66b990b601a2f67bbd02404310a820e4 F test/main.test a6c92ebc66b990b601a2f67bbd02404310a820e4
F test/select1.test 64703852af34c85bb31b0a74bd73b340e8267f42 F test/select1.test 64703852af34c85bb31b0a74bd73b340e8267f42
F test/select2.test 3cd3c0f9d67e98b1b54af5853679b4a111224410 F test/select2.test 5e2783a48360b83956366ea24b2c5f0293015a84
F test/select3.test a9234b8424b6c6d71de534f43b91ade9be68e9cc F test/select3.test a9234b8424b6c6d71de534f43b91ade9be68e9cc
F test/select4.test cb5374d7c87680e294ac749307459a5cc547609d F test/select4.test cb5374d7c87680e294ac749307459a5cc547609d
F test/select5.test 80ea257ce35e736c559bc6cd342361974e60a979 F test/select5.test 80ea257ce35e736c559bc6cd342361974e60a979
@ -57,7 +57,7 @@ F www/c_interface.tcl 9ac800854272db5fe439e07b7435b243a5422293
F www/changes.tcl 04e66b4257589ff78a7e1de93e9dda4725fb03d6 F www/changes.tcl 04e66b4257589ff78a7e1de93e9dda4725fb03d6
F www/index.tcl 52e29a4eeda8d59e91af43c61fef177c5f2ffd53 F www/index.tcl 52e29a4eeda8d59e91af43c61fef177c5f2ffd53
F www/sqlite.tcl 2f933ce18cffd34a0a020a82435ab937137970fd F www/sqlite.tcl 2f933ce18cffd34a0a020a82435ab937137970fd
P 61c381e7e6c85619b7b494417956fc209c5b7b84 P 33355b2d8d23b51e917961b7fb336bc1d454497f
R f79443a31154f60b0063b7fad1afe1ae R 698c786702799109c8590452a815b490
U drh U drh
Z a7a98045f3e2dce83769476787f9e43e Z e88522b8c3d025e67d3ca5bc0fce8783

View File

@ -1 +1 @@
33355b2d8d23b51e917961b7fb336bc1d454497f 2e5786d10148872db47d99e39c3f54597ad777c8

View File

@ -23,7 +23,7 @@
# This file implements regression tests for SQLite library. The # This file implements regression tests for SQLite library. The
# focus of this file is testing the CREATE INDEX statement. # focus of this file is testing the CREATE INDEX statement.
# #
# $Id: index.test,v 1.3 2000/06/03 18:06:53 drh Exp $ # $Id: index.test,v 1.4 2000/06/08 16:54:40 drh Exp $
set testdir [file dirname $argv0] set testdir [file dirname $argv0]
source $testdir/tester.tcl source $testdir/tester.tcl
@ -257,4 +257,35 @@ do_test index-9.2 {
execsql {SELECT name FROM sqlite_master WHERE tbl_name='tab1' ORDER BY name} execsql {SELECT name FROM sqlite_master WHERE tbl_name='tab1' ORDER BY name}
} {idx1 tab1} } {idx1 tab1}
# Allow more than one entry with the same key.
#
do_test index-10.0 {
execsql {
CREATE TABLE t1(a int, b int);
CREATE INDEX i1 ON t1(a);
INSERT INTO t1 VALUES(1,2);
INSERT INTO t1 VALUES(2,4);
INSERT INTO t1 VALUES(3,8);
INSERT INTO t1 VALUES(1,12);
SELECT b FROM t1 WHERE a=1 ORDER BY b;
}
} {2 12}
do_test index-10.1 {
execsql {
SELECT b FROM t1 WHERE a=2 ORDER BY b;
}
} {4}
do_test index-10.2 {
execsql {
DELETE FROM t1 WHERE b=12;
SELECT b FROM t1 WHERE a=1 ORDER BY b;
}
} {2}
do_test index-10.2 {
execsql {
DELETE FROM t1 WHERE b=2;
SELECT b FROM t1 WHERE a=1 ORDER BY b;
}
} {}
finish_test finish_test

View File

@ -23,7 +23,7 @@
# This file implements regression tests for SQLite library. The # This file implements regression tests for SQLite library. The
# focus of this file is testing the SELECT statement. # focus of this file is testing the SELECT statement.
# #
# $Id: select2.test,v 1.5 2000/06/05 18:54:47 drh Exp $ # $Id: select2.test,v 1.6 2000/06/08 16:54:40 drh Exp $
set testdir [file dirname $argv0] set testdir [file dirname $argv0]
source $testdir/tester.tcl source $testdir/tester.tcl
@ -90,7 +90,7 @@ do_test select2-2.2 {
} {29500} } {29500}
do_test select2-3.1 { do_test select2-3.1 {
execsql {SELECT f1 FROM tbl2 WHERE f2==1000} execsql {SELECT f1 FROM tbl2 WHERE 1000=f2}
} {500} } {500}
do_test select2-3.2a { do_test select2-3.2a {
@ -98,8 +98,16 @@ do_test select2-3.2a {
} {} } {}
do_test select2-3.2b { do_test select2-3.2b {
execsql {SELECT f1 FROM tbl2 WHERE f2==1000} execsql {SELECT f1 FROM tbl2 WHERE 1000=f2}
} {500} } {500}
do_test select2-3.2c {
execsql {SELECT f1 FROM tbl2 WHERE f2=1000}
} {500}
do_test select2-3.2d {
set t1 [lindex [time {execsql {SELECT f1 FROM tbl2 WHERE 1000=f2}} 1] 0]
set t2 [lindex [time {execsql {SELECT f1 FROM tbl2 WHERE f2=1000}} 1] 0]
expr {$t1*0.9<$t2 && $t2*0.9<$t1}
} {1}
# Make sure queries run faster with an index than without # Make sure queries run faster with an index than without
# #