aboutsummaryrefslogtreecommitdiffstats
path: root/util/sql.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-02-22 15:24:20 +0100
committerKim Alvefur <zash@zash.se>2016-02-22 15:24:20 +0100
commitcccb4ab09be9573c02e0d2684e062363cd7eb068 (patch)
tree3bb6d5bb05f75122414728e4605bbdb9aacacae0 /util/sql.lua
parente13dc52b494737b8fa8e9c14ce68810782bee7aa (diff)
parent7ebc652e1dde5db4ba00782579a1948b912fa930 (diff)
downloadprosody-cccb4ab09be9573c02e0d2684e062363cd7eb068.tar.gz
prosody-cccb4ab09be9573c02e0d2684e062363cd7eb068.zip
Merge 0.10->trunk
Diffstat (limited to 'util/sql.lua')
-rw-r--r--util/sql.lua32
1 files changed, 31 insertions, 1 deletions
diff --git a/util/sql.lua b/util/sql.lua
index 2d5e1774..b4d14537 100644
--- a/util/sql.lua
+++ b/util/sql.lua
@@ -147,6 +147,11 @@ local result_mt = { __index = {
rowcount = function(self) return self.__stmt:rowcount(); end;
} };
+local function debugquery(where, sql, ...)
+ local i = 0; local a = {...}
+ 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
+
function engine:execute_query(sql, ...)
if self.params.driver == "PostgreSQL" then
sql = sql:gsub("`", "\"");
@@ -172,6 +177,26 @@ engine.insert = engine.execute_update;
engine.select = engine.execute_query;
engine.delete = engine.execute_update;
engine.update = engine.execute_update;
+local function debugwrap(name, f)
+ return function (self, sql, ...)
+ debugquery(name, sql, ...)
+ return f(self, sql, ...)
+ end
+end
+function engine:debug(enable)
+ self._debug = enable;
+ if enable then
+ engine.insert = debugwrap("insert", engine.execute_update);
+ engine.select = debugwrap("select", engine.execute_query);
+ engine.delete = debugwrap("delete", engine.execute_update);
+ engine.update = debugwrap("update", engine.execute_update);
+ else
+ engine.insert = engine.execute_update;
+ engine.select = engine.execute_query;
+ engine.delete = engine.execute_update;
+ engine.update = engine.execute_update;
+ end
+end
function engine:_transaction(func, ...)
if not self.conn then
local ok, err = self:connect();
@@ -221,7 +246,9 @@ function engine:_create_index(index)
if index.unique then
sql = sql:gsub("^CREATE", "CREATE UNIQUE");
end
- --print(sql);
+ if self._debug then
+ debugquery("create", sql);
+ end
return self:execute(sql);
end
function engine:_create_table(table)
@@ -252,6 +279,9 @@ function engine:_create_table(table)
elseif self.params.driver == "MySQL" then
sql = sql:gsub(";$", (" CHARACTER SET '%s' COLLATE '%s_bin';"):format(self.charset, self.charset));
end
+ if self._debug then
+ debugquery("create", sql);
+ end
local success,err = self:execute(sql);
if not success then return success,err; end
for i,v in ipairs(table.__table__) do