Software / code / prosody
Diff
plugins/mod_storage_sql2.lua @ 6749:9dc05d3efdc9
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 05 Jul 2015 18:00:05 +0200 |
| parent | 6745:6728ad041761 |
| parent | 6746:5e8a8319699d |
| child | 6767:d01c29b62b16 |
line wrap: on
line diff
--- a/plugins/mod_storage_sql2.lua Thu Jun 25 18:57:43 2015 +0200 +++ b/plugins/mod_storage_sql2.lua Sun Jul 05 18:00:05 2015 +0200 @@ -413,10 +413,10 @@ 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