Software / code / prosody
Changeset
7859:9eb13c14eaab
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 24 Jan 2017 19:27:17 +0100 |
| parents | 7857:db48b1697234 (current diff) 7858:14fe60a65c69 (diff) |
| children | 7861:58dbe5afeb4a |
| files | plugins/mod_storage_sql.lua |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_storage_sql.lua Mon Jan 23 19:34:14 2017 +0100 +++ b/plugins/mod_storage_sql.lua Tue Jan 24 19:27:17 2017 +0100 @@ -287,7 +287,7 @@ function archive_store:delete(username, query) query = query or {}; local user,store = username,self.store; - local stmt, err = engine:transaction(function() + local ok, stmt = engine:transaction(function() local sql_query = "DELETE FROM `prosodyarchive` WHERE %s;"; local args = { host, user or "", store, }; local where = { "`host` = ?", "`user` = ?", "`store` = ?", }; @@ -300,7 +300,7 @@ sql_query = sql_query:format(t_concat(where, " AND ")); return engine:delete(sql_query, unpack(args)); end); - return stmt and stmt:affected() or nil, err; + return ok and stmt:affected(), stmt; end local stores = {
