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

Merge 0.11->trunk

Browse source
This commit is contained in:
Kim Alvefur 2019-05-26 19:41:58 +02:00
commit 48d6fa1aa1
3 changed files with 33 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

36
plugins/mod_storage_sql.lua
View file

@ -472,13 +472,23 @@ function archive_store:delete(username, query)
else
args[#args+1] = query.truncate;
local unlimited = "ALL";
if engine.params.driver == "SQLite3" then
sql_query = [[
DELETE FROM "prosodyarchive"
sql_query = [[
DELETE FROM "prosodyarchive"
WHERE "sort_id" IN (
SELECT "sort_id" FROM "prosodyarchive"
WHERE %s
ORDER BY "sort_id" %s
LIMIT %s OFFSET ?;
]];
LIMIT %s OFFSET ?
);]];
if engine.params.driver == "SQLite3" then
if engine._have_delete_limit then
sql_query = [[
DELETE FROM "prosodyarchive"
WHERE %s
ORDER BY "sort_id" %s
LIMIT %s OFFSET ?;
]];
end
unlimited = "-1";
elseif engine.params.driver == "MySQL" then
sql_query = [[
@ -489,15 +499,6 @@ function archive_store:delete(username, query)
LIMIT %s OFFSET ?
) AS limiter on result.sort_id = limiter.sort_id;]];
unlimited = "18446744073709551615";
else
sql_query = [[
DELETE FROM "prosodyarchive"
WHERE "sort_id" IN (
SELECT "sort_id" FROM "prosodyarchive"
WHERE %s
ORDER BY "sort_id" %s
LIMIT %s OFFSET ?
);]];
end
sql_query = string.format(sql_query, t_concat(where, " AND "),
query.reverse and "ASC" or "DESC", unlimited);
@ -718,6 +719,13 @@ function module.load()
module:log("error", "Old database format detected. Please run: prosodyctl mod_%s upgrade", module.name);
return false, "database upgrade needed";
end
if engine.params.driver == "SQLite3" then
for row in engine:select("PRAGMA compile_options") do
if row[1] == "ENABLE_UPDATE_DELETE_LIMIT" then
engine._have_delete_limit = true;
end
end
end
end
end);
engines[sql.db2uri(params)] = engine;