关联操作增加默认事务

Author: liu21st

src/Model.php

@@ -533,18 +533,31 @@ protected function updateData($where)
             }
         }
 
-        // 模型更新
-        $result = $this->db(false)->where($where)->strict(false)->field($allowFields)->update($data);
+        $db = $this->db(false);
+        $db->startTrans();
 
-        // 关联更新
-        if (isset($this->relationWrite)) {
-            $this->autoRelationUpdate();
-        }
+        try {
+            // 模型更新
+            $result = $db->where($where)
+                ->strict(false)
+                ->field($allowFields)
+                ->update($data);
+
+            // 关联更新
+            if (isset($this->relationWrite)) {
+                $this->autoRelationUpdate();
+            }
 
-        // 更新回调
-        $this->trigger('after_update');
+            $db->commit();
 
-        return $result;
+            // 更新回调
+            $this->trigger('after_update');
+
+            return $result;
+        } catch (\Exception $e) {
+            $db->rollback();
+            throw $e;
+        }
     }
 
     /**
@@ -568,31 +581,43 @@ protected function insertData($sequence)
         // 检查允许字段
         $allowFields = $this->checkAllowFields(array_merge($this->auto, $this->insert));
 
-        $result = $this->db(false)->strict(false)->field($allowFields)->insert($this->data);
+        $db = $this->db(false);
+        $db->startTrans();
 
-        // 获取自动增长主键
-        if ($result && $insertId = $this->db(false)->getLastInsID($sequence)) {
-            $pk = $this->getPk();
+        try {
+            $result = $db->strict(false)
+                ->field($allowFields)
+                ->insert($this->data);
+
+            // 获取自动增长主键
+            if ($result && $insertId = $db->getLastInsID($sequence)) {
+                $pk = $this->getPk();
 
-            foreach ((array) $pk as $key) {
-                if (!isset($this->data[$key]) || '' == $this->data[$key]) {
-                    $this->data[$key] = $insertId;
+                foreach ((array) $pk as $key) {
+                    if (!isset($this->data[$key]) || '' == $this->data[$key]) {
+                        $this->data[$key] = $insertId;
+                    }
                 }
             }
-        }
 
-        // 关联写入
-        if (isset($this->relationWrite)) {
-            $this->autoRelationInsert();
-        }
+            // 关联写入
+            if (isset($this->relationWrite)) {
+                $this->autoRelationInsert();
+            }
 
-        // 标记为更新
-        $this->isUpdate = true;
+            $db->commit();
 
-        // 新增回调
-        $this->trigger('after_insert');
+            // 标记为更新
+            $this->isUpdate = true;
 
-        return $result;
+            // 新增回调
+            $this->trigger('after_insert');
+
+            return $result;
+        } catch (\Exception $e) {
+            $db->rollback();
+            throw $e;
+        }
     }
 
     /**
@@ -738,21 +763,31 @@ public function delete()
         // 读取更新条件
         $where = $this->getWhere();
 
-        // 删除当前模型数据
-        $result = $this->db(false)->where($where)->delete();
+        $db = $this->db(false);
+        $db->startTrans();
 
-        // 关联删除
-        if (!empty($this->relationWrite)) {
-            $this->autoRelationDelete();
-        }
+        try {
+            // 删除当前模型数据
+            $result = $db->where($where)->delete();
+
+            // 关联删除
+            if (!empty($this->relationWrite)) {
+                $this->autoRelationDelete();
+            }
 
-        $this->trigger('after_delete');
+            $db->commit();
 
-        // 清空数据
-        $this->data   = [];
-        $this->origin = [];
+            $this->trigger('after_delete');
 
-        return $result;
+            // 清空数据
+            $this->data   = [];
+            $this->origin = [];
+
+            return $result;
+        } catch (\Exception $e) {
+            $db->rollback();
+            throw $e;
+        }
     }
 
     /**