From 802d69a79c2c5743d5add6dacdcd4fb1331b14dd Mon Sep 17 00:00:00 2001 From: drh Date: Sun, 13 Feb 2005 23:34:24 +0000 Subject: [PATCH] Update the version number in preparation for the release of 3.1.2. (CVS 2325) FossilOrigin-Name: f3c51de7599ed6d3bcdd227e290ad75829840957 --- VERSION | 2 +- manifest | 20 ++++++++++---------- manifest.uuid | 2 +- test/enc2.test | 6 +++++- test/pragma.test | 41 +++++++++++++++++++++++++++++++++++------ www/changes.tcl | 17 +++++++++++++++++ 6 files changed, 69 insertions(+), 19 deletions(-) diff --git a/VERSION b/VERSION index c58a72f9bd..ef538c2810 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.1.1beta +3.1.2 diff --git a/manifest b/manifest index 3bc5ebc5c0..52bfeccaeb 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Fix\sa\sproblem\swith\ssub-queries\sand\sthe\sflattening\soptimization.\sAlso\shandle\san\sextra\scase\sof\sdatabase\scorruption.\s(CVS\s2324) -D 2005-02-12T08:59:56 +C Update\sthe\sversion\snumber\sin\spreparation\sfor\sthe\srelease\sof\s3.1.2.\s(CVS\s2325) +D 2005-02-13T23:34:25 F Makefile.in d928187101fa3d78426cf48ca30e39d0fb714e57 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1 -F VERSION 6755bb368f6ab4bda43b635142309ce2681506cf +F VERSION 9e556d0985199b130268c3b8e5615b90dda7e829 F aclocal.m4 7daea4c35e88de30d5a3f6f7a2ab99720e803bbd F art/SQLite.eps 9b43cc99cfd2be687d386faea6862ea68d6a72b2 F art/SQLite.gif 1bbb94484963f1382e27e1c5e86dd0c1061eba2b @@ -122,7 +122,7 @@ F test/delete.test fc29491f6a7ac899ce29f4549a104809e245d9a6 F test/delete2.test e382b6a97787197eb8b93dd4ccd37797c3725ea3 F test/diskfull.test e2f6cfd868713ead06dc82b84a4938e868128fc0 F test/enc.test 7a03417a1051fe8bc6c7641cf4c8c3f7e0066d52 -F test/enc2.test e5e95be36676df5ba7c4c4c837cabcdf9fe01f5b +F test/enc2.test af13bb35708413ee86d6dd95032634c5bbfb8466 F test/enc3.test f6a5f0b7b7f3a88f030d3143729b87cd5c86d837 F test/expr.test 54d9d1cc05eb731fa62daa70f2d7163f8a03c54d F test/fkey1.test 81bb13caaa78f58d7d191d7f535529f7c91d821a @@ -163,7 +163,7 @@ F test/pager.test 1579e8f07291ae8e24db62ffade5c101c3e76597 F test/pager2.test 49c0f57c7da0b060f0486b85fdd074025caa694e F test/pager3.test 647f696a9cf7409df00a1e0047c2eb55585a1b85 F test/pagesize.test 1b826d1608fd86d2303aa895b5586052ad07eba1 -F test/pragma.test 6e675a123a0ee290b7c72842301c60b9d0a2352c +F test/pragma.test 52e4ba758004e2200ff153d09c8b92f19bf940bc F test/printf.test 92ba4c510b4fc61120ffa4a01820446ed917ae57 F test/progress.test 16496001da445e6534afb94562c286708316d82f x F test/quick.test 91e5b8ae6663dc9e3e754b271f0384f0cae706e6 @@ -236,7 +236,7 @@ F www/autoinc.tcl b357f5ba954b046ee35392ce0f884a2fcfcdea06 F www/c_interface.tcl b51b08591554c16a0c3ef718364a508ac25abc7e F www/capi3.tcl 9676103393dbf1c313b5618c9da59033f82cd924 F www/capi3ref.tcl c5a3ae75fc3505c034f3c4bbb62ab94cf359ac39 -F www/changes.tcl c4e713f1a478dba14764119c29cb1b5e66b8242b +F www/changes.tcl 33b6d72be3d38765151450c09ce8b0328ce2bf8e F www/common.tcl de758130d54d95d151ea0d17a2ae5b92e1bb01de F www/compile.tcl 65b26bdfc964b66c5f0af841718a52f9795ceb05 F www/conflict.tcl cdd0f4b59b0ba6d61f67e6a38f3ae45853bacb30 @@ -270,7 +270,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0 F www/whentouse.tcl 3e522a06ad41992023c80ca29a048ae2331ca5bd -P 63894baf1b37156fd0b84eba4c9c5e8f43cee3f3 -R 4ee542c569351f4ff1f82d163be495c2 -U danielk1977 -Z 373c8022bccec8f4ba403b177f7c78fd +P f7858d8830cdd0f57b8f9bc73068d29a7062b8ac +R 140ff7a4bd57de4ce48248ba4872fa40 +U drh +Z 54aa8791bff2314e3791551e26e3033e diff --git a/manifest.uuid b/manifest.uuid index 9f98aabc64..e08a627f01 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f7858d8830cdd0f57b8f9bc73068d29a7062b8ac \ No newline at end of file +f3c51de7599ed6d3bcdd227e290ad75829840957 \ No newline at end of file diff --git a/test/enc2.test b/test/enc2.test index 3bdcf72e8d..e5817d5a54 100644 --- a/test/enc2.test +++ b/test/enc2.test @@ -13,7 +13,7 @@ # various suported unicode encodings (UTF-8, UTF-16, UTF-16le and # UTF-16be). # -# $Id: enc2.test,v 1.20 2005/01/21 04:25:47 danielk1977 Exp $ +# $Id: enc2.test,v 1.21 2005/02/13 23:34:25 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -126,6 +126,10 @@ do_test $t.9 { sqlite3_finalize $STMT } SQLITE_OK +ifcapable vacuum { + execsql VACUUM +} + do_test $t.10 { db eval {PRAGMA encoding} } $enc diff --git a/test/pragma.test b/test/pragma.test index e618e0e5f6..abb8ef1340 100644 --- a/test/pragma.test +++ b/test/pragma.test @@ -12,7 +12,7 @@ # # This file implements tests for the PRAGMA command. # -# $Id: pragma.test,v 1.33 2005/02/09 03:20:37 danielk1977 Exp $ +# $Id: pragma.test,v 1.34 2005/02/13 23:34:25 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -106,7 +106,7 @@ do_test pragma-1.8 { PRAGMA synchronous; } } {123 123 2} -do_test pragma-1.9 { +do_test pragma-1.9.1 { db close set ::DB [sqlite3 db test.db] execsql { @@ -115,6 +115,16 @@ do_test pragma-1.9 { PRAGMA synchronous; } } {123 123 2} +ifcapable vacuum { + do_test pragma-1.9.2 { + execsql { + VACUUM; + PRAGMA cache_size; + PRAGMA default_cache_size; + PRAGMA synchronous; + } + } {123 123 2} +} do_test pragma-1.10 { execsql { PRAGMA synchronous=NORMAL; @@ -515,16 +525,37 @@ do_test pragma-8.2.2 { PRAGMA user_version = 2; } } {} -do_test pragma-8.2.3 { +do_test pragma-8.2.3.1 { execsql { PRAGMA user_version; } } {2} -do_test pragma-8.2.4 { +do_test pragma-8.2.3.2 { + db close + sqlite3 db test.db + execsql { + PRAGMA user_version; + } +} {2} +do_test pragma-8.2.4.1 { execsql { PRAGMA schema_version; } } {108} +ifcapable vacuum { + do_test pragma-8.2.4.2 { + execsql { + VACUUM; + PRAGMA user_version; + } + } {2} + do_test pragma-8.2.4.3 { + execsql { + PRAGMA schema_version; + } + } {109} +} +db eval {ATTACH 'test2.db' AS aux} # Check that the user-version in the auxilary database can be manipulated ( # and that we aren't accidentally manipulating the same in the main db). @@ -730,5 +761,3 @@ dbX eval {PRAGMA temp_store_directory = ""} dbX close finish_test - - diff --git a/www/changes.tcl b/www/changes.tcl index e91bc59615..2c019e98ab 100644 --- a/www/changes.tcl +++ b/www/changes.tcl @@ -21,6 +21,23 @@ proc chng {date desc} { puts "

" } +chng {2005 February 14 (3.1.2)} { +
  • Fix a bug that can lead to database corruption if there are two +open connections to the same database and one connection does a VACUUM +and the second makes some change to the database.
    • +
  • Allow "?" parameters in the LIMIT clause.
    • +
  • Fix VACUUM so that it works with AUTOINCREMENT.
    • +
  • Add a numeric version number to the sqlite3.h include file.
    • +
  • Other minor bug fixes and performance enhancements.
    • +} + +chng {2005 February 1 (3.1.1 BETA)} { +
  • Automatic caching of prepared statements in the TCL interface
    • +
  • ATTACH and DETACH as well as some other operations cause existing + prepared statements to expire.
    • +
  • Numerious minor bug fixes
    • +} + chng {2005 January 21 (3.1.0 ALPHA)} {
  • Autovacuum support added
  • CURRENT_TIME, CURRENT_DATE, and CURRENT_TIMESTAMP added