ATTACH and DETACH cause prepared statements to expire.

sqlite3_finalize() can now be called right after sqlite3_reset(). (CVS 2265)

FossilOrigin-Name: 6c631b86e5e166f650d3f7d53c773aa859391c2b

diff --git a/manifest b/manifest
index 21e4a88cdd69ac7214d4f965d85accb2be7d939c..0b1112aa03c0feed7a4fffe6f60c3d234dacc17c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Test\sscript\schanges:\sBug\sfix\sand\scleanup\son\sioerr\stests.\sAlso,\sdon't\suse\sTCL\s"file\scopy"\scommand\son\swindows.\s(CVS\s2264)
-D 2005-01-22T03:39:39
+C ATTACH\sand\sDETACH\scause\sprepared\sstatements\sto\sexpire.\nsqlite3_finalize()\scan\snow\sbe\scalled\sright\safter\ssqlite3_reset().\s(CVS\s2265)
+D 2005-01-23T13:14:55
 F Makefile.in ffd81f5e926d40b457071b4de8d7c1fa18f39b5a
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -27,7 +27,7 @@ F sqlite.pc.in 30552343140c53304c2a658c080fbe810cd09ca2
 F sqlite3.1 01fdb467ce387a83248857c92f9e801df9e4611c
 F sqlite3.def dbaeb20c153e1d366e8f421b55a573f5dfc00863
 F sqlite3.pc.in 985b9bf34192a549d7d370e0f0b6b34a4f61369a
-F src/attach.c cecf5ab42cff34416372a0210b14abb50ed48ef9
+F src/attach.c 4fcdb30304f479aa6ce57d9f583357421e7b3f65
 F src/auth.c 4b15c85335417752cc1045eae18b8186e08c8184
 F src/btree.c e68ae12c8b12ef9d45d58d931c36c184055a3880
 F src/btree.h 74d19cf40ab49fd69abe9e4e12a6c321ad86c497
@@ -79,13 +79,13 @@ F src/vdbe.c a5db9e8c1a7482a865d49ded5947ecbd97bee6f8
 F src/vdbe.h 067ca8d6750ba4f69a50284765e5883dee860181
 F src/vdbeInt.h 24d411de9efc6919a1e580069a597182be269bcf
 F src/vdbeapi.c 7b65522152c36104e1ab83057ce6f7b880755b16
-F src/vdbeaux.c fcadffa683dce3213190411676576823a65656d2
+F src/vdbeaux.c 442782a4f3c1a7c0e4d81a03e65061cefb4746d2
 F src/vdbemem.c 62fe89471b656a922e9879be005abf690509ead3
 F src/where.c f4127cc2633ee0f74790ab7f09f5af832489e44e
 F tclinstaller.tcl 36478c3bbfc5b93ceac42d94e3c736937b808432
 F test/all.test 7f0988442ab811dfa41793b5b550f5828ce316f3
 F test/alter.test 95c57a4f461fa81293e0dccef7f83889aadb169a
-F test/attach.test a16731cdd37ec2a383c1a031d3bcf7d71a2209fe
+F test/attach.test 4f83c2edc418ca2e63c6ac8678f912234732e9a7
 F test/attach2.test eeb987770f4dbe68bd29afdbc2e8cff0142e6eb5
 F test/attach3.test c05c70b933afbde0901dab9da3e66ee842c09f38
 F test/auth.test 559e0816b8100740624ebb0ab7aab05f5c92831c
@@ -271,7 +271,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc
 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl 3e522a06ad41992023c80ca29a048ae2331ca5bd
-P df648d50c0696cf7ada2fe5973d285b494891964
-R b0c675a4cb045c75fc37543174b70695
-U danielk1977
-Z 7904849f77948860180c69bbf40c06c8
+P 764b55adb5dff944db36d0d19ce5e7cc758b3a9e
+R c7507b15548a623c4866c7d65ad3bfbb
+U drh
+Z 6fdf86e7727943664905aa7b9eb7cd7f

diff --git a/manifest.uuid b/manifest.uuid
index dc6b97d7917b65ae62cb2189674aa033d03c5e72..8a06accef63456d8982a7ec1f0efcfcfea01cb65 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-764b55adb5dff944db36d0d19ce5e7cc758b3a9e
\ No newline at end of file
+6c631b86e5e166f650d3f7d53c773aa859391c2b
\ No newline at end of file

