mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.12->trunk

Browse source
This commit is contained in:
Kim Alvefur 2022-07-29 17:10:31 +02:00
commit 9a375e4444
3 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/mod_storage_sql.lua
View file

@ -543,8 +543,7 @@ function archive_store:summary(username, query)
SELECT DISTINCT "with", COUNT(*), MIN("when"), MAX("when")
FROM "prosodyarchive"
WHERE %s
GROUP BY "with"
ORDER BY "sort_id" %s%s;
GROUP BY "with";
]];
local args = { host, user or "", store, };
local where = { "\"host\" = ?", "\"user\" = ?", "\"store\" = ?", };
@ -557,8 +556,7 @@ function archive_store:summary(username, query)
args[#args+1] = query.limit;
end
sql_query = sql_query:format(t_concat(where, " AND "), query.reverse
and "DESC" or "ASC", query.limit and " LIMIT ?" or "");
sql_query = sql_query:format(t_concat(where, " AND "));
return engine:select(sql_query, unpack(args));
end);
if not ok then return ok, result end