Skip to content

Y
yii2
Commit 944e1fc0 by resurtm
Options

isOpAtomic → isOperationAtomic

parent 60140706
Showing with 4 additions and 4 deletions
yii/db/ActiveRecord.php
...@@ -688,7 +688,7 @@ class ActiveRecord extends Model ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment