diff options
| author | Kim Alvefur <zash@zash.se> | 2017-01-23 19:34:14 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-01-23 19:34:14 +0100 |
| commit | 468d3db1a1eb87026d20303eeda6ff46d459df80 (patch) | |
| tree | ea895b1073f2ff2de7a08fc01f12797ab58c7125 /plugins/mod_storage_sql.lua | |
| parent | 4c567124f67372cba0b688120eb726ab543b8bf1 (diff) | |
| parent | b54ba7235144f22208ce22ca31da705a62531935 (diff) | |
| download | prosody-468d3db1a1eb87026d20303eeda6ff46d459df80.tar.gz prosody-468d3db1a1eb87026d20303eeda6ff46d459df80.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_storage_sql.lua')
| -rw-r--r-- | plugins/mod_storage_sql.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua index 50d9cd0f..7bbae40c 100644 --- a/plugins/mod_storage_sql.lua +++ b/plugins/mod_storage_sql.lua @@ -287,7 +287,7 @@ end function archive_store:delete(username, query) query = query or {}; local user,store = username,self.store; - return engine:transaction(function() + local stmt, err = engine:transaction(function() local sql_query = "DELETE FROM `prosodyarchive` WHERE %s;"; local args = { host, user or "", store, }; local where = { "`host` = ?", "`user` = ?", "`store` = ?", }; @@ -300,6 +300,7 @@ function archive_store:delete(username, query) 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; end local stores = { |