diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-12-16 16:47:34 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-12-16 16:47:34 +0000 |
| commit | 50b2a1dead3ebc7d18be2025537712f650687d87 (patch) | |
| tree | 6b5dcd27b170f6ec500cf0c85ded74d400df69bd /plugins | |
| parent | e511eba924fcc3bc898cb0fd336db1f94c22b29e (diff) | |
| parent | 32e49dccd82a8e392cc20a33881644b435dc269d (diff) | |
| download | prosody-50b2a1dead3ebc7d18be2025537712f650687d87.tar.gz prosody-50b2a1dead3ebc7d18be2025537712f650687d87.zip | |
Merge 0.10->trunk
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; |