Test sqlite3_bind_zeroblob(). Only include sqlite3Utf8To8 in builds if SQLITE_DEBUG...

FossilOrigin-Name: fde6142b7bb33198b3d6b65cfbddfad61694b1fb

diff --git a/manifest b/manifest
index 73abc0784802837198d35b634b80f69f4769b536..ba52ca75413b39f3fb475d3a1ef141af89d96409 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Allow\ssqlite3GetInt32\sto\srecognize\s10-digit\sdecimal\snumbers\sas\s32-bit.\s(CVS\s4362)
-D 2007-09-01T10:01:13
+C Test\ssqlite3_bind_zeroblob().\sOnly\sinclude\ssqlite3Utf8To8\sin\sbuilds\sif\sSQLITE_DEBUG\sis\sdefined.\s(CVS\s4363)
+D 2007-09-01T11:04:26
 F Makefile.in bfcc303429a5d9dcd552d807ee016c77427418c3
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -136,7 +136,7 @@ F src/sqliteInt.h adc8a20e80ccf9eef24cc32f241a3427915a136e
 F src/sqliteLimit.h 1bcbbdfa856f8b71b561abb31edb864b0eca1d12
 F src/table.c 1aeb9eab57b4235db86fe15a35dec76fb445a9c4
 F src/tclsqlite.c 8db035768623779c97d0509eb88ecbb49c51abca
-F src/test1.c e68d0c781b10730cd96f45bca9af36dc00fa10d6
+F src/test1.c f43580b00e3f764015acd52892690ee4f28ce775
 F src/test2.c 4ab230fbdc0decfa7422f6a052b609ba54f4dfac
 F src/test3.c 199a440ba2b38b26251393b609451a3484a15907
 F src/test4.c c2c0f5dc907f1346f5d4b65eb5799f11eb9e4071
@@ -149,7 +149,7 @@ F src/test_async.c 8b6aa6a5701bf3cf52708db178379ee608b44b0c
 F src/test_autoext.c 855157d97aa28cf84233847548bfacda21807436
 F src/test_btree.c c1308ba0b88ab577fa56c9e493a09829dfcded9c
 F src/test_config.c 3f50b4060c360d33d069e64ce5684eac43fbf4db
-F src/test_hexio.c 82916f918687502658f02533b519c38cb180db6d
+F src/test_hexio.c 94a1efec4b19311eb7c4dc40e8496a3d8eadf18a
 F src/test_loadext.c 22065d601a18878e5542191001f0eaa5d77c0ed8
 F src/test_malloc.c 35310c5147effb632fd52c1dd872ef82d56faee8
 F src/test_md5.c 34599caee5b1c73dcf86ca31f55846fab8c19ef7
@@ -159,7 +159,7 @@ F src/test_tclvar.c b2d1115e4d489179d3f029e765211b2ad527ba59
 F src/tokenize.c 67e42600ab34f976f2b1288c499ad6c98d652f0e
 F src/trigger.c 724a77d54609a33bde90618934fbeddfcc729a10
 F src/update.c e89b980b443d44b68bfc0b1746cdb6308e049ac9
-F src/utf.c 4af6259d5906b5a1bf3035cc387c4d7907bdd56e
+F src/utf.c 3cb3e9a460fee5634e08501a037d2e768bb2047b
 F src/util.c 49263637e0f228411201501ddfd1138338d6322c
 F src/vacuum.c 38745037c63246d1b0669038257890cf89fc4578
 F src/vdbe.c d2f156bbb6b636e9b4a3648c38454bf472668a86
@@ -174,7 +174,7 @@ F src/vtab.c ace9b41a088f6ad55d2e39084d92180a2bee3276
 F src/where.c 4687a2a56bc0fe66ad457958ea9f72b6cae17426
 F tclinstaller.tcl 4356d9d94d2b5ed5e68f9f0c80c4df3048dd7617
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
-F test/all.test 51e7ba4c58f160843ee6891ec9891c749377d3b2
+F test/all.test b59d1bd8b0c1d4a08b845e8af48fd43926f01f11
 F test/alter.test c2a9402e17a731e5294ef370214bd9f88351d18d
 F test/alter2.test 50c3f554b8236d179d72511c0a4f23c5eb7f2af3
 F test/alter3.test a6eec8f454be9b6ce73d8d7dc711453675a10ce7
@@ -411,7 +411,7 @@ F test/sort.test 0e4456e729e5a92a625907c63dcdedfbe72c5dc5
 F test/speed1.test 22e1b27af0683ed44dcd2f93ed817a9c3e65084a
 F test/speed2.test 53177056baf6556dcbdcf032bbdfc41c1aa74ded
 F test/speed3.test 55e039b34d505aa442cee415f83c451ae28b3123
