diff options
| author | Kim Alvefur <zash@zash.se> | 2015-07-05 18:00:05 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-07-05 18:00:05 +0200 |
| commit | 5c4f162797b7f2ba6faa6f9f3ce0ed5db7bee0ad (patch) | |
| tree | ffbe134470891e53fe689b44843c22b48c6b680b | |
| parent | 6e187489a98a403ae236a9595fbd0f80d3ff6490 (diff) | |
| parent | c9035dd6cdab062206e57e3df9415cb8e6f0bc0a (diff) | |
| download | prosody-5c4f162797b7f2ba6faa6f9f3ce0ed5db7bee0ad.tar.gz prosody-5c4f162797b7f2ba6faa6f9f3ce0ed5db7bee0ad.zip | |
Merge 0.10->trunk
| -rw-r--r-- | plugins/mod_storage_sql2.lua | 2 | ||||
| -rw-r--r-- | plugins/sql.lib.lua | 9 | ||||
| -rw-r--r-- | util/sql.lua | 4 |
3 files changed, 5 insertions, 10 deletions
diff --git a/plugins/mod_storage_sql2.lua b/plugins/mod_storage_sql2.lua index 9a9e6061..1702108c 100644 --- a/plugins/mod_storage_sql2.lua +++ b/plugins/mod_storage_sql2.lua @@ -413,10 +413,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 diff --git a/plugins/sql.lib.lua b/plugins/sql.lib.lua deleted file mode 100644 index 005ee45d..00000000 --- a/plugins/sql.lib.lua +++ /dev/null @@ -1,9 +0,0 @@ -local cache = module:shared("/*/sql.lib/util.sql"); - -if not cache._M then - prosody.unlock_globals(); - cache._M = require "util.sql"; - prosody.lock_globals(); -end - -return cache._M; diff --git a/util/sql.lua b/util/sql.lua index 5aa12f94..92032f43 100644 --- a/util/sql.lua +++ b/util/sql.lua @@ -111,8 +111,12 @@ function engine:connect() self.conn = dbh; self.prepared = {}; self:set_encoding(); + self:onconnect(); return true; end +function engine:onconnect() + -- Override from create_engine() +end function engine:execute(sql, ...) local success, err = self:connect(); if not success then return success, err; end |