From 7bf56610686b7128e3eb96ec8ec928c6bd7241d5 Mon Sep 17 00:00:00 2001 From: drh Date: Fri, 21 Jan 2005 15:52:32 +0000 Subject: [PATCH] Final preparations for the 3.1.0 alpha release. (CVS 2255) FossilOrigin-Name: 17122c7e8e9cae36f1ffa7b42bd69d702980ac6a --- VERSION | 2 +- manifest | 22 +++++++++++----------- manifest.uuid | 2 +- test/attach.test | 15 ++++++++------- test/join.test | 6 ++++-- test/trigger2.test | 2 +- tool/mkkeywordhash.c | 7 +++++++ 7 files changed, 33 insertions(+), 23 deletions(-) diff --git a/VERSION b/VERSION index 67786e246e..bd0b62f700 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.8 +3.1.0alpha diff --git a/manifest b/manifest index 7c19a7e52d..05d2cf0271 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Improve\stest\scoverage\sfor\sminimum\sfeature\sbuilds.\s(CVS\s2254) -D 2005-01-21T11:55:26 +C Final\spreparations\sfor\sthe\s3.1.0\salpha\srelease.\s(CVS\s2255) +D 2005-01-21T15:52:33 F Makefile.in ffd81f5e926d40b457071b4de8d7c1fa18f39b5a F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1 -F VERSION 342b6d5fde93b6d45023e2fee0163dda6464b9d6 +F VERSION e4a9a02b4ac8f4eb8d29471d0d70a957d96ce892 F aclocal.m4 7daea4c35e88de30d5a3f6f7a2ab99720e803bbd F art/SQLite.eps 9b43cc99cfd2be687d386faea6862ea68d6a72b2 F art/SQLite.gif 1bbb94484963f1382e27e1c5e86dd0c1061eba2b @@ -85,7 +85,7 @@ F src/where.c f4127cc2633ee0f74790ab7f09f5af832489e44e F tclinstaller.tcl 36478c3bbfc5b93ceac42d94e3c736937b808432 F test/all.test 7f0988442ab811dfa41793b5b550f5828ce316f3 F test/alter.test 95c57a4f461fa81293e0dccef7f83889aadb169a -F test/attach.test 3391776495dc9434c8f3c67a7591db2aef0cd4fa +F test/attach.test a16731cdd37ec2a383c1a031d3bcf7d71a2209fe F test/attach2.test eeb987770f4dbe68bd29afdbc2e8cff0142e6eb5 F test/attach3.test c05c70b933afbde0901dab9da3e66ee842c09f38 F test/auth.test 559e0816b8100740624ebb0ab7aab05f5c92831c @@ -139,7 +139,7 @@ F test/insert3.test fa7cb5b01709a1bca3e28c82c80c1d44386b3676 F test/interrupt.test 5b4d8389e6cf2d01b94f87cfd02d9df1073bfb2d F test/intpkey.test b57cf5236fde1bd8cbc1388fa0c91908f6fd9194 F test/ioerr.test fb507c2596bb07aeaff257cb48fcc93340159f0c -F test/join.test 95ee10ed1a6158020f4374016594303d4f75ee76 +F test/join.test e08471279574487cac0d17fa1ea66aca15c4de7f F test/join2.test f2171c265e57ee298a27e57e7051d22962f9f324 F test/join3.test 6f0c774ff1ba0489e6c88a3e77b9d3528fb4fda0 F test/join4.test cc6cafe85e11aacacd0abcd247a46bed251308f8 @@ -195,7 +195,7 @@ F test/threadtest2.c 97a830d53c24c42290501fdfba4a6e5bdd34748b F test/trace.test a54fa8df0d01cf827289a7659d78959e8fd2f955 F test/trans.test 29645b344d2b9b6792793562b12340177ddd8f96 F test/trigger1.test 9db1a7c91930baa2dc60ce72c7e969900bf2ae8a -F test/trigger2.test 52ae91097801291771da9db60be60a65e1360a65 +F test/trigger2.test cf497cd1cecf46774558d2ca80017a7a68f38473 F test/trigger3.test 9102fd3933db294dc654b5aee9edfe9e94f2b9e2 F test/trigger4.test e7c0812b14750754602468f15495260e8c6625e0 F test/trigger5.test 619391a3e9fc194081d22cefd830d811e7badf83 @@ -215,7 +215,7 @@ F tool/lempar.c 1e61d2b6cb9d8affa264a13336bc0c088498caa4 F tool/memleak.awk 4e7690a51bf3ed757e611273d43fe3f65b510133 F tool/memleak2.awk 9cc20c8e8f3c675efac71ea0721ee6874a1566e8 F tool/memleak3.tcl b8eb053190e95a55dc188896afb972e8108822d6 -F tool/mkkeywordhash.c db33613e94e9ed3fb0838e2c3ca4415c5fd7ec0e +F tool/mkkeywordhash.c a62da87d6f22e8864bd75ae5a54afc57b0bf17b0 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e x F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c F tool/report1.txt 9eae07f26a8fc53889b45fc833a66a33daa22816 @@ -271,7 +271,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0 F www/whentouse.tcl 3e522a06ad41992023c80ca29a048ae2331ca5bd -P c6fc49e61033419e78b6b10638d57f4942087961 -R 72b61915b4b55438a51d57f3746cef1c -U danielk1977 -Z 90e04e1ec937afd20abd081dbd664846 +P 9c4d0e13e8c5f3fc4d7fd8f495898372293f7fad +R 44bbe83d5fc37b261a84d7182829f5c6 +U drh +Z c3d0ff636238b9d4407ee815eacf77a0 diff --git a/manifest.uuid b/manifest.uuid index ea3f0ff746..2d20163130 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9c4d0e13e8c5f3fc4d7fd8f495898372293f7fad \ No newline at end of file +17122c7e8e9cae36f1ffa7b42bd69d702980ac6a \ No newline at end of file diff --git a/test/attach.test b/test/attach.test index 504c58b375..22d6dbd35e 100644 --- a/test/attach.test +++ b/test/attach.test @@ -12,7 +12,7 @@ # focus of this script is testing the ATTACH and DETACH commands # and related functionality. # -# $Id: attach.test,v 1.34 2005/01/21 11:55:27 danielk1977 Exp $ +# $Id: attach.test,v 1.35 2005/01/21 15:52:33 drh Exp $ # set testdir [file dirname $argv0] @@ -687,12 +687,13 @@ do_test attach-6.3 { CREATE TABLE no_such_db.t1(a, b, c); } } {1 {unknown database no_such_db}} -do_test attach-6.4 { - catchsql { - CREATE TEMP TABLE db2.temp1(a, b, c); - } -} {1 {temporary table name must be unqualified}} - +ifcapable !compound { + do_test attach-6.4 { + catchsql { + CREATE TEMP TABLE db2.temp1(a, b, c); + } + } {1 {temporary table name must be unqualified}} +} for {set i 2} {$i<=15} {incr i} { catch {db$i close} } diff --git a/test/join.test b/test/join.test index 3bd9423732..c87b570d2f 100644 --- a/test/join.test +++ b/test/join.test @@ -12,7 +12,7 @@ # # This file implements tests for joins, including outer joins. # -# $Id: join.test,v 1.17 2005/01/21 04:25:47 danielk1977 Exp $ +# $Id: join.test,v 1.18 2005/01/21 15:52:33 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -414,9 +414,11 @@ do_test join-9.1 { ifcapable subquery { do_test join-9.1.1 { - SELECT * FROM t12 NATURAL LEFT JOIN t13 + execsql { + SELECT * FROM t12 NATURAL LEFT JOIN t13 EXCEPT SELECT * FROM t12 NATURAL LEFT JOIN (SELECT * FROM t13 WHERE b>0); + } } {} } ifcapable view { diff --git a/test/trigger2.test b/test/trigger2.test index be70bd7f10..616b6031ab 100644 --- a/test/trigger2.test +++ b/test/trigger2.test @@ -353,7 +353,7 @@ execsql { set when_triggers [list {t1 BEFORE INSERT ON tbl WHEN new.a > 20}] ifcapable subquery { lappend when_triggers \ - {t2 BEFORE INSERT ON tbl WHEN (SELECT count(*) FROM tbl) = 0} ] + {t2 BEFORE INSERT ON tbl WHEN (SELECT count(*) FROM tbl) = 0} } execsql { diff --git a/tool/mkkeywordhash.c b/tool/mkkeywordhash.c index 952d5d34a6..1f0805420b 100644 --- a/tool/mkkeywordhash.c +++ b/tool/mkkeywordhash.c @@ -7,6 +7,13 @@ #include #include +/* +** Cursor support is off by default. +*/ +#if !defined(SQLITE_ENABLE_CURSOR) && !defined(SQLITE_OMIT_CURSOR) +# define SQLITE_OMIT_CURSOR 1 +#endif + /* ** All the keywords of the SQL language are stored as in a hash ** table composed of instances of the following structure.