diff --git a/src/attach.c b/src/attach.c
index 7b7e2ac22d61b1482e48538713dce30066affcc6..f0bdc7a6c3b4cf7ba559c8c54cb6f21a8efe5486 100644 (file)
--- a/src/attach.c
+++ b/src/attach.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file contains code used to implement the ATTACH and DETACH commands.
 **
-** $Id: attach.c,v 1.29 2005/01/20 11:32:23 danielk1977 Exp $
+** $Id: attach.c,v 1.30 2005/01/23 13:14:55 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -126,6 +126,7 @@ void sqlite3Attach(
   }
 #endif
   sqliteFree(zFile);
+  sqlite3ExpirePreparedStatements(db);
   db->flags &= ~SQLITE_Initialized;
   if( pParse->nErr==0 && rc==SQLITE_OK ){
     rc = sqlite3ReadSchema(pParse);
@@ -190,6 +191,7 @@ void sqlite3Detach(Parse *pParse, Token *pDbname){
   sqlite3BtreeClose(pDb->pBt);
   pDb->pBt = 0;
   sqlite3ResetInternalSchema(db, 0);
+  sqlite3ExpirePreparedStatements(db);
 }
 
 /*
@@ -334,4 +336,3 @@ int sqlite3FixTriggerStep(
   return 0;
 }
 #endif
-

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 4044c2fd306b12a60e425c0b8d9c30a323496824..bb7cb3d4342c638384dededda8aa03c0c17bca7e 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -1193,7 +1193,9 @@ int sqlite3VdbeHalt(Vdbe *p){
   }
   closeAllCursors(p);
   checkActiveVdbeCnt(db);
-  if( db->autoCommit && db->activeVdbeCnt==1 ){
+  if( p->pc<0 ){
+    /* No commit or rollback needed if the program never started */
+  }else if( db->autoCommit && db->activeVdbeCnt==1 ){
     if( p->rc==SQLITE_OK || p->errorAction==OE_Fail ){
       /* The auto-commit flag is true, there are no other active queries
       ** using this handle and the vdbe program was successful or hit an
@@ -1329,6 +1331,9 @@ int sqlite3VdbeReset(Vdbe *p){
 #endif
   p->magic = VDBE_MAGIC_INIT;
   p->aborted = 0;
+  if( p->rc==SQLITE_SCHEMA ){
+    sqlite3ResetInternalSchema(p->db, 0);
+  }
   return p->rc;
 }
  
@@ -1338,18 +1343,13 @@ int sqlite3VdbeReset(Vdbe *p){
 */
 int sqlite3VdbeFinalize(Vdbe *p){
   int rc = SQLITE_OK;
-  sqlite3 *db = p->db;
 
   if( p->magic==VDBE_MAGIC_RUN || p->magic==VDBE_MAGIC_HALT ){
     rc = sqlite3VdbeReset(p);
   }else if( p->magic!=VDBE_MAGIC_INIT ){
-    /* sqlite3Error(p->db, SQLITE_MISUSE, 0); */
     return SQLITE_MISUSE;
   }
   sqlite3VdbeDelete(p);
-  if( rc==SQLITE_SCHEMA ){
-    sqlite3ResetInternalSchema(db, 0);
-  }
   return rc;
 }
 

diff --git a/test/attach.test b/test/attach.test
index 22d6dbd35ea2c56a89c50c69be6783124300dcf2..cac35c66c46a7b58e2d546f21bba9abb4105b725 100644 (file)
--- a/test/attach.test
+++ b/test/attach.test
@@ -12,7 +12,7 @@
 # focus of this script is testing the ATTACH and DETACH commands
 # and related functionality.
 #
-# $Id: attach.test,v 1.35 2005/01/21 15:52:33 drh Exp $
+# $Id: attach.test,v 1.36 2005/01/23 13:14:55 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -360,6 +360,7 @@ do_test attach-3.4 {
 # prevent test2.db from being read by db2.
 do_test attach-3.5 {
   execsql {SELECT * FROM t2}
+btree_breakpoint
   catchsql {
     SELECT * FROM t2;
   } db2;