mod_storage_sql: Allow loops over results to end on their own

diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index a289310b1ac5c82ba907c2921282b6497380a73b..70f1ab83c3a2f40a91f201821a00f7cb21f55ac8 100644 (file)
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -133,15 +133,17 @@ map_store.__index = map_store;
 map_store.remove = {};
 function map_store:get(username, key)
        local ok, result = engine:transaction(function()
+               local data;
                if type(key) == "string" and key ~= "" then
                        for row in engine:select("SELECT `type`, `value` FROM `prosody` WHERE `host`=? AND `user`=? AND `store`=? AND `key`=? LIMIT 1", host, username or "", self.store, key) do
-                               return deserialize(row[1], row[2]);
+                               data = deserialize(row[1], row[2]);
                        end
+                       return data;
                else
                        for row in engine:select("SELECT `type`, `value` FROM `prosody` WHERE `host`=? AND `user`=? AND `store`=? AND `key`=? LIMIT 1", host, username or "", self.store, "") do
-                               local data = deserialize(row[1], row[2]);
-                               return data and data[key] or nil;
+                               data = deserialize(row[1], row[2]);
                        end
+                       return data and data[key] or nil;
                end
        end);
        if not ok then return nil, result; end
@@ -165,7 +167,6 @@ function map_store:set_keys(username, keydatas)
                                local extradata = {};
                                for row in engine:select("SELECT `type`, `value` FROM `prosody` WHERE `host`=? AND `user`=? AND `store`=? AND `key`=? LIMIT 1", host, username or "", self.store, "") do
                                        extradata = deserialize(row[1], row[2]);
-                                       break;
                                end
                                engine:delete("DELETE FROM `prosody` WHERE `host`=? AND `user`=? AND `store`=? AND `key`=?",
                                        host, username or "", self.store, "");
@@ -260,8 +261,9 @@ function archive_store:find(username, query)
                if query.total then
                        local stats = engine:select("SELECT COUNT(*) FROM `prosodyarchive` WHERE " .. t_concat(where, " AND "), unpack(args));
                        if stats then
-                               local _total = stats()
-                               total = _total and _total[1];
+                               for row in stats do
+                                       total = row[1];
+                               end
                        end
                        if query.limit == 0 then -- Skip the real query
                                return noop, total;