diff options
| author | Kim Alvefur <zash@zash.se> | 2019-05-13 14:47:41 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-05-13 14:47:41 +0200 |
| commit | 6bf96583fa7a3b1919815408dc9e1fecfe90af77 (patch) | |
| tree | 37b8ec274c2f8c0074f5184e8c1f82195b97f4bb | |
| parent | 36ec6ce8ab02e62c83ca39dfd6616a1bfa753968 (diff) | |
| download | prosody-6bf96583fa7a3b1919815408dc9e1fecfe90af77.tar.gz prosody-6bf96583fa7a3b1919815408dc9e1fecfe90af77.zip | |
mod_storage_sql: Move code out of if-else chain
| -rw-r--r-- | plugins/mod_storage_sql.lua | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua index 56cef569..dbf5e2da 100644 --- a/plugins/mod_storage_sql.lua +++ b/plugins/mod_storage_sql.lua @@ -390,6 +390,14 @@ function archive_store:delete(username, query) else args[#args+1] = query.truncate; local unlimited = "ALL"; + sql_query = [[ + DELETE FROM "prosodyarchive" + WHERE "sort_id" IN ( + SELECT "sort_id" FROM "prosodyarchive" + WHERE %s + ORDER BY "sort_id" %s + LIMIT %s OFFSET ? + );]]; if engine.params.driver == "SQLite3" then sql_query = [[ DELETE FROM "prosodyarchive" @@ -407,15 +415,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); |