aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_storage_sql.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-12-16 16:44:40 +0000
committerMatthew Wild <mwild1@gmail.com>2015-12-16 16:44:40 +0000
commited274d1253637e39f3bcaadcfc817cdf3f705c63 (patch)
tree79a466a05ccdcbb3172d75db20a4996be3ab8aa3 /plugins/mod_storage_sql.lua
parentc2c82b591a34d539692cb6b36f0edafdfb4ef9dd (diff)
parent275bfb45fa0972832ffc760d512845d4b0f9be44 (diff)
downloadprosody-ed274d1253637e39f3bcaadcfc817cdf3f705c63.tar.gz
prosody-ed274d1253637e39f3bcaadcfc817cdf3f705c63.zip
Merge
Diffstat (limited to 'plugins/mod_storage_sql.lua')
-rw-r--r--plugins/mod_storage_sql.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index adf9f9b6..57d964e2 100644
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -417,7 +417,9 @@ end
local function normalize_params(params)
if params.driver == "SQLite3" then
- params.database = resolve_relative_path(prosody.paths.data or ".", params.database or "prosody.sqlite");
+ if params.database ~= ":memory:" then
+ params.database = resolve_relative_path(prosody.paths.data or ".", params.database or "prosody.sqlite");
+ end
end
assert(params.driver and params.database, "Configuration error: Both the SQL driver and the database need to be specified");
return params;