From: Sean Bright Date: Mon, 16 Jan 2012 17:12:36 +0000 (+0000) Subject: Sort the output of 'database showkey' as well. X-Git-Tag: 11.0.0-beta1~782 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=409751e2dc5fe9e5973de9f3c989809f89f7b660;p=thirdparty%2Fasterisk.git Sort the output of 'database showkey' as well. You can pass wildcards (%) to the database CLI commands, so this will sort the returned list of matches. ........ Merged revisions 350978 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@350979 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/db.c b/main/db.c index 381931b489..8778554ed4 100644 --- a/main/db.c +++ b/main/db.c @@ -121,7 +121,7 @@ DEFINE_SQL_STATEMENT(deltree_stmt, "DELETE FROM astdb WHERE key || '/' LIKE ? || DEFINE_SQL_STATEMENT(deltree_all_stmt, "DELETE FROM astdb") DEFINE_SQL_STATEMENT(gettree_stmt, "SELECT key, value FROM astdb WHERE key || '/' LIKE ? || '/' || '%' ORDER BY key") DEFINE_SQL_STATEMENT(gettree_all_stmt, "SELECT key, value FROM astdb ORDER BY key") -DEFINE_SQL_STATEMENT(showkey_stmt, "SELECT key, value FROM astdb WHERE key LIKE '%' || '/' || ?") +DEFINE_SQL_STATEMENT(showkey_stmt, "SELECT key, value FROM astdb WHERE key LIKE '%' || '/' || ? ORDER BY key") DEFINE_SQL_STATEMENT(create_astdb_stmt, "CREATE TABLE IF NOT EXISTS astdb(key VARCHAR(256), value VARCHAR(256), PRIMARY KEY(key))") static int init_stmt(sqlite3_stmt **stmt, const char *sql, size_t len)