Changeset

6283:7cf6d3a2c855

mod_storage_{none,internal,sql}: Return error for unsupported (everything but keyval) store types
author Kim Alvefur <zash@zash.se>
date Fri, 20 Jun 2014 16:22:23 +0200
parents 6282:bce801e40484
children 6284:b49540983320
files plugins/mod_storage_internal.lua plugins/mod_storage_none.lua plugins/mod_storage_sql.lua
diffstat 3 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/mod_storage_internal.lua	Fri Jun 20 16:16:33 2014 +0200
+++ b/plugins/mod_storage_internal.lua	Fri Jun 20 16:22:23 2014 +0200
@@ -6,6 +6,9 @@
 local driver_mt = { __index = driver };
 
 function driver:open(store, typ)
+	if typ and typ ~= "keyval" then
+		return nil, "unsupported-store";
+	end
 	return setmetatable({ store = store, type = typ }, driver_mt);
 end
 function driver:get(user)
--- a/plugins/mod_storage_none.lua	Fri Jun 20 16:16:33 2014 +0200
+++ b/plugins/mod_storage_none.lua	Fri Jun 20 16:22:23 2014 +0200
@@ -1,8 +1,11 @@
 local driver = {};
 local driver_mt = { __index = driver };
 
-function driver:open(store)
-	return setmetatable({ store = store }, driver_mt);
+function driver:open(store, typ)
+	if typ and typ ~= "keyval" then
+		return nil, "unsupported-store";
+	end
+	return setmetatable({ store = store, type = typ }, driver_mt);
 end
 function driver:get(user)
 	return {};
--- a/plugins/mod_storage_sql.lua	Fri Jun 20 16:16:33 2014 +0200
+++ b/plugins/mod_storage_sql.lua	Fri Jun 20 16:22:23 2014 +0200
@@ -380,10 +380,10 @@
 local driver = {};
 
 function driver:open(store, typ)
-	if not typ then -- default key-value store
-		return setmetatable({ store = store }, keyval_store);
+	if typ and typ ~= "keyval" then
+		return nil, "unsupported-store";
 	end
-	return nil, "unsupported-store";
+	return setmetatable({ store = store }, keyval_store);
 end
 
 function driver:stores(username)