Merge branch 'gi9obru0etuPlc6wozls-transaction_fix'

treefrogframework · Nov 25, 2019 · 680cd54 · 680cd54
2 parents e389e49 + ac69a71
commit 680cd54
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/tactioncontext.cpp b/src/tactioncontext.cpp
@@ -157,7 +157,8 @@ void TActionContext::execute(THttpRequest &request, int sid)
             }
 
             // Database Transaction
-            setTransactionEnabled(currController->transactionEnabled());
+            for (int databaseId = 0; databaseId < Tf::app()->sqlDatabaseSettingsCount(); ++databaseId)
+                setTransactionEnabled(currController->transactionEnabled(), databaseId);
 
             // Do filters
             bool dispatched = false;

diff --git a/src/tdatabasecontextmainthread.cpp b/src/tdatabasecontextmainthread.cpp
@@ -4,5 +4,6 @@
 TDatabaseContextMainThread::TDatabaseContextMainThread(QObject *parent) :
     TDatabaseContextThread(parent)
 {
-    setTransactionEnabled(false);
+    for (int databaseId = 0; databaseId < Tf::app()->sqlDatabaseSettingsCount(); ++databaseId)
+        setTransactionEnabled(false, databaseId);
 }
diff --git a/src/twebsocketworker.cpp b/src/twebsocketworker.cpp
@@ -88,7 +88,8 @@ void TWebSocketWorker::execute(int opcode, const QByteArray &payload)
         endpoint->peerAddr = peerInfo.first;
         endpoint->peerPortNumber = peerInfo.second;
         // Database Transaction
-        setTransactionEnabled(endpoint->transactionEnabled());
+        for (int databaseId = 0; databaseId < Tf::app()->sqlDatabaseSettingsCount(); ++databaseId)
+            setTransactionEnabled(endpoint->transactionEnabled(), databaseId);
 
         switch (_mode) {
         case Opening: {