aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/storagemanager.lua33
-rw-r--r--spec/core_storagemanager_spec.lua11
2 files changed, 37 insertions, 7 deletions
diff --git a/core/storagemanager.lua b/core/storagemanager.lua
index dea71733..14de1314 100644
--- a/core/storagemanager.lua
+++ b/core/storagemanager.lua
@@ -167,6 +167,39 @@ local map_shim_mt = {
return self.keyval_store:set(username, current);
end;
remove = {};
+ find_key = function (self, key)
+ if type(key) ~= "string" or key == "" then
+ return nil, "find_key only supports non-empty string keys";
+ end
+ local ret;
+ for username in self.keyval_store:users() do
+ local key_data = self:get(username, key);
+ if key_data then
+ if not ret then
+ ret = {};
+ end
+ ret[username] = key_data;
+ end
+ end
+ return ret;
+ end;
+ delete_key = function (self, key)
+ if type(key) ~= "string" or key == "" then
+ return nil, "delete_key only supports non-empty string keys";
+ end
+ local data = { [key] = self.remove };
+ local last_err;
+ for username in self.keyval_store:users() do
+ local ok, err = self:set_keys(username, data);
+ if not ok then
+ last_err = err;
+ end
+ end
+ if last_err then
+ return nil, last_err;
+ end
+ return true;
+ end;
};
}
diff --git a/spec/core_storagemanager_spec.lua b/spec/core_storagemanager_spec.lua
index dd80f4b8..848f7910 100644
--- a/spec/core_storagemanager_spec.lua
+++ b/spec/core_storagemanager_spec.lua
@@ -62,9 +62,6 @@ describe("storagemanager", function ()
sm.initialize_host(test_host);
assert(mm.load(test_host, "storage_"..backend_config.storage));
- local sql_it = backend_config.sql and it or pending;
-
-
describe("key-value stores", function ()
-- These tests rely on being executed in order, disable any order
-- randomization for this block
@@ -116,7 +113,7 @@ describe("storagemanager", function ()
assert.equal("bar", store:get("user9999", "foo"));
end);
- sql_it("may find all users with a specific key", function ()
+ it("may find all users with a specific key", function ()
assert.is_function(store.find_key);
assert(store:set("user9999b", "bar", "bar"));
assert(store:set("user9999c", "foo", "blah"));
@@ -125,7 +122,7 @@ describe("storagemanager", function ()
assert.same({ user9999 = "bar", user9999c = "blah" }, ret);
end);
- sql_it("rejects empty or non-string keys to find_key", function ()
+ it("rejects empty or non-string keys to find_key", function ()
assert.is_function(store.find_key);
do
local ret, err = store:find_key("");
@@ -139,7 +136,7 @@ describe("storagemanager", function ()
end
end);
- sql_it("rejects empty or non-string keys to delete_key", function ()
+ it("rejects empty or non-string keys to delete_key", function ()
assert.is_function(store.delete_key);
do
local ret, err = store:delete_key("");
@@ -153,7 +150,7 @@ describe("storagemanager", function ()
end
end);
- sql_it("may delete all instances of a specific key", function ()
+ it("may delete all instances of a specific key", function ()
assert.is_function(store.delete_key);
assert(store:set("user9999b", "foo", "hello"));