When using sqlite3NestedParse() to modify the sqlite_master table, do not code OP_Cal...

FossilOrigin-Name: 296a298c484aac981e7e490a0cb4159717fc4ea4

diff --git a/manifest b/manifest
index da25ae5fc5d71b50475876dddc4bae5282f0b1cc..59584e637fbe5c0728ecc9102adb1ae795ea08fb 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Another\sbug\sfix\sfrom\stwo\scheck-ins\sago.\s(CVS\s2062)
-D 2004-11-05T05:23:59
+C When\susing\ssqlite3NestedParse()\sto\smodify\sthe\ssqlite_master\stable,\sdo\snot\scode\sOP_Callback.\s(CVS\s2063)
+D 2004-11-05T06:02:07
 F Makefile.in c4d2416860f472a1e3393714d0372074197565df
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -33,12 +33,12 @@ F src/btree.c f97b5a3919147fe36f776d08c80212ba3ea883aa
 F src/btree.h 3166388fa58c5594d8064d38b43440d79da38fb6
 F src/build.c 06a4eb8f29e9b356f85ff4eac64c112fe5ff7d3d
 F src/date.c 34bdb0082db7ec2a83ef00063f7b44e61ee19dad
-F src/delete.c 832adc6fe1c07b7e28e1b4c1038d2b06f7397dd4
+F src/delete.c 6a54fd9f0fa6b93e13e40368a8b7206e3aae760c
 F src/expr.c be18081d2959a2cc53846d0fbedfec40fbfa1d6e
 F src/func.c 600e506bccf7648df8ad03efb417560d0f7ad4c1
 F src/hash.c a97721a55440b7bea31ffe471bb2f6b4123cddd5
 F src/hash.h 1b0c445e1c89ff2aaad9b4605ba61375af001e84
-F src/insert.c 17f66e2c32e551122f45cea11db3e664471418d6
+F src/insert.c b6ad8e90153ffb0c03bb7a0e04b14f8ddf096d92
 F src/legacy.c d58ea507bce885298a2c8c3cbb0f4bff5d47830b
 F src/main.c ba1b26f03af4b7f8be3394748123dd671b9ea147
 F src/md5.c 7ae1c39044b95de2f62e066f47bb1deb880a1070
@@ -71,7 +71,7 @@ F src/test4.c 7c6b9fc33dd1f3f93c7f1ee6e5e6d016afa6c1df
 F src/test5.c b001fa7f1b9e2dc5c2331de62fc641b5ab2bd7a1
 F src/tokenize.c c48221284e729be067237a8cfd7848fb62ee4a92
 F src/trigger.c f9a0a8d3a87238de1a934eeb7d0b6b1f13e6a55b
-F src/update.c 7b17b281d600bf3e220b3c5718e0883442dee722
+F src/update.c 50ac56ab8109846eda843591d63527c94e862bc3
 F src/utf.c f4f83acd73389090e32d6589d307fc55d794c7ed
 F src/util.c 005fdf2d008f3429d081766ad6098fdd86d8d8e6
 F src/vacuum.c ecb4a2c6f1ac5cc9b394dc64d3bb14ca650c4f60
@@ -252,7 +252,7 @@ F www/tclsqlite.tcl 560ecd6a916b320e59f2917317398f3d59b7cc25
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl fdacb0ba2d39831e8a6240d05a490026ad4c4e4c
-P 9d259d48defda57ab0bd66460bd2ba7f3a2695e9
-R 92da916c53f47131944620c16002f610
-U drh
-Z 7c042e1052dcd679d1913cf5116ea822
+P c46eef2f6d32b8546e1441e7e6f103e6ad97f1f4
+R 6ef3d4d89352eb9cafe604d4c02915f0
+U danielk1977
+Z b1ca05da6dffb52204ebc09339eae99e

diff --git a/manifest.uuid b/manifest.uuid
index 4b17d9bca59e8532082886391ad2d40e764b18c1..be045c788d46551bcf582161400c99152a8aab1d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c46eef2f6d32b8546e1441e7e6f103e6ad97f1f4
\ No newline at end of file
+296a298c484aac981e7e490a0cb4159717fc4ea4
\ No newline at end of file

diff --git a/src/delete.c b/src/delete.c
index 17448ae211607f6f471bb243eb6451e28b561f55..da140c58f4dd9a8f45927216fe51bb3ef4611c5b 100644 (file)
--- a/src/delete.c
+++ b/src/delete.c
@@ -12,7 +12,7 @@
 ** This file contains C code routines that are called by the parser
 ** to handle DELETE FROM statements.
 **
-** $Id: delete.c,v 1.86 2004/11/05 00:43:12 drh Exp $
+** $Id: delete.c,v 1.87 2004/11/05 06:02:07 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -328,9 +328,11 @@ void sqlite3DeleteFrom(
   }
 
   /*
-  ** Return the number of rows that were deleted.
+  ** Return the number of rows that were deleted. If this routine is 
+  ** generating code because of a call to sqlite3NestedParse(), do not
+  ** invoke the callback function.
   */
-  if( db->flags & SQLITE_CountRows ){
+  if( db->flags & SQLITE_CountRows && pParse->nested==0 ){
     sqlite3VdbeAddOp(v, OP_Callback, 1, 0);
     sqlite3VdbeSetNumCols(v, 1);
     sqlite3VdbeSetColName(v, 0, "rows deleted", P3_STATIC);

diff --git a/src/insert.c b/src/insert.c
index 0112f8d524dc0761625014cffee665051c366db5..e061b590ab3c97e1a1f29d776de7f08cc9e58683 100644 (file)
--- a/src/insert.c
+++ b/src/insert.c
@@ -12,7 +12,7 @@
 ** This file contains C code routines that are called by the parser
 ** to handle INSERT statements in SQLite.
 **
-** $Id: insert.c,v 1.121 2004/11/04 04:42:28 drh Exp $
+** $Id: insert.c,v 1.122 2004/11/05 06:02:07 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -634,9 +634,11 @@ void sqlite3Insert(
   }
 
   /*
-  ** Return the number of rows inserted.
+  ** Return the number of rows inserted. If this routine is 
+  ** generating code because of a call to sqlite3NestedParse(), do not
+  ** invoke the callback function.
   */
-  if( db->flags & SQLITE_CountRows ){
+  if( db->flags & SQLITE_CountRows && pParse->nested==0 ){
     sqlite3VdbeAddOp(v, OP_MemLoad, iCntMem, 0);
     sqlite3VdbeAddOp(v, OP_Callback, 1, 0);
     sqlite3VdbeSetNumCols(v, 1);

diff --git a/src/update.c b/src/update.c
index b184c038cfa648a053cbd29acce031c77ca114cd..e7a340f97c1db9b6f629d2743eba2137f5773cd3 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.92 2004/11/04 04:42:28 drh Exp $
+** $Id: update.c,v 1.93 2004/11/05 06:02:07 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -449,9 +449,11 @@ void sqlite3Update(
   }
 
   /*
-  ** Return the number of rows that were changed.
+  ** Return the number of rows that were changed. If this routine is 
+  ** generating code because of a call to sqlite3NestedParse(), do not
+  ** invoke the callback function.
   */
-  if( db->flags & SQLITE_CountRows && !pParse->trigStack ){
+  if( db->flags & SQLITE_CountRows && !pParse->trigStack && pParse->nested==0 ){
     sqlite3VdbeAddOp(v, OP_Callback, 1, 0);
     sqlite3VdbeSetNumCols(v, 1);
     sqlite3VdbeSetColName(v, 0, "rows updated", P3_STATIC);