Reimplement the sqlite3_bind_value() interface so that it works when the

value being bound comes from a different database connection. (CVS 6504)

FossilOrigin-Name: 3db0c7980668cf38165add13f833863cd00a0cfe

diff --git a/manifest b/manifest
index 6c9ed63b05e8ab11ebc1b1266409ed9a988a6fc4..e8a81b196f7176ef7499d9d11d297a9a76ac6c6f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhancements\sto\svirtual\stable\sdocumentation.\s\sComment\schanges\sonly.\sNo\schanges\sto\r\ncode.\s(CVS\s6503)
-D 2009-04-13T14:43:41
+C Reimplement\sthe\ssqlite3_bind_value()\sinterface\sso\sthat\sit\sworks\swhen\sthe\nvalue\sbeing\sbound\scomes\sfrom\sa\sdifferent\sdatabase\sconnection.\s(CVS\s6504)
+D 2009-04-14T12:43:34
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -203,7 +203,7 @@ F src/vacuum.c 07121a727beeee88f27d704a00313ad6a7c9bef0
 F src/vdbe.c 88bc70921ccdcff8bfdf574f3e2285d17ab97103
 F src/vdbe.h 35a648bc3279a120da24f34d9a25213ec15daf8a
 F src/vdbeInt.h df5c5a1c739c98af2c83440dde3fc361240f3a25
-F src/vdbeapi.c 0d4138c79db48e88a497b09d257c384911a24047
+F src/vdbeapi.c 3783c3416206e66749abf5d15c0e8500acef8e0e
 F src/vdbeaux.c 5ecb4c7a041b8926a8927b1a27bcbb8ff74ae5c4
 F src/vdbeblob.c e67757450ae8581a8b354d9d7e467e41502dfe38
 F src/vdbemem.c 9798905787baae83d0b53b62030e32ecf7a0586f
@@ -717,7 +717,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 982cc7f4e7e2d8abfc2025dfbec7c1ce8f95383b
-R 152c3a29ac908f853ec59e9b3e4485ba
+P b0b2b2831cc84d57e90bf587ebed600fa72926e9
+R e950f079c16a2cf0cbd9a746b0c47391
 U drh
-Z 548cecff79bc228781a0812d3831eb8f
+Z b6c79b5e1dc82c0024406556d80ccdad

diff --git a/manifest.uuid b/manifest.uuid
index f1ddd46bbb52822f27d869d3d9cd80b46801bc79..53202499dd7bbfc87843801535ba9c46d0af11af 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b0b2b2831cc84d57e90bf587ebed600fa72926e9
\ No newline at end of file
+3db0c7980668cf38165add13f833863cd00a0cfe
\ No newline at end of file

diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index 1ef51df17cfdaa43a7f2033dcc2e5a8da2a54d8a..c23d88f5ef050749c7e4f83cdeb5d5b6bfdffce5 100644 (file)
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -13,7 +13,7 @@
 ** This file contains code use to implement APIs that are part of the
 ** VDBE.
 **
-** $Id: vdbeapi.c,v 1.161 2009/04/10 23:11:31 drh Exp $
+** $Id: vdbeapi.c,v 1.162 2009/04/14 12:43:34 drh Exp $
 */
 #include "sqliteInt.h"
 #include "vdbeInt.h"
@@ -1152,15 +1152,31 @@ int sqlite3_bind_text16(
 #endif /* SQLITE_OMIT_UTF16 */
 int sqlite3_bind_value(sqlite3_stmt *pStmt, int i, const sqlite3_value *pValue){
   int rc;
-  Vdbe *p = (Vdbe *)pStmt;
-  rc = vdbeUnbind(p, i);
-  if( rc==SQLITE_OK ){
-    rc = sqlite3VdbeMemCopy(&p->aVar[i-1], pValue);
-    if( rc==SQLITE_OK ){
-      rc = sqlite3VdbeChangeEncoding(&p->aVar[i-1], ENC(p->db));
+  switch( pValue->type ){
+    case SQLITE_NULL: {
+      rc = sqlite3_bind_null(pStmt, i);
+      break;
+    }
+    case SQLITE_INTEGER: {
+      rc = sqlite3_bind_int64(pStmt, i, pValue->u.i);
+      break;
+    }
+    case SQLITE_FLOAT: {
+      rc = sqlite3_bind_double(pStmt, i, pValue->r);
+      break;
+    }
+    case SQLITE_BLOB: {
+      if( pValue->flags & MEM_Zero ){
+        rc = sqlite3_bind_zeroblob(pStmt, i, pValue->u.nZero);
+      }else{
+        rc = sqlite3_bind_blob(pStmt, i, pValue->z, pValue->n,SQLITE_TRANSIENT);
+      }
+      break;
+    }
+    case SQLITE_TEXT: {
+      rc = bindText(pStmt,i,  pValue->z, pValue->n, SQLITE_TRANSIENT, pValue->enc);
+      break;
     }
-    sqlite3_mutex_leave(p->db->mutex);
-    rc = sqlite3ApiExit(p->db, rc);
   }
   return rc;
 }