diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-12-16 16:44:40 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-12-16 16:44:40 +0000 |
| commit | 7a63092b1338dc12dda8a7e76d1eb02f79015a60 (patch) | |
| tree | 79a466a05ccdcbb3172d75db20a4996be3ab8aa3 /plugins | |
| parent | a250f2ca214dc5222c9cc466fc9908652bfb03f8 (diff) | |
| parent | 41c42960d763d99927cdeeaae855cccde3920fde (diff) | |
| download | prosody-7a63092b1338dc12dda8a7e76d1eb02f79015a60.tar.gz prosody-7a63092b1338dc12dda8a7e76d1eb02f79015a60.zip | |
Merge
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_storage_sql.lua | 4 |
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; |