diff options
-rw-r--r-- | manifest | 18 | ||||
-rw-r--r-- | manifest.uuid | 2 | ||||
-rw-r--r-- | test/bind.test | 14 | ||||
-rw-r--r-- | test/expr.test | 6 | ||||
-rw-r--r-- | test/interrupt.test | 12 | ||||
-rw-r--r-- | test/main.test | 8 |
6 files changed, 41 insertions, 19 deletions
@@ -1,5 +1,5 @@ -C Improved\stest\scoverage\sfor\svdbeaux.c.\s(CVS\s2195) -D 2005-01-11T16:54:15 +C Test\scoverage\simprovements\son\stokenize.c.\s(CVS\s2196) +D 2005-01-11T17:46:42 F Makefile.in ecf441ac5ca1ccfc8748a8a9537706e69893dfa4 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1 @@ -97,7 +97,7 @@ F test/autovacuum_ioerr.test 55ea907df34edb9be78a910a1636c2eb3c17ecc4 F test/autovacuum_ioerr2.test bf427c86e4daa8638a2eb849bbe1446c234c73d3 F test/bigfile.test d3744a8821ce9abb8697f2826a3e3d22b719e89f F test/bigrow.test f0aeb7573dcb8caaafea76454be3ade29b7fc747 -F test/bind.test 7b00573c71e68bcce80cf08db434584fcb87d168 +F test/bind.test b4ed42a21677dd0c0cd0ec671dffd1c39a9277b0 F test/blob.test fc41fe95bdc10da51f0dee73ce86e75ce1d6eb9d F test/btree.test 8aa7424aeec844df990273fe36447e5d7e407261 F test/btree2.test dbce930b549d5ac883a7d8905c976209ea241db3 @@ -127,7 +127,7 @@ F test/diskfull.test e2f6cfd868713ead06dc82b84a4938e868128fc0 F test/enc.test 7a03417a1051fe8bc6c7641cf4c8c3f7e0066d52 F test/enc2.test 6d1a2650e9da43eab499d18ca694a0cb6ec69dee F test/enc3.test f6a5f0b7b7f3a88f030d3143729b87cd5c86d837 -F test/expr.test bf826516ea0ba159eb9680fbcea955148bfe9bc3 +F test/expr.test 7baf931302bc81352d20cfc0cd7b2a26bf54e73e F test/fkey1.test 81bb13caaa78f58d7d191d7f535529f7c91d821a F test/func.test 5920cc058d02d4d602bf9d3d0eb34c9a71ae3879 F test/hook.test f8605cde4c77b2c6a4a73723bf6c507796a64dda @@ -136,7 +136,7 @@ F test/index.test 1294997b4743007af57f8148c63ba14f07ad31ab F test/index2.test ed2409af110aa06ec0c9fedfa050031887c38707 F test/insert.test 56f9c20c9adc8d707490c4ffa5d4daa94826ea03 F test/insert2.test 0bb50ff999e35a21549d8ee5dc44db8ac24d31a7 -F test/interrupt.test 738a389d2a69697785a0168cf74ef2c3da2f2cbf +F test/interrupt.test 5b4d8389e6cf2d01b94f87cfd02d9df1073bfb2d F test/intpkey.test b57cf5236fde1bd8cbc1388fa0c91908f6fd9194 F test/ioerr.test 01ac547c4a6fc53fcd9fe7ecc9698ab5d827093a F test/join.test ea8c77b9fbc377fe553cdb5ce5f1bd72021dca5d @@ -149,7 +149,7 @@ F test/limit.test 0225cadf96f199566b6d1ae7b5642492878ec45a F test/lock.test 32fe28e5030f25f23bcf6beef440675b0d848413 F test/lock2.test 59c3dd7d9b24d1bf7ec91b2d1541c37e97939d5f F test/lock3.test 615111293cf32aa2ed16d01c6611737651c96fb9 -F test/main.test 5f9deae11b93336da1ccc5f91cf8be075c91ddf1 +F test/main.test a60a1d234b5f5784097973bd395514ca56003ef1 F test/malloc.test 74b9d6b8e6b388102e2c5dbcda7da4341e00e6b5 F test/memdb.test 532aac7128a3da494cddc4461d76c6e3988f771b F test/memleak.test f1fa233f8295dd1d955a00d5e5ee857850f27f29 @@ -268,7 +268,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0 F www/whentouse.tcl c3b50d3ac31c54be2a1af9b488a89d22f1e6e746 -P ad451a2ddc7993035768f2801d590311807f4397 -R 9858e5e9e52aaef041fc467d86a3aa07 +P 3f46cd7767cf7c48dd1de7ae1c4104d6d1a609be +R 20f2a0dab63537f5c3dee30143439d82 U drh -Z 8655077bc04dd81af5a00bb7c6eeefb4 +Z 389596d56c67cb78fa06091fbcccd7d8 diff --git a/manifest.uuid b/manifest.uuid index 4222073ad..683778b20 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -3f46cd7767cf7c48dd1de7ae1c4104d6d1a609be
\ No newline at end of file +5767850ccadb3b53d14bca547e50f65de1d3092e
\ No newline at end of file diff --git a/test/bind.test b/test/bind.test index 85bebfbc3..361fff850 100644 --- a/test/bind.test +++ b/test/bind.test @@ -11,7 +11,7 @@ # This file implements regression tests for SQLite library. The # focus of this script testing the sqlite_bind API. # -# $Id: bind.test,v 1.24 2005/01/11 16:54:15 drh Exp $ +# $Id: bind.test,v 1.25 2005/01/11 17:46:42 drh Exp $ # set testdir [file dirname $argv0] @@ -104,12 +104,13 @@ ifcapable {tclvar} { execsql { DELETE FROM t1; } - set VM [sqlite3_prepare $DB {INSERT INTO t1 VALUES($one,$::two,${x})} -1 TX] + set VM [sqlite3_prepare $DB {INSERT INTO t1 VALUES($one,$::two,${x{y}z})}\ + -1 TX] set TX } {} set v1 {$one} set v2 {$::two} - set v3 {${x}} + set v3 {${x{y}z}} } ifcapable {!tclvar} { do_test bind-2.1 { @@ -491,4 +492,11 @@ do_test bind-10.16 { } :pqr catch {sqlite3_finalize $VM} +# Make sure we catch an unterminated "(" in a Tcl-style variable name +# +do_test bind-11.1 { + catchsql {SELECT * FROM sqlite_master WHERE name=$abc(123 and sql NOT NULL;} +} {1 {unrecognized token: "$abc(123"}} + + finish_test diff --git a/test/expr.test b/test/expr.test index 8bc66c432..94edb2c55 100644 --- a/test/expr.test +++ b/test/expr.test @@ -11,7 +11,7 @@ # This file implements regression tests for SQLite library. The # focus of this file is testing expressions. # -# $Id: expr.test,v 1.40 2004/11/17 16:41:29 danielk1977 Exp $ +# $Id: expr.test,v 1.41 2005/01/11 17:46:42 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -543,4 +543,8 @@ ifcapable datetime { } set sqlite_current_time 0 +do_test expr-9.1 { + execsql {SELECT round(-('-'||'123'))} +} 123 + finish_test diff --git a/test/interrupt.test b/test/interrupt.test index e58fc7bb1..463347117 100644 --- a/test/interrupt.test +++ b/test/interrupt.test @@ -11,7 +11,7 @@ # This file implements regression tests for SQLite library. The # focus of this script is the sqlite_interrupt() API. # -# $Id: interrupt.test,v 1.9 2005/01/11 16:54:15 drh Exp $ +# $Id: interrupt.test,v 1.10 2005/01/11 17:46:42 drh Exp $ set testdir [file dirname $argv0] @@ -176,4 +176,14 @@ for {set i 1} {$i<$max_count-5} {incr i 1} { } {1 interrupted} } +# Interrupt during parsing +# +do_test interrupt-5.1 { + proc fake_interrupt {args} {sqlite3_interrupt $::DB; return SQLITE_OK} + db collation_needed fake_interrupt + catchsql { + CREATE INDEX fake ON fake1(a COLLATE fake_collation, b, c DESC); + } +} {1 interrupt} + finish_test diff --git a/test/main.test b/test/main.test index 10ef35b2f..26f8381c8 100644 --- a/test/main.test +++ b/test/main.test @@ -11,7 +11,7 @@ # This file implements regression tests for SQLite library. The # focus of this file is exercising the code in main.c. # -# $Id: main.test,v 1.18 2004/11/04 04:42:28 drh Exp $ +# $Id: main.test,v 1.19 2005/01/11 17:46:42 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -68,7 +68,7 @@ do_test main-1.14 { db complete {SELECT a-b FROM t1; } } {1} do_test main-1.15 { - db complete {SELECT a-b FROM t1 } + db complete {SELECT a/e FROM t1 } } {0} do_test main-1.16 { db complete { @@ -179,7 +179,7 @@ ifcapable {trigger} { } do_test main-1.28 { db complete { - CREATE TEMP TRIGGER xyz AFTER DELETE backend BEGIN + CREATE TEMPORARY TRIGGER xyz AFTER DELETE backend BEGIN UPDATE pqr SET a=5; } } {0} @@ -277,7 +277,7 @@ do_test main-3.3 { file delete -force testdb sqlite3 db testdb execsql { - create table T1(X REAL); + create table T1(X REAL); /* C-style comments allowed */ insert into T1 values(0.5); insert into T1 values(0.5e2); insert into T1 values(0.5e-002); |