Comparison

Merge 0.9->trunk

comparison

equal deleted inserted replaced

-:cbcd173ad906
+:1443d1c37c6c
 		return setmetatable({ store = store }, keyval_store);
 	end
 	return nil, "unsupported-store";
 end
-function driver:list_stores(username) -- Not to be confused with the list store type
+function driver:stores(username)
-	local sql = (username == true
+	local sql = "SELECT DISTINCT `store` FROM `prosody` WHERE `host`=? AND `user`" ..
-		and "SELECT DISTINCT `store` FROM `prosody` WHERE `host`=? AND `user`!=?"
+		(username == true and "!=?" or "=?");
-		or  "SELECT DISTINCT `store` FROM `prosody` WHERE `host`=? AND `user`=?");
 	if username == true or not username then
 		username = "";
 	end
 	local stmt, err = dosql(sql, host, username);
 	if not stmt then
 		return rollback(nil, err);
 	end
-	local stores = {};
+	local next = stmt:rows();
-	for row in stmt:rows() do
+	return commit(function()
-		stores[#stores+1] = row[1];
+		local row = next();
-	end
+		return row and row[1];
-	return commit(stores);
+	end);
 end
 function driver:purge(username)
 	local stmt, err = dosql("DELETE FROM `prosody` WHERE `host`=? AND `user`=?", host, username);
 	if not stmt then return rollback(stmt, err); end