When dropping a table, update the sqlite_sequence table first, as auto-vacuum mode...

FossilOrigin-Name: 0514107bff970ab1e5ce96c8b1fa13dcbf75cb71

diff --git a/manifest b/manifest
index b6087f7cb43803b99e6d891e8ccb9402c80b1eb0..82ea964d06ca3424029df3ad73348189e0b63731 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sbugs\sin\sALTER\sTABLE\srelated\sto\s(a)\swhitespace\sin\stable\sdefn,\s(b)\stemp\striggers.\s(CVS\s2112)
-D 2004-11-19T05:14:55
+C When\sdropping\sa\stable,\supdate\sthe\ssqlite_sequence\stable\sfirst,\sas\sauto-vacuum\smode\smay\sneed\sto\smove\ssqlite_sequence\swhen\sthe\sbtree\stable\sis\sdropped.\s(CVS\s2113)
+D 2004-11-19T07:07:31
 F Makefile.in e747bb5ba34ccbdd81f79dcf1b2b33c02817c21d
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -31,7 +31,7 @@ F src/attach.c e49d09dad9f5f9fb10b4b0c1be5a70ae4c45e689
 F src/auth.c 3b81f2a42f48a62c2c9c9b0eda31a157c681edea
 F src/btree.c 49b09718cd988d1c7c981b03e94679bc10b5f711
 F src/btree.h 861e40b759a195ba63819740e484390012cf81ab
-F src/build.c 467e940702206e950d810e765586a787ec06dd5b
+F src/build.c 27897ee30d914e503cc948370858ed54c940d4bf
 F src/date.c 65536e7ea04fdde6e0551264fca15966966e171f
 F src/delete.c be9d039b819f4a5d0fdfaeceace139ba189ef819
 F src/expr.c 4ee3e47358c92a919062255b14057a7a8f641e01
@@ -64,7 +64,7 @@ F src/sqlite.h.in a44eac0716bf4751447160d5c8ed049ece66d45a
 F src/sqliteInt.h dd26056a172a5d488a78846b5ed8db6953db4e5d
 F src/table.c 25b3ff2b39b7d87e8d4a5da0713d68dfc06cbee9
 F src/tclsqlite.c 7f1a1a678140e6901c8954590ca2aabe50b48f71
-F src/test1.c 8c330b53aa04d234ea7da6a90141ce9958a8901c
+F src/test1.c 33818d5894681236240daaea1d379b463c7e9019
 F src/test2.c b11fa244fff02190707dd0879987c37c75e61fc8
 F src/test3.c 6f1ec93e13632a004b527049535079eda84c459d
 F src/test4.c 7c6b9fc33dd1f3f93c7f1ee6e5e6d016afa6c1df
@@ -259,7 +259,7 @@ F www/tclsqlite.tcl 560ecd6a916b320e59f2917317398f3d59b7cc25
 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl fdacb0ba2d39831e8a6240d05a490026ad4c4e4c
-P c61b7de107cea76b561d0d6cd90c752b62c5df95
-R 2dccc389e14622418d8f9c23b5390305
+P 1fd8e835a3656799c23f4ef6ea1311fecf5a15cb
+R f7502d84d016bfe7e59d6b1281918ee0
 U danielk1977
-Z dfa16d84296b817116f68efa4f87c5bd
+Z aee34b960e1efd640d84c3f0d865dd8b

diff --git a/manifest.uuid b/manifest.uuid
index 83e2ddd389afdcdc32764156c5de6a3c78066892..d774a15f4946b7efed982baa61e399cabb770a69 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1fd8e835a3656799c23f4ef6ea1311fecf5a15cb
\ No newline at end of file
+0514107bff970ab1e5ce96c8b1fa13dcbf75cb71
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index 4e035a734f0b5e9ca778719c68f256a13f325fa5..6bb6b49a91b58a8665602e61ca82ec08c91115ab 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -22,7 +22,7 @@
 **     COMMIT
 **     ROLLBACK
 **
-** $Id: build.c,v 1.281 2004/11/19 05:14:55 danielk1977 Exp $
+** $Id: build.c,v 1.282 2004/11/19 07:07:31 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -1840,6 +1840,20 @@ void sqlite3DropTable(Parse *pParse, SrcList *pName, int isView){
       pTrigger = pTrigger->pNext;
     }
 
+#ifndef SQLITE_OMIT_AUTOINCREMENT
+    /* Remove any entries of the sqlite_sequence table associated with
+    ** the table being dropped. This is done before the table is dropped
+    ** at the btree level, in case the sqlite_sequence table needs to
+    ** move as a result of the drop (can happen in auto-vacuum mode).
+    */
+    if( pTab->autoInc ){
+      sqlite3NestedParse(pParse,
+        "DELETE FROM %s.sqlite_sequence WHERE name=%Q",
+        pDb->zName, pTab->zName
+      );
+    }
+#endif
+
     /* Drop all SQLITE_MASTER table and index entries that refer to the
     ** table. The program name loops through the master table and deletes
     ** every row that refers to a table of the same name as the one being
@@ -1854,17 +1868,6 @@ void sqlite3DropTable(Parse *pParse, SrcList *pName, int isView){
       destroyTable(pParse, pTab);
     }
 
-#ifndef SQLITE_OMIT_AUTOINCREMENT
-    /* Remove any entries of the sqlite_sequence table associated with
-    ** the table being dropped */
-    if( pTab->autoInc ){
-      sqlite3NestedParse(pParse,
-        "DELETE FROM %s.sqlite_sequence WHERE name=%Q",
-        pDb->zName, pTab->zName
-      );
-    }
-#endif
-
     /* Remove the table entry from SQLite's internal schema
     */
     sqlite3VdbeOp3(v, OP_DropTable, iDb, 0, pTab->zName, 0);

diff --git a/src/test1.c b/src/test1.c
index 85c02087d99f2ef036831e13b6a3f94c6852749d..8280bcad104025b5fbf23929da19d4b728c4d4d9 100644 (file)
--- a/src/test1.c
+++ b/src/test1.c
@@ -13,7 +13,7 @@
 ** is not included in the SQLite library.  It is used for automated
 ** testing of the SQLite library.
 **
-** $Id: test1.c,v 1.114 2004/11/14 21:56:30 drh Exp $
+** $Id: test1.c,v 1.115 2004/11/19 07:07:31 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -2516,7 +2516,7 @@ static void set_options(Tcl_Interp *interp){
 #else
   Tcl_SetVar2(interp, "sqlite_options", "autovacuum", "1", TCL_GLOBAL_ONLY);
 #endif /* SQLITE_OMIT_AUTOVACUUM */
-#if !defined(SQLITE_DEFAULT_AUTOVACCUM) || SQLITE_DEFAULT_AUTOVACUUM==0
+#if !defined(SQLITE_DEFAULT_AUTOVACUUM) || SQLITE_DEFAULT_AUTOVACUUM==0
   Tcl_SetVar2(interp,"sqlite_options","default_autovacuum","0",TCL_GLOBAL_ONLY);
 #else
   Tcl_SetVar2(interp,"sqlite_options","default_autovacuum","1",TCL_GLOBAL_ONLY);