mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-01 12:42:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/top-think/framework

Browse Source
This commit is contained in:
thinkphp
2016-06-15 11:45:18 +08:00
parent c88bcf45ad ea1b1af3a3
commit 381784755f
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
library/think/db/Query.php
View File

@@ -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();
}
/**

8
library/think/model/Merge.php
View File

@@ -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();