Fixes for UPDATE statements on virtual tables. (CVS 3263)

FossilOrigin-Name: 81c5a5b48b05186a1690198092ac92006d9f7020

diff --git a/manifest b/manifest
index 42d838a29d9fbb7fb284f0dc2f963959d6331b1f..0d48c41941c20947812482c5209f0edf57ba80f4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Rework\sthe\sway\sUPDATE\sworks\sfor\svirtual\stables.\s(CVS\s3262)
-D 2006-06-16T21:13:22
+C Fixes\sfor\sUPDATE\sstatements\son\svirtual\stables.\s(CVS\s3263)
+D 2006-06-17T03:27:22
 F Makefile.in f839b470345d3cb4b0644068474623fe2464b5d3
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -93,7 +93,7 @@ F src/test_server.c a6460daed0b92ecbc2531b6dc73717470e7a648c
 F src/test_tclvar.c c52f67fbe06d32804af2ba9a2d7aadfc15f5910c
 F src/tokenize.c 6ebcafa6622839968dda4418a7b6945f277a128f
 F src/trigger.c 0fc40125820409a6274834a6e04ad804d96e2793
-F src/update.c 4fb474fab5b51fdcdee27f23a41c843c4b23ebe2
+F src/update.c 37fb7bb2c220c170ca7c0d0b42d1d6b33ecd0c40
 F src/utf.c ab81ac59084ff1c07d421eb1a0a84ec809603b44
 F src/util.c ca6ee72772c0f5dc04d2e0ab1973fd3b6a9bf79d
 F src/vacuum.c 5b37d0f436f8e1ffacd17934e44720b38d2247f9
@@ -104,7 +104,7 @@ F src/vdbeapi.c 6af0e7160af260052a7a4500464221a03dada75f
 F src/vdbeaux.c dc5cfd11a0529fcfd217a1807f7c9df513f1c276
 F src/vdbefifo.c 9efb94c8c3f4c979ebd0028219483f88e57584f5
 F src/vdbemem.c 5f0afe3b92bb2c037f8d5d697f7c151fa50783a3
-F src/vtab.c 5d69a87980eaac026f74c8712961ed2b306ffba2
+F src/vtab.c a0bcc2da7e27fbfa2635c2dc4b964a641f220c78
 F src/where.c d7c3cc011834882b2d58ebb3a6a1a569ead7ebd7
 F tclinstaller.tcl 046e3624671962dc50f0481d7c25b38ef803eb42
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -291,7 +291,7 @@ F test/vacuum.test 37f998b841cb335397c26d9bbc3457182af2565f
 F test/vacuum2.test 5aea8c88a65cb29f7d175296e7c819c6158d838c
 F test/varint.test ab7b110089a08b9926ed7390e7e97bdefeb74102
 F test/view.test 16e2774fe35e47a07ac4471b7f0bcc948b1aa6d5
-F test/vtab1.test 028298f87b9a1a93536fc8f8a90c1e342109543f
+F test/vtab1.test 6a7defe56939acae6d4f725f2837468e4e212bff
 F test/vtab3.test b3ea5dfdc36ba23ba5136928b6c307c5125ababc
 F test/where.test ee7c9a6659b07e1ee61177f6e7ff71565ee2c9df
 F test/where2.test a16476a5913e75cf65b38f2daa6157a6b7791394
@@ -368,7 +368,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 6125140228e09cad2029a48e92aa0123d3daecfb
-R c6423d78b30f09b39a0d99eff61f3284
-U drh
-Z 58b933b2b7f2511ff044743b3247c932
+P 2119e7bf5577350e4e1236ea729568085620a826
+R 62905f1f1c0b62dcb77e124d65c8ac57
+U danielk1977
+Z e81e11fc0bdc2a8704dbb42dcaace95a

diff --git a/manifest.uuid b/manifest.uuid
index ddade3625a525cad76be3b084faf78beaf8e0316..d8453a78a9e31e1c730ff53edec1b203de43f625 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2119e7bf5577350e4e1236ea729568085620a826
\ No newline at end of file
+81c5a5b48b05186a1690198092ac92006d9f7020
\ No newline at end of file

