diff options
| author | Kim Alvefur <zash@zash.se> | 2016-02-21 16:54:56 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-02-21 16:54:56 +0100 |
| commit | e13dc52b494737b8fa8e9c14ce68810782bee7aa (patch) | |
| tree | 44401c36441d4a2c7cd38aebe9b2466a64470a0f | |
| parent | 274ad6f3c048dfda6a49683830bdc23a6b8b8353 (diff) | |
| parent | c9d425731dd0f2c07d1b884c5529f81cfbf4f63c (diff) | |
| download | prosody-e13dc52b494737b8fa8e9c14ce68810782bee7aa.tar.gz prosody-e13dc52b494737b8fa8e9c14ce68810782bee7aa.zip | |
Merge 0.10->trunk
| -rw-r--r-- | plugins/mod_storage_sql.lua | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua index 34fcacee..50d34a23 100644 --- a/plugins/mod_storage_sql.lua +++ b/plugins/mod_storage_sql.lua @@ -148,7 +148,8 @@ function map_store:get(username, key) return result; end function map_store:set(username, key, data) - return self:set_keys(username, { [key] = data or self.remove }); + if data == nil then data = self.remove; end + return self:set_keys(username, { [key] = data }); end function map_store:set_keys(username, keydatas) local ok, result = engine:transaction(function() @@ -448,19 +449,25 @@ end function module.load() if prosody.prosodyctl then return; end + local engines = module:shared("/*/sql/connections"); local params = normalize_params(module:get_option("sql", default_params)); - engine = sql:create_engine(params, function (engine) - if module:get_option("sql_manage_tables", true) then - -- Automatically create table, ignore failure (table probably already exists) - -- FIXME: we should check in information_schema, etc. - create_table(); - -- Check whether the table needs upgrading - if upgrade_table(params, false) then - module:log("error", "Old database format detected. Please run: prosodyctl mod_%s upgrade", module.name); - return false, "database upgrade needed"; + engine = engines[sql.db2uri(params)]; + if not engine then + module:log("info", "Creating new engine"); + engine = sql:create_engine(params, function (engine) + if module:get_option("sql_manage_tables", true) then + -- Automatically create table, ignore failure (table probably already exists) + -- FIXME: we should check in information_schema, etc. + create_table(); + -- Check whether the table needs upgrading + if upgrade_table(params, false) then + module:log("error", "Old database format detected. Please run: prosodyctl mod_%s upgrade", module.name); + return false, "database upgrade needed"; + end end - end - end); + end); + engines[sql.db2uri(params)] = engine; + end module:provides("storage", driver); end |