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 | f240b6bd4dcc33c040ca3913ce54d3d31c4dbf1b (patch) | |
| tree | 961993cab2a02c20c789b381d93a74a8d74164fe /plugins/mod_storage_sql2.lua | |
| parent | 667f75150d48db1815d8566228a41e9290fe163e (diff) | |
| parent | 6a177d7ad6517cd53943c4e03d2bac578d251108 (diff) | |
| download | prosody-f240b6bd4dcc33c040ca3913ce54d3d31c4dbf1b.tar.gz prosody-f240b6bd4dcc33c040ca3913ce54d3d31c4dbf1b.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 |