php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-16 14:29:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

isOpAtomic → isOperationAtomic

Browse Source
This commit is contained in:
resurtm
2013-05-13 22:32:15 +06:00
parent 6014070676
commit 944e1fc0fe
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
yii/db/ActiveRecord.php
View File

@@ -688,7 +688,7 @@ class ActiveRecord extends Model
return false; return false;
} }
$db = static::getDb(); $db = static::getDb();
$transaction = $this->isOpAtomic(self::OP_INSERT) && $db->getTransaction() === null ? $db->beginTransaction() : null; $transaction = $this->isOperationAtomic(self::OP_INSERT) && $db->getTransaction() === null ? $db->beginTransaction() : null;
try { try {
$result = $this->insertInternal($attributes); $result = $this->insertInternal($attributes);
if ($transaction !== null) { if ($transaction !== null) {
@@ -798,7 +798,7 @@ class ActiveRecord extends Model
return false; return false;
} }
$db = static::getDb(); $db = static::getDb();
$transaction = $this->isOpAtomic(self::OP_UPDATE) && $db->getTransaction() === null ? $db->beginTransaction() : null; $transaction = $this->isOperationAtomic(self::OP_UPDATE) && $db->getTransaction() === null ? $db->beginTransaction() : null;
try { try {
$result = $this->updateInternal($attributes); $result = $this->updateInternal($attributes);
if ($transaction !== null) { if ($transaction !== null) {
@@ -905,7 +905,7 @@ class ActiveRecord extends Model
public function delete() public function delete()
{ {
$db = static::getDb(); $db = static::getDb();
$transaction = $this->isOpAtomic(self::OP_DELETE) && $db->getTransaction() === null ? $db->beginTransaction() : null; $transaction = $this->isOperationAtomic(self::OP_DELETE) && $db->getTransaction() === null ? $db->beginTransaction() : null;
try { try {
$result = false; $result = false;
if ($this->beforeDelete()) { if ($this->beforeDelete()) {
@@ -1431,7 +1431,7 @@ class ActiveRecord extends Model
* @param string $op possible values are ActiveRecord::INSERT, ActiveRecord::UPDATE and ActiveRecord::DELETE. * @param string $op possible values are ActiveRecord::INSERT, ActiveRecord::UPDATE and ActiveRecord::DELETE.
* @return boolean whether given operation is atomic. Currently active scenario is taken into account. * @return boolean whether given operation is atomic. Currently active scenario is taken into account.
*/ */
private function isOpAtomic($op) private function isOperationAtomic($op)
{ {
$scenario = $this->getScenario(); $scenario = $this->getScenario();
$scenarios = $this->scenarios(); $scenarios = $this->scenarios();