-F test/sqllimits1.test 6974f124d9333510bb2c3e796012b5ec48844db3
+F test/sqllimits1.test 573788829a361c2a115c46e2424183d0525ba6b6
 F test/subquery.test ae324ee928c5fb463a3ce08a8860d6e7f1ca5797
 F test/subselect.test 974e87f8fc91c5f00dd565316d396a5a6c3106c4
 F test/substr.test 9f26cfca74397b26ab217fb838c3d0549eb4bcf3
@@ -488,7 +488,7 @@ F test/where2.test 3249d426b3fc7a106713d784e1628307fc308d2e
 F test/where3.test 0a30fe9808b0fa01c46d0fcf4fac0bf6cf75bb30
 F test/where4.test f80207a4ea6504f3d0962f3ecebc7db274ea50c0
 F test/where5.test fdf66f96d29a064b63eb543e28da4dfdccd81ad2
-F test/zeroblob.test c5096545085330b7886d2f977272a73d9fa7737e
+F test/zeroblob.test d4d36287b07332d5214fa3ffea20ac8d704d4e6a
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
 F tool/fragck.tcl 5265a95126abcf6ab357f7efa544787e5963f439
 F tool/lemon.c 0ab4cca47950da4dc04cf957db0c0ed54b464aa9
@@ -568,7 +568,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 595bfe72f053bc6ecb58bb9044a4cdc53d30b404
-R be04c5213b6574236677be8610d7fbc8
+P 7571345d2078fb52029f9b9924d833ec36d443e6
+R 0c7389a2063dc14d52226e56b9777f30
 U danielk1977
-Z 7223bbde30f1abb7747d25cbae5b7337
+Z cf841d7dca9b6d93f2cc7d05120bc95f

diff --git a/manifest.uuid b/manifest.uuid
index 62387c51d381d95d4d2f109073681142d3acf965..cfdb8983875b148b5854361930a2e01e8a28ac9e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7571345d2078fb52029f9b9924d833ec36d443e6
\ No newline at end of file
+fde6142b7bb33198b3d6b65cfbddfad61694b1fb
\ No newline at end of file

diff --git a/src/test1.c b/src/test1.c
index d98dbed236617e7f2b1bceb2f7db956ff5812fa0..1baee9866b9e6c10186b088ec01052d6e03af6d1 100644 (file)
--- a/src/test1.c
+++ b/src/test1.c
@@ -13,7 +13,7 @@
 ** is not included in the SQLite library.  It is used for automated
 ** testing of the SQLite library.
 **
