diff options
author | Matthew Wild <mwild1@gmail.com> | 2014-01-12 06:27:55 -0500 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2014-01-12 06:27:55 -0500 |
commit | 60930944219fcc8ff4bdb90e56a901a13f21c21d (patch) | |
tree | 961993cab2a02c20c789b381d93a74a8d74164fe /plugins/mod_storage_sql2.lua | |
parent | 524a2f832d394c4f46eaeba0516a9916ec02ae8b (diff) | |
parent | d41e94de0746b73db19365c003f7349481965c9a (diff) | |
download | prosody-60930944219fcc8ff4bdb90e56a901a13f21c21d.tar.gz prosody-60930944219fcc8ff4bdb90e56a901a13f21c21d.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_storage_sql2.lua')
-rw-r--r-- | plugins/mod_storage_sql2.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_storage_sql2.lua b/plugins/mod_storage_sql2.lua index a97bee58..8c8728da 100644 --- a/plugins/mod_storage_sql2.lua +++ b/plugins/mod_storage_sql2.lua @@ -263,12 +263,12 @@ local function archive_where_id_range(query, args, where) local args_len = #args -- Before or after specific item, exclusive if query.after then -- keys better be unique! - where[#where+1] = "`sort_id` > (SELECT `sort_id` FROM `prosodyarchive` WHERE `key` = ? AND `host` = ?`AND user` = ?`AND store` = ? LIMIT 1)" + where[#where+1] = "`sort_id` > (SELECT `sort_id` FROM `prosodyarchive` WHERE `key` = ? AND `host` = ?` AND user` = ?` AND store` = ? LIMIT 1)" args[args_len+1], args[args_len+2], args[args_len+3], args[args_len+4] = query.after, args[1], args[2], args[3]; args_len = args_len + 4 end if query.before then - where[#where+1] = "`sort_id` < (SELECT `sort_id` FROM `prosodyarchive` WHERE `key` = ? AND `host` = ?`AND user` = ?`AND store` = ? LIMIT 1)" + where[#where+1] = "`sort_id` < (SELECT `sort_id` FROM `prosodyarchive` WHERE `key` = ? AND `host` = ?` AND user` = ?` AND store` = ? LIMIT 1)" args[args_len+1], args[args_len+2], args[args_len+3], args[args_len+4] = query.before, args[1], args[2], args[3]; end end |