aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-04-13 22:38:31 +0200
committerKim Alvefur <zash@zash.se>2017-04-13 22:38:31 +0200
commit5605d1094b7bf2784f7b7f4c917d91aacf08139a (patch)
tree706e69e60a8560b8fd6634db84455a21c728c0f9
parent9548228ec81cc66c0b58fa4b563029ea8cadb386 (diff)
parent656c5d45a1bfd3d53a2e3b675fbd95c870b170aa (diff)
downloadprosody-5605d1094b7bf2784f7b7f4c917d91aacf08139a.tar.gz
prosody-5605d1094b7bf2784f7b7f4c917d91aacf08139a.zip
Merge 0.10->trunk
-rw-r--r--util/sql.lua9
1 files changed, 8 insertions, 1 deletions
diff --git a/util/sql.lua b/util/sql.lua
index f7c68ed3..15749911 100644
--- a/util/sql.lua
+++ b/util/sql.lua
@@ -161,7 +161,14 @@ 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));
+ log("debug", "[%s] %s", where, sql:gsub("%?", function ()
+ i = i + 1;
+ local v = a[i];
+ if type(v) == "string" then
+ v = ("'%s'"):format(v:gsub("'", "''"));
+ end
+ return tostring(v);
+ end));
end
function engine:execute_query(sql, ...)