Index: src/shell.c.in
==================================================================
--- src/shell.c.in
+++ src/shell.c.in
@@ -6288,10 +6288,15 @@
     if( bIntkey==bSqlIntkey ){
       int i;
       const char *zPk = "_rowid_";
       sqlite3_stmt *pPkFinder = 0;
 
+      /* If this is an intkey table and there is an INTEGER PRIMARY KEY,
+      ** set zPk to the name of the PK column, and pTab->iPk to the index
+      ** of the column, where columns are 0-numbered from left to right.
+      ** Or, if this is a WITHOUT ROWID table or if there is no IPK column,
+      ** leave zPk as "_rowid_" and pTab->iPk at -2.  */
       pTab->iPk = -2;
       if( bIntkey ){
         shellPreparePrintf(dbtmp, &rc, &pPkFinder, 
           "SELECT cid, name FROM pragma_table_info(%Q) "
           "  WHERE pk=1 AND type='integer' COLLATE nocase"
@@ -6315,13 +6320,15 @@
         pTab->azlCol[0] = shellMPrintf(&rc, "");
       }
       i = 1;
       shellPreparePrintf(dbtmp, &rc, &pStmt, 
           "SELECT %Q || group_concat(name, ', ') "
-          "  FILTER (WHERE cid!=%d) OVER (ORDER BY cid) "
+          "  FILTER (WHERE cid!=%d) OVER (ORDER BY %s cid) "
           "FROM pragma_table_info(%Q)", 
-          bIntkey ? ", " : "", pTab->iPk, zName
+          bIntkey ? ", " : "", pTab->iPk, 
+          bIntkey ? "" : "(CASE WHEN pk=0 THEN 1000000 ELSE pk END), ",
+          zName
       );
       while( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pStmt) ){
         const char *zText = (const char*)sqlite3_column_text(pStmt, 0);
         pTab->azlCol[i] = shellMPrintf(&rc, "%s%s", pTab->azlCol[0], zText);
         i++;

Index: test/recover.test
==================================================================
--- test/recover.test
+++ test/recover.test
@@ -82,7 +82,18 @@
   INSERT INTO t3 VALUES(NULL, 3, 4);
   INSERT INTO t3 VALUES(NULL, 5, 6);
   DELETE FROM t2;
 "
 do_recover_test 1.3.2
+
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 2.1.0 {
+  CREATE TABLE t1(a, b, c, PRIMARY KEY(b, c)) WITHOUT ROWID;
+  INSERT INTO t1 VALUES(1, 2, 3);
+  INSERT INTO t1 VALUES(4, 5, 6);
+  INSERT INTO t1 VALUES(7, 8, 9);
+}
+
+do_recover_test 2.1.1
 
 finish_test