mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-05 22:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_storage_sql: Create a new table to hold normalized database parameters (fixes #636)

Browse source
This commit is contained in:
Kim Alvefur 2016-11-29 08:20:42 +01:00
parent b89b681cd2
commit 011ee227bb
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
plugins/mod_storage_sql.lua
View file

@ -433,14 +433,22 @@ local function upgrade_table(params, apply_changes)
return changes;
end
local function normalize_params(params)
if params.driver == "SQLite3" then
if params.database ~= ":memory:" then
params.database = resolve_relative_path(prosody.paths.data or ".", params.database or "prosody.sqlite");
end
local function normalize_database(driver, database)
if driver == "SQLite3" and database ~= ":memory:" then
return resolve_relative_path(prosody.paths.data or ".", 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;
return database;
end
local function normalize_params(params)
return {
driver = assert(params.driver, "Configuration error: Both the SQL driver and the database need to be specified");
database = assert(normalize_database(params.driver, params.database), "Configuration error: Both the SQL driver and the database need to be specified");
username = params.username;
password = params.password;
host = params.host;
params.port;
};
end
function module.load()