diff options
Diffstat (limited to 'util')
| -rw-r--r-- | util/hex.lua | 3 | ||||
| -rw-r--r-- | util/sql.lua | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/util/hex.lua b/util/hex.lua index e41f4863..4cc28d33 100644 --- a/util/hex.lua +++ b/util/hex.lua @@ -1,6 +1,7 @@ local s_char = string.char; local s_format = string.format; local s_gsub = string.gsub; +local s_lower = string.lower; local char_to_hex = {}; local hex_to_char = {}; @@ -19,7 +20,7 @@ local function to(s) end local function from(s) - return (s_gsub(s, "..", hex_to_char)); + return (s_gsub(s_lower(s), "%X*(%x%x)%X*", hex_to_char)); end return { to = to, from = from } diff --git a/util/sql.lua b/util/sql.lua index 70e103df..2d5e1774 100644 --- a/util/sql.lua +++ b/util/sql.lua @@ -180,6 +180,7 @@ function engine:_transaction(func, ...) --assert(not self.__transaction, "Recursive transactions not allowed"); local args, n_args = {...}, select("#", ...); local function f() return func(unpack(args, 1, n_args)); end + log("debug", "SQL transaction begin [%s]", tostring(func)); self.__transaction = true; local success, a, b, c = xpcall(f, debug_traceback); self.__transaction = nil; @@ -328,4 +329,5 @@ return { Table = Table; Index = Index; create_engine = create_engine; + db2uri = db2uri; }; |