diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-09-02 18:55:35 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-09-02 18:55:35 +0100 |
| commit | 95e9399b77a5b7e5520cc1187c267171d4c494b7 (patch) | |
| tree | 75ae2e07fd0ffea8a7063e9fbc3e5dbd0108d619 /util/sql.lua | |
| parent | 1b379adbc661947763a198ea2a3e114359fafe82 (diff) | |
| parent | 388fa0cd28e4a9911f6d6504e15126071952a453 (diff) | |
| download | prosody-95e9399b77a5b7e5520cc1187c267171d4c494b7.tar.gz prosody-95e9399b77a5b7e5520cc1187c267171d4c494b7.zip | |
Merge 0.10->trunk
Diffstat (limited to 'util/sql.lua')
| -rw-r--r-- | util/sql.lua | 2 |
1 files changed, 2 insertions, 0 deletions
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; }; |