always use nested transactions

atk4 · Oct 2, 2023 · 5ec6236 · 5ec6236
1 parent 5a555f8
commit 5ec6236
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/src/Model.php b/src/Model.php
@@ -1640,16 +1640,16 @@ public function insert(array $row)
     {
         $entity = $this->createEntity();
 
-        $hasArrayValue = false;
+        $hasRefs = false;
         foreach ($row as $v) {
             if (is_array($v)) {
-                $hasArrayValue = true;
+                $hasRefs = true;
 
                 break;
             }
         }
 
-        if (!$hasArrayValue) {
+        if (!$hasRefs) {
             $entity->_insert($row);
         } else {
             $this->atomic(static function () use ($entity, $row) {

diff --git a/src/Persistence/Sql/Connection.php b/src/Persistence/Sql/Connection.php
@@ -201,6 +201,8 @@ public static function connect($dsn, $user = null, $password = null, $defaults =
             $dbalConnection = $connectionClass::connectFromDbalDriverConnection($dbalDriverConnection);
         }
 
+        $dbalConnection->setNestTransactionsWithSavepoints(true); // remove once DBAL 3.x support is dropped
+
         $connection = new $connectionClass($defaults);
         $connection->_connection = $dbalConnection;
 

diff --git a/tests/Schema/TestCaseTest.php b/tests/Schema/TestCaseTest.php
@@ -56,6 +56,9 @@ public function testLogQuery(): void
                 "START TRANSACTION";
 
 
+                "SAVEPOINT";
+
+
                 insert into `t` (`name`, `int`, `float`, `null`)
                 values
                   (
@@ -86,9 +89,9 @@ public function testLogQuery(): void
                   and `id` = 1
                 EOF
             . $makeLimitSqlFx(2)
+            . ";\n\n"
+            . ($this->getDatabasePlatform()->supportsReleaseSavepoints() ? "\n\"RELEASE SAVEPOINT\";\n\n" : '')
             . <<<'EOF'
-                ;
-
 
                 "COMMIT";
 

diff --git a/tests/TransactionTest.php b/tests/TransactionTest.php
@@ -96,8 +96,6 @@ public function testAtomicWithRollbackToSavepoint(): void
         $m->addField('name');
         $m->setOrder('id');
 
-        $this->getConnection()->getConnection()->setNestTransactionsWithSavepoints(true);
-
         $this->db->atomic(function () use ($m) {
             foreach ($m as $entity) {
                 $rollback = $entity->get('name') === 'Sue';