util.timer: Expire timer instance if another instance is already set to take care...

[prosody.git] / util / sql.lua

diff --git a/util/sql.lua b/util/sql.lua
index 70e103dfb66d86e1077f31368b9265ce2da375e5..2d5e17743a6a90f448499804330741924b5caad5 100644 (file)
--- 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;
 };