Get VACUUM working with virtual tables. (CVS 3404)

FossilOrigin-Name: d5ffef3870f06d2dd744ce9470d3c0e68062e804

diff --git a/manifest b/manifest
index 7a8bdbdc245d5f7a2412f438dbfe4b06f2e39643..d908fd5e9d68ea6e460b4e357fddede917ae6ac3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\srudimentary\stokenizer\sand\sparser\sto\sFTS1\sfor\sparsing\sthe\smodule\narguments\sduring\sinitialization.\s\s\sRecognized\sarguments\sinclude\sa\ntokenizer\sselector\sand\sa\slist\sof\svirtual\stable\scolumns.\s(CVS\s3403)
-D 2006-09-11T00:34:22
+C Get\sVACUUM\sworking\swith\svirtual\stables.\s(CVS\s3404)
+D 2006-09-11T11:13:27
 F Makefile.in cabd42d34340f49260bc2a7668c38eba8d4cfd99
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -111,7 +111,7 @@ F src/trigger.c 0fc40125820409a6274834a6e04ad804d96e2793
 F src/update.c 951f95ef044cf6d28557c48dc35cb0711a0b9129
 F src/utf.c 4459801e9b00cfd69993bfca58545d3775682d6e
 F src/util.c 5409031819ee4672c5f9c3ac7cf517e267a25845
-F src/vacuum.c 5b37d0f436f8e1ffacd17934e44720b38d2247f9
+F src/vacuum.c 5dac7938d70bf0cb5182a291c8605e69cde2398d
 F src/vdbe.c a77869949ddd0afe01443611edb949e24e67c91c
 F src/vdbe.h 258b5d1c0aaa72192f09ff0568ce42b383f156fa
 F src/vdbeInt.h e3eaab262b67b84474625cfc38aec1125c32834b
@@ -397,7 +397,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P f44b8bae97b6872524580009c96d07391578c388
-R 9998640c1fac069b758db49fd22e886b
+P 227dc3feb537e6efd5b0c1d2dad40193db07d5aa
+R c821cee55c3f4e8fdfcd092fa19a7e1a
 U drh
-Z 2b1ea65d3e0e9f0fb73f4523c49b6c09
+Z ab0686f184c2e0785ce95f3b8f82b4c4

diff --git a/manifest.uuid b/manifest.uuid
index f8df3da2949086bf522267fea0b629c8fa00f908..502aaf35b3d9965de6c8a40c60c49bfa196acc0d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-227dc3feb537e6efd5b0c1d2dad40193db07d5aa
\ No newline at end of file
+d5ffef3870f06d2dd744ce9470d3c0e68062e804
\ No newline at end of file

diff --git a/src/vacuum.c b/src/vacuum.c
index 07a22385976b52df33f4cce0b04ffa13393c8a16..f15648c3d20f232f4a7d5b8ea233a90ccd2c90c3 100644 (file)
--- a/src/vacuum.c
+++ b/src/vacuum.c
@@ -14,7 +14,7 @@
 ** Most of the code in this file may be omitted by defining the
 ** SQLITE_OMIT_VACUUM macro.
 **
-** $Id: vacuum.c,v 1.59 2006/02/24 02:53:50 drh Exp $
+** $Id: vacuum.c,v 1.60 2006/09/11 11:13:27 drh Exp $
 */
 #include "sqliteInt.h"
 #include "vdbeInt.h"
@@ -188,9 +188,18 @@ int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db){
   /* Query the schema of the main database. Create a mirror schema
   ** in the temporary database.
   */
+  rc = execSql(db,
+      "INSERT INTO vacuum_db.sqlite_master "
+      "  SELECT 'table', name, name, 0, sql"
+      "    FROM sqlite_master"
+      "   WHERE type='table' AND rootpage==0"
+  );
+  if( rc ) goto end_of_vacuum;
   rc = execExecSql(db, 
       "SELECT 'CREATE TABLE vacuum_db.' || substr(sql,14,100000000) "
-      "  FROM sqlite_master WHERE type='table' AND name!='sqlite_sequence'");
+      "  FROM sqlite_master WHERE type='table' AND name!='sqlite_sequence'"
+      "   AND rootpage>0"
+  );
   if( rc!=SQLITE_OK ) goto end_of_vacuum;
   rc = execExecSql(db, 
       "SELECT 'CREATE INDEX vacuum_db.' || substr(sql,14,100000000)"
@@ -214,7 +223,9 @@ int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db){
       "SELECT 'INSERT INTO vacuum_db.' || quote(name) "
       "|| ' SELECT * FROM ' || quote(name) || ';'"
       "FROM sqlite_master "
-      "WHERE type = 'table' AND name!='sqlite_sequence';"
+      "WHERE type = 'table' AND name!='sqlite_sequence' "
+      "  AND rootpage>0"
+
   );
   if( rc!=SQLITE_OK ) goto end_of_vacuum;