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 | d780096b2a3091e32b10f3cf8e5472864dfc7475 (patch) | |
| tree | 6b5dcd27b170f6ec500cf0c85ded74d400df69bd /plugins/mod_storage_sql.lua | |
| parent | eb6a6f7cc43b2da5fc5300b901701553016b42c9 (diff) | |
| parent | bf2a083f24654a1011a52ac0e10c00daaf3ad297 (diff) | |
| download | prosody-d780096b2a3091e32b10f3cf8e5472864dfc7475.tar.gz prosody-d780096b2a3091e32b10f3cf8e5472864dfc7475.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_storage_sql.lua')
| -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; |