diff --git a/src/update.c b/src/update.c
index e94c1b4b0f589a5da2d0fa743433fee85726dd9c..ca2cb260d4b29f68e681f85599a482b649764f54 100644 (file)
--- a/src/update.c
+++ b/src/update.c
@@ -12,7 +12,7 @@
 ** This file contains C code routines that are called by the parser
 ** to handle UPDATE statements.
 **
-** $Id: update.c,v 1.127 2006/06/16 21:13:22 drh Exp $
+** $Id: update.c,v 1.128 2006/06/17 03:27:22 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -571,7 +571,7 @@ static void updateVirtualTable(
   */
   pEList = sqlite3ExprListAppend(0, sqlite3CreateIdExpr("_rowid_"), 0);
   if( pRowid ){
-    pEList = sqlite3ExprListAppend(pEList, pRowid, 0);
+    pEList = sqlite3ExprListAppend(pEList, sqlite3ExprDup(pRowid), 0);
   }
   for(i=0; i<pTab->nCol; i++){
     if( i==pTab->iPKey ){
@@ -606,7 +606,7 @@ static void updateVirtualTable(
   if( pRowid ){
     sqlite3VdbeAddOp(v, OP_Column, ephemTab, 1);
   }else{
-    sqlite3VdbeAddOp(v, OP_Dup, 1, 0);
+    sqlite3VdbeAddOp(v, OP_Dup, 0, 0);
   }
   for(i=0; i<pTab->nCol; i++){
     sqlite3VdbeAddOp(v, OP_Column, ephemTab, i+1+(pRowid!=0));

diff --git a/src/vtab.c b/src/vtab.c
index fb1f4d933efe84d010ed31045199268306620323..e950a1b53ffc788e592a487a43e493d242da1951 100644 (file)
--- a/src/vtab.c
+++ b/src/vtab.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file contains code used to help implement virtual tables.
 **
-** $Id: vtab.c,v 1.15 2006/06/16 16:08:55 danielk1977 Exp $
+** $Id: vtab.c,v 1.16 2006/06/17 03:27:23 danielk1977 Exp $
 */
 #ifndef SQLITE_OMIT_VIRTUALTABLE
 #include "sqliteInt.h"
@@ -522,7 +522,7 @@ int sqlite3VtabBegin(sqlite3 *db, sqlite3_vtab *pVtab){
 
     /* Grow the sqlite3.aVTrans array if required */
     if( (db->nVTrans%ARRAY_INCR)==0 ){
-      sqlite3_vtab *aVTrans;
+      sqlite3_vtab **aVTrans;
       int nBytes = sizeof(sqlite3_vtab *) * (db->nVTrans + ARRAY_INCR);
       aVTrans = sqliteRealloc((void *)db->aVTrans, nBytes);
       if( !aVTrans ){

diff --git a/test/vtab1.test b/test/vtab1.test
index ef3a3e49e4399578f763c04243ea795707d5c765..42671336aa6a4696e3eb42769aee2a1da0f37abd 100644 (file)
--- a/test/vtab1.test
+++ b/test/vtab1.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is creating and dropping virtual tables.
 #
-# $Id: vtab1.test,v 1.19 2006/06/16 21:13:23 drh Exp $
+# $Id: vtab1.test,v 1.20 2006/06/17 03:27:23 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -409,8 +409,6 @@ execsql {
   DROP TABLE treal;
 }
 
-if 0 {   # FIXME
-
 #----------------------------------------------------------------------
 # Test cases vtab1-6 test INSERT, UPDATE and DELETE operations 
 # on virtual tables.
@@ -437,17 +435,12 @@ do_test vtab1-6-4 {
   }
 } {5 2 3}
 
-# TODO: This causes a crash at present.
-#
-# do_test vtab1-6-5 {
-# explain {
-#    UPDATE techo set a = a||b||c;
-#  }
-#  execsql {
-#    UPDATE techo set a = a||b||c;
-#    SELECT * FROM techo;
-#  }
-#} {523 2 3}
+do_test vtab1-6-5 {
+ execsql {
+   UPDATE techo set a = a||b||c;
+   SELECT * FROM techo;
+ }
+} {523 2 3}
 
 do_test vtab1-6-6 {
   execsql {
@@ -585,6 +578,5 @@ do_test vtab1.7-13 {
     SELECT rowid, a, b, c FROM real_abc
   }
 } {}
-} ;# END if 0
 
 finish_test