From: drh <drh@noemail.net>
Date: Thu, 21 May 2009 14:51:03 +0000 (+0000)
Subject: In the CLI, always "dump" the sqlite_sequence table last.  Ticket #3867 (CVS 6663)
X-Git-Tag: version-3.6.15~94
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f32476cea22e03706c1c3d553ea641ecf91343d;p=thirdparty%2Fsqlite.git

In the CLI, always "dump" the sqlite_sequence table last.  Ticket #3867 (CVS 6663)

FossilOrigin-Name: a0028d4808275cb1d020d56344d90b2a04603f4d
---

diff --git a/manifest b/manifest
index 9b634913f1..6e0bd84187 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sconditional\s'extern\s"C"'\sblock\sto\ssqlite3async.h.\sTicket\s#3866.\s(CVS\s6662)
-D 2009-05-21T04:42:19
+C In\sthe\sCLI,\salways\s"dump"\sthe\ssqlite_sequence\stable\slast.\s\sTicket\s#3867\s(CVS\s6663)
+D 2009-05-21T14:51:03
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -159,7 +159,7 @@ F src/random.c 676b9d7ac820fe81e6fb2394ac8c10cff7f38628
 F src/resolve.c 2ce8f8bc8a0c913cbaec3fb3da2be113ea1fa5af
 F src/rowset.c 14d12b5e81b5907b87d511f6f4219805f96a4b55
 F src/select.c 88e654ab5b183e4fdb084680b66b5bfa6f214dc5
-F src/shell.c 0a11f831603f17fea20ca97133c0f64e716af4a7
+F src/shell.c 7d20ab57cac411a4798335ede7d8d292cb2d2d4c
 F src/sqlite.h.in 0c459a45c1047be24c6a58646e8be4d001a3a28a
 F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17
 F src/sqliteInt.h b4cc76a99bc82894703528376067c743eb27184c
@@ -729,7 +729,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 02b77a582c65e0eb45eb1a9abbdeef11f52d7ce6
-R 5dee58232ac007b699cd00a9ed856dbe
-U danielk1977
-Z 54642730f8a50d1656fd2e466c93cfd5
+P e4d1b117c90dca341bfa74291c7dfc2afca38cc6
+R 15bc7524b83192070e8332740e3dd7dd
+U drh
+Z 80201cfb6f117152d032ea15d9f61e5f
diff --git a/manifest.uuid b/manifest.uuid
index 921be98f7c..26ccf9d537 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e4d1b117c90dca341bfa74291c7dfc2afca38cc6
\ No newline at end of file
+a0028d4808275cb1d020d56344d90b2a04603f4d
\ No newline at end of file
diff --git a/src/shell.c b/src/shell.c
index d58f151acd..fc2f43f61e 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -12,7 +12,7 @@
 ** This file contains code to implement the "sqlite" command line
 ** utility for accessing SQLite databases.
 **
-** $Id: shell.c,v 1.207 2009/03/16 10:59:44 drh Exp $
+** $Id: shell.c,v 1.208 2009/05/21 14:51:03 drh Exp $
 */
 #if defined(_WIN32) || defined(WIN32)
 /* This needs to come before any includes for MSVC compiler */
@@ -2080,7 +2080,11 @@ static int do_meta_command(char *zLine, struct callback_data *p){
     if( nArg==1 ){
       run_schema_dump_query(p, 
         "SELECT name, type, sql FROM sqlite_master "
-        "WHERE sql NOT NULL AND type=='table'", 0
+        "WHERE sql NOT NULL AND type=='table' AND name!='sqlite_sequence'", 0
+      );
+      run_schema_dump_query(p, 
+        "SELECT name, type, sql FROM sqlite_master "
+        "WHERE name=='sqlite_sequence'", 0
       );
       run_table_dump_query(p->out, p->db,
         "SELECT sql FROM sqlite_master "