diff --git a/library/think/db/Query.php b/library/think/db/Query.php index 3bd7aeec..190874e7 100644 --- a/library/think/db/Query.php +++ b/library/think/db/Query.php @@ -239,24 +239,22 @@ class Query /** * 启动事务 * @access public - * @param string $label 事务标识 * @return bool|null */ - public function startTrans($label = '') + public function startTrans() { - return $this->connection->startTrans($label); + return $this->connection->startTrans(); } /** * 用于非自动提交状态下面的查询提交 * @access public - * @param string $label 事务标识 * @return boolean * @throws PDOException */ - public function commit($label = '') + public function commit() { - return $this->connection->commit($label); + return $this->connection->commit(); } /** diff --git a/library/think/model/Merge.php b/library/think/model/Merge.php index 5672ebc0..3da4fc07 100644 --- a/library/think/model/Merge.php +++ b/library/think/model/Merge.php @@ -173,7 +173,7 @@ class Merge extends Model } $db = $this->db(); - $db->startTrans('merge_save_' . $this->name); + $db->startTrans(); try { if ($this->isUpdate) { // 自动写入 @@ -235,7 +235,7 @@ class Merge extends Model // 新增回调 $this->trigger('after_insert', $this); } - $db->commit('merge_save_' . $this->name); + $db->commit(); return $result; } catch (\PDOException $e) { $db->rollback(); @@ -255,7 +255,7 @@ class Merge extends Model } $db = $this->db(); - $db->startTrans('merge_delete_' . $this->name); + $db->startTrans(); try { $result = $db->delete($this->data); if ($result) { @@ -270,7 +270,7 @@ class Merge extends Model } } $this->trigger('after_delete', $this); - $db->commit('merge_delete_' . $this->name); + $db->commit(); return $result; } catch (\PDOException $e) { $db->rollback();