diff options
| author | Kim Alvefur <zash@zash.se> | 2017-04-12 20:59:18 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-04-12 20:59:18 +0200 |
| commit | d418ed105c8eba8fb03375c3e13daf6ef261cfa5 (patch) | |
| tree | 812565071e2a3b84ab2fee8ca331e5be4b6e63e7 | |
| parent | 61c1325aa6509896b202f731c546e980ef97fff4 (diff) | |
| parent | 2b914fee7d809f0666ca96db8ee49dd4f64db66c (diff) | |
| download | prosody-d418ed105c8eba8fb03375c3e13daf6ef261cfa5.tar.gz prosody-d418ed105c8eba8fb03375c3e13daf6ef261cfa5.zip | |
Merge 0.10->trunk
| -rw-r--r-- | plugins/mod_storage_sql.lua | 2 | ||||
| -rw-r--r-- | util/sql.lua | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua index 70fea09f..bf7190b8 100644 --- a/plugins/mod_storage_sql.lua +++ b/plugins/mod_storage_sql.lua @@ -489,7 +489,7 @@ local function upgrade_table(engine, params, apply_changes) -- luacheck: ignore check_encoding_query = check_encoding_query:format(engine.charset, engine.charset); -- FIXME Is it ok to ignore the return values from this? engine:transaction(function() - local result = engine:execute(check_encoding_query); + local result = assert(engine:execute(check_encoding_query)); local n_bad_columns = result:rowcount(); if n_bad_columns > 0 then changes = true; diff --git a/util/sql.lua b/util/sql.lua index a859ddc9..f7c68ed3 100644 --- a/util/sql.lua +++ b/util/sql.lua @@ -139,6 +139,7 @@ function engine:execute(sql, ...) if not success then return success, err; end local prepared = self.prepared; + sql = self:prepquery(sql); local stmt = prepared[sql]; if not stmt then local err; @@ -159,6 +160,7 @@ local result_mt = { __index = { local function debugquery(where, sql, ...) local i = 0; local a = {...} + sql = sql:gsub("\n?\t+", " "); log("debug", "[%s] %s", where, sql:gsub("%?", function () i = i + 1; local v = a[i]; if type(v) == "string" then v = ("%q"):format(v); end return tostring(v); end)); end @@ -254,7 +256,6 @@ function engine:_create_index(index) if index.unique then sql = sql:gsub("^CREATE", "CREATE UNIQUE"); end - sql = self:prepquery(sql); if self._debug then debugquery("create", sql); end @@ -286,7 +287,6 @@ function engine:_create_table(table) if self.params.driver == "MySQL" then sql = sql:gsub(";$", (" CHARACTER SET '%s' COLLATE '%s_bin';"):format(self.charset, self.charset)); end - sql = self:prepquery(sql); if self._debug then debugquery("create", sql); end |