aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-06-27 15:59:37 +0200
committerKim Alvefur <zash@zash.se>2015-06-27 15:59:37 +0200
commit38a5a1ca59bec9d0da0c1ff2e431f9b17e7f5c15 (patch)
tree96a1e4d70d3b15f1cfd93e44e2b6f0e6a4837f90
parent7b391bc37acca3a5ed62477f18c9e03348a057f5 (diff)
downloadprosody-38a5a1ca59bec9d0da0c1ff2e431f9b17e7f5c15.tar.gz
prosody-38a5a1ca59bec9d0da0c1ff2e431f9b17e7f5c15.zip
mod_storage_sql2: Validate configuration after normalizing SQLite3 database path (fixes traceback with default config)
-rw-r--r--plugins/mod_storage_sql2.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_storage_sql2.lua b/plugins/mod_storage_sql2.lua
index 7c797447..10a16743 100644
--- a/plugins/mod_storage_sql2.lua
+++ b/plugins/mod_storage_sql2.lua
@@ -379,10 +379,10 @@ local function upgrade_table(params, apply_changes)
end
local function normalize_params(params)
- assert(params.driver and params.database, "Configuration error: Both the SQL driver and the database need to be specified");
if params.driver == "SQLite3" then
params.database = resolve_relative_path(prosody.paths.data or ".", params.database or "prosody.sqlite");
end
+ assert(params.driver and params.database, "Configuration error: Both the SQL driver and the database need to be specified");
return params;
end