Fix for ticket #105: Fix the UPDATE command so that it works properly with

indexed tables when there is a subquery in the WHERE clause.  Add tests
to verify correct operation. (CVS 680)

FossilOrigin-Name: bbca16f88d00cd33ac7229edf3ee4623eff6e62f

diff --git a/manifest b/manifest
index 4fd20a9548db940b4ab2182f46d6b9a53aa3ca40..170316e6e96bcfb9b71e21a09811a0c510fcaf1c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sfor\sticket\s#100:\sCorrectly\shandle\sON\sand\sUSING\sclauses\sof\sJOINs\swithin\na\sVIEW.\s(CVS\s679)
-D 2002-07-16T02:05:44
+C Fix\sfor\sticket\s#105:\sFix\sthe\sUPDATE\scommand\sso\sthat\sit\sworks\sproperly\swith\nindexed\stables\swhen\sthere\sis\sa\ssubquery\sin\sthe\sWHERE\sclause.\s\sAdd\stests\nto\sverify\scorrect\soperation.\s(CVS\s680)
+D 2002-07-16T17:22:51
 F Makefile.in 6291a33b87d2a395aafd7646ee1ed562c6f2c28c
 F Makefile.template 4e11752e0b5c7a043ca50af4296ec562857ba495
 F README a4c0ba11354ef6ba0776b400d057c59da47a4cc0
@@ -50,7 +50,7 @@ F src/test3.c fda085b4cdd5a2d7f65786ce679036e955f4bfa2
 F src/threadtest.c 72bce0a284647314847bbea44616ceb056bfb77f
 F src/tokenize.c b5500e193a82b5b9888fbf947efd90d3b4858178
 F src/trigger.c d88ab4d68d68955c217b38fb6717e090fbbf54a4
-F src/update.c 494479cc4fe34165cb9ea97bccefb405e7b875d2
+F src/update.c ddba82d1b0d1cb34d862d8ad943012f88e2b8495
 F src/util.c 7a99e754c44dd220e881122e30581c08b6d6adef
 F src/vdbe.c 0169270bb73e8dec4174b90dffc7070c4cabe039
 F src/vdbe.h a9292f2b5fcecef924fa255fb74609e9cbc776c2
@@ -105,7 +105,7 @@ F test/trigger1.test bb63749fa8a395a60541100607d86381604b7194
 F test/trigger2.test c12759a0d7ba6488d9d24c96a1352ddee995c1ab
 F test/trigger3.test 7dfe798d7e72c13720394685fe353112e3f31adf
 F test/unique.test 572aa791327c1e8d797932263e9d67f176cfdb44
-F test/update.test a0aa0bf83e6fad8407d0e4ad25ebb09b513f5bf4
+F test/update.test 7ffb062d580a972e7870d0f51d5af3ab9bfeae08
 F test/vacuum.test 059871b312eb910bbe49dafde1d01490cc2c6bbe
 F test/view.test 3afca084dab44c7a5772d3c6a326adf93ad52050
 F test/where.test 1f87bec674bf85d74ac1cc5b2cd3d89be1e87b1d
@@ -141,7 +141,7 @@ F www/speed.tcl da8afcc1d3ccc5696cfb388a68982bc3d9f7f00f
 F www/sqlite.tcl ae3dcfb077e53833b59d4fcc94d8a12c50a44098
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P 47997d7f3ad2dd486a00dc13b7a8c48bb4751e5d
-R 5268df3b683caf62c45fc04db3c4a2fd
+P 93710f7ed7e1baa6acbf4bc32982e046f61ffa44
+R a496b407b95e3e3391653a1442fdf78c
 U drh
-Z 2216eae1017a9d0dde05f2fc78d38393
+Z af2183151817c8e8381633943b4d70fd

diff --git a/manifest.uuid b/manifest.uuid
index 737480834aa46491df5666237b7b15b53f630fc0..db31b261c9709b8749212baa0ed10c85d8e13b21 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-93710f7ed7e1baa6acbf4bc32982e046f61ffa44
\ No newline at end of file
+bbca16f88d00cd33ac7229edf3ee4623eff6e62f
\ No newline at end of file

diff --git a/src/update.c b/src/update.c
index 656b8edfd92dd32a29b60ab53edd4f2bd8d946b0..dfc51f4d26c025689a073ea76dff18c2295b8811 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.47 2002/07/05 21:42:37 drh Exp $
+** $Id: update.c,v 1.48 2002/07/16 17:22:51 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -98,11 +98,20 @@ void sqliteUpdate(
     oldIdx = pParse->nTab++;
   }
 
+  /* Allocate a cursors for the main database table and for all indices.
+  ** The index cursors might not be used, but if they are used they
+  ** need to occur right after the database cursor.  So go ahead and
+  ** allocate enough space, just in case.
+  */
+  base = pParse->nTab++;
+  for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
+    pParse->nTab++;
+  }
+
   /* Resolve the column names in all the expressions in both the
   ** WHERE clause and in the new values.  Also find the column index
   ** for each column to be updated in the pChanges array.
   */
-  base = pParse->nTab++;
   if( pWhere ){
     if( sqliteExprResolveIds(pParse, base, pTabList, 0, pWhere) ){
       goto update_cleanup;
@@ -270,9 +279,8 @@ void sqliteUpdate(
   for(i=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, i++){
     if( openAll || aIdxUsed[i] ){
       sqliteVdbeAddOp(v, openOp, base+i+1, pIdx->tnum);
-      assert( pParse->nTab==base+i+1 );
+      assert( pParse->nTab>base+i+1 );
     }
-    pParse->nTab++;
   }
 
   /* Loop over every record that needs updating.  We have to load

diff --git a/test/update.test b/test/update.test
index 4867e8a8b9ed3fae10d0863d7600cddea83e0323..c73ee3c817be55e77521006d257f23a975685c45 100644 (file)
--- a/test/update.test
+++ b/test/update.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing the UPDATE statement.
 #
-# $Id: update.test,v 1.9 2002/05/21 12:56:44 drh Exp $
+# $Id: update.test,v 1.10 2002/07/16 17:22:51 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -480,4 +480,19 @@ do_test update-10.10 {
   }
 } {0 {1 2 3 4 13 6 2 3 4 4 6 7}}
 
+# Make sure we can handle a subquery in the where clause.
+#
+do_test update-11.1 {
+  execsql {
+    UPDATE t1 SET e=e+1 WHERE b IN (SELECT b FROM t1);
+    SELECT b,e FROM t1;
+  }
+} {2 14 3 7}
+do_test update-11.2 {
+  execsql {
+    UPDATE t1 SET e=e+1 WHERE a IN (SELECT a FROM t1);
+    SELECT a,e FROM t1;
+  }
+} {1 15 2 8}
+
 finish_test