diff options
| author | drh <drh@noemail.net> | 2012-05-22 13:01:39 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2012-05-22 13:01:39 +0000 |
| commit | e56467fc9ffdf634b939c33886e6513fc27376c3 (patch) | |
| tree | 0c81cbc3359f436a9b22bb80f91021b37e0e24f7 /src/shell.c | |
| parent | 7b9370a445ad58213953264377be9124ef01c127 (diff) | |
| parent | 3773b29167a13af8c8cb1cef14dda5772f0a2232 (diff) | |
| download | sqlite-e56467fc9ffdf634b939c33886e6513fc27376c3.tar.gz sqlite-e56467fc9ffdf634b939c33886e6513fc27376c3.zip | |
Version 3.7.12.1
FossilOrigin-Name: d07b7b67d1b3bf65cfe8d96d45a7f1d387bea7ce
Diffstat (limited to 'src/shell.c')
| -rw-r--r-- | src/shell.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/shell.c b/src/shell.c index 73341fc3c..801ad2ca2 100644 --- a/src/shell.c +++ b/src/shell.c @@ -2184,23 +2184,25 @@ static int do_meta_command(char *zLine, struct callback_data *p){ zShellStatic = azArg[1]; rc = sqlite3_exec(p->db, "SELECT sql FROM " - " (SELECT sql sql, type type, tbl_name tbl_name, name name" + " (SELECT sql sql, type type, tbl_name tbl_name, name name, rowid x" " FROM sqlite_master UNION ALL" - " SELECT sql, type, tbl_name, name FROM sqlite_temp_master) " + " SELECT sql, type, tbl_name, name, rowid FROM sqlite_temp_master) " "WHERE lower(tbl_name) LIKE shellstatic()" " AND type!='meta' AND sql NOTNULL " - "ORDER BY substr(type,2,1), name", + "ORDER BY substr(type,2,1), " + " CASE type WHEN 'view' THEN rowid ELSE name END", callback, &data, &zErrMsg); zShellStatic = 0; } }else{ rc = sqlite3_exec(p->db, "SELECT sql FROM " - " (SELECT sql sql, type type, tbl_name tbl_name, name name" + " (SELECT sql sql, type type, tbl_name tbl_name, name name, rowid x" " FROM sqlite_master UNION ALL" - " SELECT sql, type, tbl_name, name FROM sqlite_temp_master) " + " SELECT sql, type, tbl_name, name, rowid FROM sqlite_temp_master) " "WHERE type!='meta' AND sql NOTNULL AND name NOT LIKE 'sqlite_%'" - "ORDER BY substr(type,2,1), name", + "ORDER BY substr(type,2,1)," + " CASE type WHEN 'view' THEN rowid ELSE name END", callback, &data, &zErrMsg ); } |