wrap findOrCreate with transactional

cakephp · Jun 20, 2016 · a0b1201 · a0b1201
1 parent 5add51d
commit a0b1201
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/src/ORM/Table.php b/src/ORM/Table.php
@@ -1222,17 +1222,19 @@ public function get($primaryKey, $options = [])
      */
     public function findOrCreate($search, callable $callback = null)
     {
-        $query = $this->find()->where($search);
-        $row = $query->first();
-        if ($row) {
-            return $row;
-        }
-        $entity = $this->newEntity();
-        $entity->set($search, ['guard' => false]);
-        if ($callback) {
-            $callback($entity);
-        }
-        return $this->save($entity) ?: $entity;
+        $this->connection()->transactional(function() use($search, $callback) {
+            $query = $this->find()->where($search);
+            $row = $query->first();
+            if ($row) {
+                return $row;
+            }
+            $entity = $this->newEntity();
+            $entity->set($search, ['guard' => false]);
+            if ($callback) {
+                $callback($entity);
+            }
+            return $this->save($entity) ?: $entity;
+        });
     }
 
     /**