diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-07-06 17:07:05 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-07-06 17:07:05 +0100 |
| commit | 855cb99f3c81b03fdeb27896d59ed9b66900ae02 (patch) | |
| tree | 116641904bf26766fe52624f4ef7af24d77ae2ee /plugins/mod_storage_sql2.lua | |
| parent | e6b0ecf2435c94405c08f5ffd7d595f0b75cc8a4 (diff) | |
| parent | 5292b8232a0cb961cc2d301556a179505ba98dee (diff) | |
| download | prosody-855cb99f3c81b03fdeb27896d59ed9b66900ae02.tar.gz prosody-855cb99f3c81b03fdeb27896d59ed9b66900ae02.zip | |
Merge with 0.10
Diffstat (limited to 'plugins/mod_storage_sql2.lua')
| -rw-r--r-- | plugins/mod_storage_sql2.lua | 2 |
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 |