Software / code / prosody
Changeset
8085:7a13fa890472
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 13 Apr 2017 22:38:31 +0200 |
| parents | 8083:32898a74b9d9 (current diff) 8084:655837e9eeeb (diff) |
| children | 8088:179a6f30694e |
| files | |
| diffstat | 1 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/util/sql.lua Thu Apr 13 01:30:24 2017 +0200 +++ b/util/sql.lua Thu Apr 13 22:38:31 2017 +0200 @@ -161,7 +161,14 @@ 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, ...)
