Make sure BEGIN, COMMIT, and ROLLBACK are really no-ops when preceded

by EXPLAIN.  Ticket #626. (CVS 1267)

FossilOrigin-Name: 2af1f065b5eb39fd3ecac00f8a66d1b4186aead5

diff --git a/manifest b/manifest
index b5890749320a2898290d29152086aca04bf56dd1..d983fd1194808893726f98cc70424ed735455685 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\ssqliteVdbeOp3\sinstead\sof\ssqliteVdbeChangeP3\swhere\sapplicable.\s(CVS\s1266)
-D 2004-02-22T20:05:01
+C Make\ssure\sBEGIN,\sCOMMIT,\sand\sROLLBACK\sare\sreally\sno-ops\swhen\spreceded\nby\sEXPLAIN.\s\sTicket\s#626.\s(CVS\s1267)
+D 2004-02-24T01:04:12
 F Makefile.in cfd75c46b335881999333a9e4b982fa8491f200b
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -27,7 +27,7 @@ F src/auth.c 4fa3b05bd19445d1c474d6751c4a508d6ea0abe1
 F src/btree.c 0a40efb01fa3a431a16d8604f603431d8c9cebfa
 F src/btree.h 41cb3ff6ebc3f6da2d0a074e39ff8c7a2287469f
 F src/btree_rb.c 32b2cb4285c0fbd53b89de021637b63d52257e54
-F src/build.c 85dee2c7d23f618b9c5384091df00cbf64cce527
+F src/build.c c8ab8b467d9a64254b0d4d42083f6313b3a980d1
 F src/copy.c 391ce142f6b1faa093867ecee134f61a5028a9af
 F src/date.c 3025642cee50d5c41aef4a22cbc41aa7e543c922
 F src/delete.c 8e2ff752bf485906effcc64f267cdd7227463567
@@ -111,7 +111,7 @@ F test/memleak.test 4d5d374c8ea1fc5ac634aed58cac1047848ce65e
 F test/minmax.test 6680b8d79b9b6e026a476ebfb91f310f7774568e
 F test/misc1.test 0b98d493b0cf55cb5f53e1f3df8107c166eecb5a
 F test/misc2.test 10c2ce26407d37411b96273e552d5095393732be
-F test/misc3.test 43a93337aa0183e382a5ab26d64848e18bed8276
+F test/misc3.test bd371567b6fec7c1d7fe42a172a551226d271dd2
 F test/misuse.test 1095f26d1aed406c65e1d2eba651c4bb7c38cbff
 F test/notnull.test 7a08117a71e74b0321aaa937dbeb41a09d6eb1d0
 F test/null.test c14d0f4739f21e929b8115b72bf0c765b6bb1721
@@ -189,7 +189,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 9211e14cf81f4de125bad246d8a289786f2854aa
-R 77ff7dbcb5fd6ddb4e286234c013c859
+P 51f1e8f7539596b33bc3365ec8f34041602d049c
+R 5adf6f47c8ab67ce4590cb7b8bc7a924
 U drh
-Z 751f59f1e75cd541f38cd5d5979c86ff
+Z 2a45a4df86052317dd80d2310a220210

diff --git a/manifest.uuid b/manifest.uuid
index ec8fcee41fada7861b3d918e4982e25cee37b971..d17387217ef093481f622492e965a7cf3da17479 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-51f1e8f7539596b33bc3365ec8f34041602d049c
\ No newline at end of file
+2af1f065b5eb39fd3ecac00f8a66d1b4186aead5
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index d367e402134f317499c4b541c5b0a66f8180a3c7..87c88346beee28ea9e85aa7c2297586ba29f3bcb 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -23,7 +23,7 @@
 **     ROLLBACK
 **     PRAGMA
 **
-** $Id: build.c,v 1.174 2004/02/22 20:05:01 drh Exp $
+** $Id: build.c,v 1.175 2004/02/24 01:04:12 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -2028,8 +2028,10 @@ void sqliteBeginTransaction(Parse *pParse, int onError){
     return;
   }
   sqliteBeginWriteOperation(pParse, 0, 0);
-  db->flags |= SQLITE_InTrans;
-  db->onError = onError;
+  if( !pParse->explain ){
+    db->flags |= SQLITE_InTrans;
+    db->onError = onError;
+  }
 }
 
 /*
@@ -2045,9 +2047,13 @@ void sqliteCommitTransaction(Parse *pParse){
     sqliteErrorMsg(pParse, "cannot commit - no transaction is active");
     return;
   }
-  db->flags &= ~SQLITE_InTrans;
+  if( !pParse->explain ){
+    db->flags &= ~SQLITE_InTrans;
+  }
   sqliteEndWriteOperation(pParse);
-  db->onError = OE_Default;
+  if( !pParse->explain ){
+    db->onError = OE_Default;
+  }
 }
 
 /*
@@ -2068,8 +2074,10 @@ void sqliteRollbackTransaction(Parse *pParse){
   if( v ){
     sqliteVdbeAddOp(v, OP_Rollback, 0, 0);
   }
-  db->flags &= ~SQLITE_InTrans;
-  db->onError = OE_Default;
+  if( !pParse->explain ){
+    db->flags &= ~SQLITE_InTrans;
+    db->onError = OE_Default;
+  }
 }
 
 /*

diff --git a/test/misc3.test b/test/misc3.test
index 1ccc92c7d512520eb133456cc22172353e8732b1..0b1fbf3790c072c8737bd3370f8e775167a87a6c 100644 (file)
--- a/test/misc3.test
+++ b/test/misc3.test
@@ -13,7 +13,7 @@
 # This file implements tests for miscellanous features that were
 # left out of other test files.
 #
-# $Id: misc3.test,v 1.7 2004/02/09 14:35:28 drh Exp $
+# $Id: misc3.test,v 1.8 2004/02/24 01:04:12 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -210,7 +210,7 @@ do_test misc3-4.3 {
 # Ticket #601:  Putting a left join inside "SELECT * FROM (<join-here>)"
 # gives different results that if the outer "SELECT * FROM ..." is omitted.
 #
-do_test misc4-5.1 {
+do_test misc3-5.1 {
   execsql {
     CREATE TABLE x1 (b, c);
     INSERT INTO x1 VALUES('dog',3);
@@ -236,5 +236,19 @@ do_test misc4-5.2 {
   }
 } {1 one cat 2 two {} 3 three {} 4 four dog}
 
+# Ticket #626:  make sure EXPLAIN prevents BEGIN and COMMIT from working.
+#
+do_test misc3-6.1 {
+  execsql {EXPLAIN BEGIN}
+  catchsql {BEGIN}
+} {0 {}}
+do_test misc3-6.2 {
+  execsql {EXPLAIN COMMIT}
+  catchsql {COMMIT}
+} {0 {}}
+do_test misc3-6.3 {
+  execsql {BEGIN; EXPLAIN ROLLBACK}
+  catchsql {ROLLBACK}
+} {0 {}}
 
 finish_test