The TCL interface binds variables as BLOB only if they have a bytearray

representation but no text representation. Ticket #1287. (CVS 2528)

FossilOrigin-Name: 8c99dca60aebee0ec5de9ed11350de864bc76584

diff --git a/manifest b/manifest
index b1f1d545ec8a821588e4423852a173914c04b49b..f44429b215fd426e9f6c51ec9d5b4889a37389c2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sthe\sblob(),\stext()\sand\snumeric()\sfunctions\sadded\sin\s(2524)\sand\r\nreplace\sthem\swith\sthe\sstandard\sCAST\soperator.\r\nTicket\s#1287.\s(CVS\s2527)
-D 2005-06-25T18:42:14
+C The\sTCL\sinterface\sbinds\svariables\sas\sBLOB\sonly\sif\sthey\shave\sa\sbytearray\r\nrepresentation\sbut\sno\stext\srepresentation.\sTicket\s#1287.\s(CVS\s2528)
+D 2005-06-25T19:31:48
 F Makefile.in 64a6635ef44a98325e0cffe8d67669920a3dad47
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -65,8 +65,8 @@ F src/shell.c 25b3217d7c64e6497225439d261a253a23efff26
 F src/sqlite.h.in e06d5774e9cfa5962376ae988300a9f114a3e3d7
 F src/sqliteInt.h 2135a5bab820af868bf308f51cdf1adbcb3a85b7
 F src/table.c 25b3ff2b39b7d87e8d4a5da0713d68dfc06cbee9
-F src/tclsqlite.c af0f002d9d6ab4f7f32b9bee5b57665946e76ad9
-F src/test1.c 96314a056763107646223779bcb2b987944944dd
+F src/tclsqlite.c 9b84e9e612ed573ee664e12bda62c7511e7b7746
+F src/test1.c b2885afb71c93e49db6a36f101fe38c71e7e3d6c
 F src/test2.c 716c1809dba8e5be6093703e9cada99d627542dc
 F src/test3.c 683e1e3819152ffd35da2f201e507228921148d0
 F src/test4.c 7c6b9fc33dd1f3f93c7f1ee6e5e6d016afa6c1df
@@ -112,7 +112,7 @@ F test/btree7.test a6d3b842db22af97dd14b989e90a2fd96066b72f
 F test/capi2.test f897209386fb21cfdc9267595e0c667ebaca9164
 F test/capi3.test 4d848cc55ad6e5f68cf2712716e9fc1fa55d7635
 F test/capi3b.test 5b6a66f9f295f79f443b5d3f33187fa5ef6cf336
-F test/cast.test 5c5ebb3edadb04eb0bb172d0e48d52642480e004
+F test/cast.test 937af85faabdb189b6cd05879977f2469223be59
 F test/collate1.test f79736d2ebf5492167ee4d1f4ab4c09dda776b03
 F test/collate2.test 224a632ba04907c049804b08162efd234aa7871f
 F test/collate3.test 51362bdfb43a72bd2b087d90b2623b0695538e7a
@@ -212,6 +212,7 @@ F test/trigger5.test 619391a3e9fc194081d22cefd830d811e7badf83
 F test/trigger6.test 0e411654f122552da6590f0b4e6f781048a4a9b9
 F test/types.test f0a98d10c5ecc9865d19dc94486f9873afc6bb6b
 F test/types2.test 81dd1897be8ef4b5b73d0006e6076abe40610de3
+F test/types3.test 5c63c9cdbafe8fcb73a70a0beb0ecb65b7fa061d
 F test/unique.test 0253c4227a5dc533e312202ce21ecfad18058d18
 F test/update.test 7669ca789d62c258b678e8aa7a22a57eac10f2cf
 F test/utf16.test 5fb019e09601774743858ef7380b6c02103ff120