-** $Id: test1.c,v 1.273 2007/09/01 09:02:54 danielk1977 Exp $
+** $Id: test1.c,v 1.274 2007/09/01 11:04:26 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -2462,8 +2462,7 @@ static int test_bind_zeroblob(
   int rc;
 
   if( objc!=4 ){
-    Tcl_AppendResult(interp, "wrong # args: should be \"",
-        Tcl_GetStringFromObj(objv[0], 0), " STMT N VALUE", 0);
+    Tcl_WrongNumArgs(interp, 1, objv, "STMT IDX N");
     return TCL_ERROR;
   }
 

diff --git a/src/test_hexio.c b/src/test_hexio.c
index 15d9274d435955ccd5812fd2096a3ea6f6212562..4ec2b82c7b7b9a2b6478d5df2452363e9f07c65a 100644 (file)
--- a/src/test_hexio.c
+++ b/src/test_hexio.c
@@ -17,7 +17,7 @@
 ** with historical versions of the "binary" command.  So it seems
 ** easier and safer to build our own mechanism.
 **
-** $Id: test_hexio.c,v 1.4 2007/08/16 04:30:40 drh Exp $
+** $Id: test_hexio.c,v 1.5 2007/09/01 11:04:27 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -291,6 +291,7 @@ static int utf8_to_utf8(
   int objc,
   Tcl_Obj *CONST objv[]
 ){
+#ifdef SQLITE_DEBUG
   int n;
   int nOut;
   const unsigned char *zOrig;
@@ -307,6 +308,7 @@ static int utf8_to_utf8(
   binToHex(z,nOut);
   Tcl_AppendResult(interp, (char*)z, 0);
   sqlite3_free(z);
+#endif
   return TCL_OK;
 }
 

diff --git a/src/utf.c b/src/utf.c
index eba0b586bd8af7501f80c15cf7d02922fbbae3d1..3170c09ff5346ec9a6c5449d8e9fe98c75ff84b9 100644 (file)
--- a/src/utf.c
+++ b/src/utf.c
@@ -12,7 +12,7 @@
 ** This file contains routines used to translate between UTF-8, 
 ** UTF-16, UTF-16BE, and UTF-16LE.
 **
-** $Id: utf.c,v 1.56 2007/08/21 19:33:57 drh Exp $
+** $Id: utf.c,v 1.57 2007/09/01 11:04:27 danielk1977 Exp $
 **
 ** Notes on UTF-8:
 **
@@ -456,7 +456,10 @@ int sqlite3Utf16ByteLen(const void *zIn, int nChar){
   return (z-(char const *)zIn)-((c==0)?2:0);
 }
 
-#if defined(SQLITE_TEST)
+/* This test function is not currently used by the automated test-suite. 
+** Hence it is only available in debug builds.
+*/
+#if defined(SQLITE_TEST) && defined(SQLITE_DEBUG)
 /*
 ** Translate UTF-8 to UTF-8.
 **

diff --git a/test/all.test b/test/all.test
index 920816b9cfa5629f45c67ba78c11ca09b51053ea..dbdce76e7ae73460aec33aa9d331cd25c1efaf24 100644 (file)
--- a/test/all.test
+++ b/test/all.test
@@ -10,7 +10,7 @@
 #***********************************************************************
 # This file runs all tests.
 #
-# $Id: all.test,v 1.47 2007/08/31 17:42:48 danielk1977 Exp $
+# $Id: all.test,v 1.48 2007/09/01 11:04:28 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -62,7 +62,6 @@ lappend EXCLUDE quick.test             ;# Alternate test driver script
 lappend EXCLUDE malloc.test            ;# Run seperately later.
 lappend EXCLUDE misuse.test            ;# Run seperately later.
 lappend EXCLUDE memleak.test           ;# Alternate test driver script
-lappend EXCLUDE sqllimits1.test        ;# Default values use too much memory
 lappend EXCLUDE fuzz.test
 lappend EXCLUDE soak.test              ;# Takes a very long time (default 1 hr)
 

diff --git a/test/sqllimits1.test b/test/sqllimits1.test
index 1572a038dcc6f5b56a8bce2e0b88c12eacb8eca6..80904ccc67c25d6d65448f9022db33d9144fd384 100644 (file)
--- a/test/sqllimits1.test
+++ b/test/sqllimits1.test
@@ -12,7 +12,7 @@
 # This file contains tests to verify that the limits defined in
 # sqlite source file limits.h are enforced.
 #
-# $Id: sqllimits1.test,v 1.12 2007/09/01 05:57:50 danielk1977 Exp $
+# $Id: sqllimits1.test,v 1.13 2007/09/01 11:04:28 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -21,7 +21,7 @@ source $testdir/tester.tcl
 #
 #     sqllimits-1.*:  SQLITE_MAX_LENGTH
 #     sqllimits-2.*:  SQLITE_MAX_SQL_LENGTH
-#     sqllimits-3.*:  SQLITE_MAX_PAGE_COUNT
+#     sqllimits-3.*:  SQLITE_MAX_PAGE_COUNT (and the max_page_count pragma)
 #     sqllimits-4.*:  SQLITE_MAX_COLUMN
 #
 #
@@ -38,6 +38,11 @@ source $testdir/tester.tcl
 #     sqllimits-12.*:  SQLITE_MAX_PAGE_COUNT            (sqlite todo)
 #
 
+unset -nocomplain saved
+foreach var [info vars SQLITE_MAX_*] {
+  set saved($var) [set $var]
+}
+
 set SQLITE_MAX_LENGTH                 100000
 set SQLITE_MAX_COLUMN
 set SQLITE_MAX_SQL_LENGTH             100000
@@ -472,4 +477,8 @@ do_test sqllimits-1.12.2 {
   }
 } {1 {string or blob too big}}
 
+
+foreach {key value} [array get saved] {
+  catch {set $key $value}
+}
 finish_test

diff --git a/test/zeroblob.test b/test/zeroblob.test
index 8029275591cfe313276e8d0dff2bd6447e2b9c30..04a668ed9fb3afc1c861892fa7da9f8f44838c2b 100644 (file)
--- a/test/zeroblob.test
+++ b/test/zeroblob.test
@@ -13,7 +13,7 @@
 # including the sqlite3_bind_zeroblob(), sqlite3_result_zeroblob(),
 # and the built-in zeroblob() SQL function.
 #
-# $Id: zeroblob.test,v 1.6 2007/06/07 19:08:34 drh Exp $
+# $Id: zeroblob.test,v 1.7 2007/09/01 11:04:28 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -176,4 +176,18 @@ do_test zeroblob-6.5 {
   catchsql {select zeroblob(2147483648)} 
 } {1 {string or blob too big}} 
 
+# Test bind_zeroblob()
+#
+do_test zeroblob-7.1 {
+  set ::STMT [sqlite3_prepare $::DB "SELECT length(?)" -1 DUMMY]
+  sqlite3_bind_zeroblob $::STMT 1 450
+  sqlite3_step $::STMT
+} {SQLITE_ROW}
+do_test zeroblob-7.2 {
+  sqlite3_column_int $::STMT 0
+} {450}
+do_test zeroblob-7.3 {
+  sqlite3_finalize $::STMT
+} {SQLITE_OK}
+
 finish_test