Better error message on an SQLITE_RANGE error. Ticket #991. (CVS 2124)

FossilOrigin-Name: accd432e4d9626353e555e63298fb7a56a41e53d

diff --git a/manifest b/manifest
index de62597acdc3c104389d678240418d569b12a872..0048e2e3499132f38828181c51103e1dca22cdf1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Rename\ssource\sfile\ssqlite.1\sas\ssqlite3.1.\s\sTicket\s#995.\s(CVS\s2123)
-D 2004-11-20T19:55:18
+C Better\serror\smessage\son\san\sSQLITE_RANGE\serror.\s\sTicket\s#991.\s(CVS\s2124)
+D 2004-11-20T20:18:55
 F Makefile.in e747bb5ba34ccbdd81f79dcf1b2b33c02817c21d
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -40,7 +40,7 @@ F src/hash.c a97721a55440b7bea31ffe471bb2f6b4123cddd5
 F src/hash.h 1b0c445e1c89ff2aaad9b4605ba61375af001e84
 F src/insert.c 9524a6c3e86cbdbae3313f6a083bb9a3e7a2462b
 F src/legacy.c d58ea507bce885298a2c8c3cbb0f4bff5d47830b
-F src/main.c 22f12e9d453065dce5ef5feabc41a5fa2399b8c3
+F src/main.c f156a4c5cebc8e6854364199777fb639fea97ffd
 F src/md5.c 7ae1c39044b95de2f62e066f47bb1deb880a1070
 F src/os.h 38258df2db895499b6e2957dbf17f25e0df71667
 F src/os_common.h 0e7f428ba0a6c40a61bc56c4e96f493231301b73
@@ -93,7 +93,7 @@ F test/autovacuum.test d0517eb9fa7bb12c9e7f3b5d6fd4275d22e57c15
 F test/autovacuum_crash.test 2dca85cbcc497098e45e8847c86407eb3554f3d4
 F test/bigfile.test d3744a8821ce9abb8697f2826a3e3d22b719e89f
 F test/bigrow.test f0aeb7573dcb8caaafea76454be3ade29b7fc747
-F test/bind.test 5ff767304c68ee0eb4e0efda1fbbea3fffdc5489
+F test/bind.test 3635ddfe0fb15ecfd158708feff6ef707e15c0a9
 F test/blob.test fc41fe95bdc10da51f0dee73ce86e75ce1d6eb9d
 F test/btree.test 7ae2c9dde6c9fffd61b96efe28f9e28b396ddd78
 F test/btree2.test aa4a6d05b1ea90b1acaf83ba89039dd302a88635
@@ -103,7 +103,7 @@ F test/btree6.test a5ede6bfbbb2ec8b27e62813612c0f28e8f3e027
 F test/btree7.test a6d3b842db22af97dd14b989e90a2fd96066b72f
 F test/btree8.test d4e5932e54ae10f934d92ebaff94b594923d9ebc
 F test/capi2.test cd5e149564094bda9a587e70ec5949863222cd23
-F test/capi3.test da88858ea5318c0cbd0990be9d8db0237496a3dc
+F test/capi3.test c53e4eea686dacad8a1239c0d584fe63e6e601dc
 F test/capi3b.test 5b6a66f9f295f79f443b5d3f33187fa5ef6cf336
 F test/collate1.test f79736d2ebf5492167ee4d1f4ab4c09dda776b03
 F test/collate2.test 12fd658d8f5106a8a5c8a77d66919d8c89394036
@@ -260,7 +260,7 @@ F www/tclsqlite.tcl 560ecd6a916b320e59f2917317398f3d59b7cc25
 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl fdacb0ba2d39831e8a6240d05a490026ad4c4e4c
-P 1241086f23a2ef7aef85139817f0c1b90140481d
-R c25727f5cd6c86d777f683563e8a5421
+P 297559c6d1a8c1172bb0c35cf538f6f2958c7820
+R e1b70aa789cac7356bd9698812787a2b
 U drh
-Z 72c2d55efee99f8899d42abca685e6c3
+Z 1b775c53c7601d773da3bf83ca1cbe67

diff --git a/manifest.uuid b/manifest.uuid
index 64e7f33c50e8bdc4ecb9eff1e83649a53493cfc3..1f1e22356a2943e61cf84400eabbfd135c51e932 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-297559c6d1a8c1172bb0c35cf538f6f2958c7820
\ No newline at end of file
+accd432e4d9626353e555e63298fb7a56a41e53d
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 55b8d2444467ab4798381206e7a6cf516e87a376..3a84732ca2d821b46511aec43c103396dc61178b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.265 2004/11/14 21:56:30 drh Exp $
+** $Id: main.c,v 1.266 2004/11/20 20:18:55 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -553,7 +553,7 @@ const char *sqlite3ErrStr(int rc){
     case SQLITE_NOLFS:      z = "kernel lacks large file support";       break;
     case SQLITE_AUTH:       z = "authorization denied";                  break;
     case SQLITE_FORMAT:     z = "auxiliary database format error";       break;
-    case SQLITE_RANGE:      z = "bind index out of range";               break;
+    case SQLITE_RANGE:      z = "bind or column index out of range";     break;
     case SQLITE_NOTADB:     z = "file is encrypted or is not a database";break;
     default:                z = "unknown error";                         break;
   }

diff --git a/test/bind.test b/test/bind.test
index 41115b973f1eeebfd5d6afca0dca0ab6c59ec86a..bff7001ed5005bb7102caf35c5ed9f18f036f8cd 100644 (file)
--- 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.22 2004/11/14 21:56:31 drh Exp $
+# $Id: bind.test,v 1.23 2004/11/20 20:18:55 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -272,11 +272,11 @@ do_test bind-8.1 {
 } {1}
 do_test bind-8.2 {
   sqlite3_errmsg $DB
-} {bind index out of range}
+} {bind or column index out of range}
 ifcapable {utf16} {
   do_test bind-8.3 {
     encoding convertfrom unicode [sqlite3_errmsg16 $DB]
-  } {bind index out of range}
+  } {bind or column index out of range}
 }
 do_test bind-8.4 {
   sqlite3_bind_null $VM 1 
@@ -287,11 +287,11 @@ do_test bind-8.5 {
 } {1}
 do_test bind-8.6 {
   sqlite3_errmsg $DB
-} {bind index out of range}
+} {bind or column index out of range}
 ifcapable {utf16} {
   do_test bind-8.7 {
     encoding convertfrom unicode [sqlite3_errmsg16 $DB]
-  } {bind index out of range}
+  } {bind or column index out of range}
 }
 
 do_test bind-8.8 {

diff --git a/test/capi3.test b/test/capi3.test
index 515577f74f5d45d86b271aceffcde8b6676a20e2..2059e6687d010e45cbb8242234a1c4ec520cbe00 100644 (file)
--- a/test/capi3.test
+++ b/test/capi3.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script testing the callback-free C/C++ API.
 #
-# $Id: capi3.test,v 1.24 2004/11/16 15:50:21 danielk1977 Exp $
+# $Id: capi3.test,v 1.25 2004/11/20 20:18:55 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -595,7 +595,7 @@ SQLITE_MISUSE     {library routine called out of sequence} \
 SQLITE_NOLFS      {kernel lacks large file support} \
 SQLITE_AUTH       {authorization denied} \
 SQLITE_FORMAT     {auxiliary database format error} \
-SQLITE_RANGE      {bind index out of range} \
+SQLITE_RANGE      {bind or column index out of range} \
 SQLITE_NOTADB     {file is encrypted or is not a database} \
 unknownerror      {unknown error} \
 ]