@@ -282,7 +283,7 @@ F www/tclsqlite.tcl 425be741b8ae664f55cb1ef2371aab0a75109cf9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 528299b8316726dbcc5548e9aa0648c8b1bd055b
-P 06a71b162b032fc5b56d18919a784d4ee94dde7c
-R 232a3463ca338974c39f0662b7bf2007
+P 17631785f9ee8ab280c82677eb53886912e085bc
+R 9ec95f28757d0a0d2556cee5684b2d92
 U drh
-Z 47d0af1509bc0a39043a3f760e0ac13b
+Z f4f5d0f3cdc7483f729807d727fb5289

diff --git a/manifest.uuid b/manifest.uuid
index de827addf7f4e502c80933c4822f43792c28db29..ff19bf0293ac5c0a43df7617519e32591ba63157 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-17631785f9ee8ab280c82677eb53886912e085bc
\ No newline at end of file
+8c99dca60aebee0ec5de9ed11350de864bc76584
\ No newline at end of file

diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index e627e2cad8a3a172519829192c9e4d47ccb43edc..f1e80e5ff9e7848ce0c080dc818b4c717a5a3369 100644 (file)
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** A TCL Interface to SQLite
 **
-** $Id: tclsqlite.c,v 1.125 2005/05/20 09:40:56 danielk1977 Exp $
+** $Id: tclsqlite.c,v 1.126 2005/06/25 19:31:48 drh Exp $
 */
 #ifndef NO_TCL     /* Omit this whole file if TCL is unavailable */
 
