diff options
| author | Kim Alvefur <zash@zash.se> | 2014-04-10 13:16:54 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-04-10 13:16:54 +0200 |
| commit | 87020b4789013b1d8ff33d7929d455392b1d9638 (patch) | |
| tree | 521b9634144ac84ea608dbe47a15a0bcd1951695 /plugins/mod_storage_sql2.lua | |
| parent | 35ef31bd9b827f325f17180dfa77a66578df0983 (diff) | |
| parent | ae8a4fb909a0cce10a12e9ced65e45ef2d1495fa (diff) | |
| download | prosody-87020b4789013b1d8ff33d7929d455392b1d9638.tar.gz prosody-87020b4789013b1d8ff33d7929d455392b1d9638.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_storage_sql2.lua')
| -rw-r--r-- | plugins/mod_storage_sql2.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_storage_sql2.lua b/plugins/mod_storage_sql2.lua index 7a2ec4a7..7414e5ed 100644 --- a/plugins/mod_storage_sql2.lua +++ b/plugins/mod_storage_sql2.lua @@ -289,7 +289,7 @@ function archive_store:find(username, query) -- Total matching if query.total then - local stats = engine:select(sql_query:gsub("^(SELECT).-(FROM)", "%1 COUNT(*) %2"):format(t_concat(where, " AND "), "DESC", ""), unpack(args)); + local stats = engine:select("SELECT COUNT(*) FROM `prosodyarchive` WHERE " .. t_concat(where, " AND "), unpack(args)); if stats then local _total = stats() total = _total and _total[1]; |