@@ -283,7 +283,9 @@ static void tclSqlFunc(sqlite3_context *context, int argc, sqlite3_value**argv){
     u8 *data;
     char *zType = pVar->typePtr ? pVar->typePtr->name : "";
     char c = zType[0];
-    if( c=='b' && strcmp(zType,"bytearray")==0 ){
+    if( c=='b' && strcmp(zType,"bytearray")==0 && pVar->bytes==0 ){
+      /* Only load a BLOB type if the Tcl variable is a bytearray and
+      ** has no string representation. */
       data = Tcl_GetByteArrayFromObj(pVar, &n);
       sqlite3_result_blob(context, data, n, SQLITE_TRANSIENT);
     }else if( (c=='b' && strcmp(zType,"boolean")==0) ||
@@ -294,6 +296,10 @@ static void tclSqlFunc(sqlite3_context *context, int argc, sqlite3_value**argv){
       double r;
       Tcl_GetDoubleFromObj(0, pVar, &r);
       sqlite3_result_double(context, r);
+    }else if( c=='w' && strcmp(zType,"wideInt")==0 ){
+      Tcl_WideInt v;
+      Tcl_GetWideIntFromObj(0, pVar, &v);
+      sqlite3_result_int64(context, v);
     }else{
       data = Tcl_GetStringFromObj(pVar, &n);
       sqlite3_result_text(context, data, n, SQLITE_TRANSIENT);
@@ -924,7 +930,9 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
             u8 *data;
             char *zType = pVar->typePtr ? pVar->typePtr->name : "";
             char c = zType[0];
-            if( c=='b' && strcmp(zType,"bytearray")==0 ){
+            if( c=='b' && strcmp(zType,"bytearray")==0 && pVar->bytes==0 ){
+              /* Only load a BLOB type if the Tcl variable is a bytearray and
+              ** has no string representation. */
               data = Tcl_GetByteArrayFromObj(pVar, &n);
               sqlite3_bind_blob(pStmt, i, data, n, SQLITE_STATIC);
               Tcl_IncrRefCount(pVar);
@@ -937,6 +945,10 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
               double r;
               Tcl_GetDoubleFromObj(interp, pVar, &r);
               sqlite3_bind_double(pStmt, i, r);
+            }else if( c=='w' && strcmp(zType,"wideInt")==0 ){
+              Tcl_WideInt v;
+              Tcl_GetWideIntFromObj(interp, pVar, &v);
+              sqlite3_bind_int64(pStmt, i, v);
             }else{
               data = Tcl_GetStringFromObj(pVar, &n);
               sqlite3_bind_text(pStmt, i, data, n, SQLITE_STATIC);

diff --git a/src/test1.c b/src/test1.c
index dd7e06cd929651b664f101bbd6bc8a6908a037d9..eade26ec81d9b3d6ee71495a4633470ece1e7a58 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.145 2005/06/25 18:42:14 drh Exp $
+** $Id: test1.c,v 1.146 2005/06/25 19:31:48 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"

diff --git a/test/cast.test b/test/cast.test
index 04a36c4d3a17e38f4284a4179eda7b6df8efe658..3ab64adce55d0178dcf87d12631e9e466f8c6815 100644 (file)
--- a/test/cast.test
+++ b/test/cast.test
@@ -1,4 +1,4 @@
-# 2001 September 15
+# 2005 June 25
 #
 # The author disclaims copyright to this source code.  In place of
 # a legal notice, here is a blessing:
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing the CAST operator.
 #
-# $Id: cast.test,v 1.1 2005/06/25 18:42:16 drh Exp $
+# $Id: cast.test,v 1.2 2005/06/25 19:31:48 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl

diff --git a/test/types3.test b/test/types3.test
new file mode 100644 (file)
index 0000000..027af46
--- /dev/null
+++ b/test/types3.test
@@ -0,0 +1,84 @@
+# 2005 June 25
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+# This file implements regression tests for SQLite library. The focus
+# of this file is testing the interaction of SQLite manifest types
+# with Tcl dual-representations.
+#
+# $Id: types3.test,v 1.1 2005/06/25 19:31:48 drh Exp $
+#
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+
+# A variable with only a string representation comes in as TEXT
+do_test types3-1.1 {
+  set V {}
+  append V {}
+  concat [tcl_variable_type V] [execsql {SELECT typeof($::V)}]
+} {string text}
+
+# A variable with an integer representation comes in as INTEGER
+do_test types3-1.2 {
+  set V [expr {1+2}]
+  concat [tcl_variable_type V] [execsql {SELECT typeof($::V)}]
+} {int integer}
+do_test types3-1.3 {
+  set V [expr {1+123456789012345}]
+  concat [tcl_variable_type V] [execsql {SELECT typeof($::V)}]
+} {wideInt integer}
+
+# A double variable comes in as REAL
+do_test types3-1.4 {
+  set V [expr {1.0+1}]
+  concat [tcl_variable_type V] [execsql {SELECT typeof($::V)}]
+} {double real}
+
+# A byte-array variable comes in a BLOB if it has no string representation
+# or as TEXT if there is a string representation.
+#
+do_test types3-1.5 {
+  set V [binary format a3 abc]
+  concat [tcl_variable_type V] [execsql {SELECT typeof($::V)}]
+} {bytearray blob}
+do_test types3-1.6 {
+  set V "abc"
+  binary scan $V a3 x
+  concat [tcl_variable_type V] [execsql {SELECT typeof($::V)}]
+} {bytearray text}
+
+# Check to make sure return values are of the right types.
+#
+do_test types3-2.1 {
+  set V [db one {SELECT x'616263'}]
+  tcl_variable_type V
+} bytearray
+do_test types3-2.2 {
+  set V [db one {SELECT 123}]
+  tcl_variable_type V
+} int
+do_test types3-2.3 {
+  set V [db one {SELECT 1234567890123456}]
+  tcl_variable_type V
+} wideInt
+do_test types3-2.4 {
+  set V [db one {SELECT 1234567890123456.0}]
+  tcl_variable_type V
+} double
+do_test types3-2.5 {
+  set V [db one {SELECT '1234567890123456.0'}]
+  tcl_variable_type V
+} {}
+do_test types3-2.6 {
+  set V [db one {SELECT NULL}]
+  tcl_variable_type V
+} {}
+
+finish_test