Skip to content

Y
yii2
Commit f12518f4 by Alexander Kochetov
Options

ActiveRecord::insert() and ActiveRecord::update() refactoring

parent dd596914
Showing with 42 additions and 49 deletions
framework/db/ActiveRecord.php
...@@ -667,36 +667,33 @@ class ActiveRecord extends Model ...@@ -667,36 +667,33 @@ class ActiveRecord extends Model
*/ */
public function insert($runValidation = true, $attributes = null) public function insert($runValidation = true, $attributes = null)
{ {
if ($runValidation && !$this->validate($attributes)) { if ($runValidation && !$this->validate($attributes) && !$this->beforeSave(true)) {
return false; return false;
} }
if ($this->beforeSave(true)) { $values = $this->getDirtyAttributes($attributes);
$values = $this->getDirtyAttributes($attributes); if (empty($values)) {
if ($values === array()) { foreach ($this->primaryKey() as $key) {
foreach ($this->primaryKey() as $key) { $values[$key] = isset($this->_attributes[$key]) ? $this->_attributes[$key] : null;
$values[$key] = isset($this->_attributes[$key]) ? $this->_attributes[$key] : null;
}
} }
$db = static::getDb(); }
$command = $db->createCommand()->insert($this->tableName(), $values); $db = static::getDb();
if ($command->execute()) { $command = $db->createCommand()->insert($this->tableName(), $values);
$table = $this->getTableSchema(); if ($command->execute()) {
if ($table->sequenceName !== null) { $table = $this->getTableSchema();
foreach ($table->primaryKey as $name) { if ($table->sequenceName !== null) {
if (!isset($this->_attributes[$name])) { foreach ($table->primaryKey as $name) {
$this->_oldAttributes[$name] = $this->_attributes[$name] = $db->getLastInsertID($table->sequenceName); if (!isset($this->_attributes[$name])) {
break; $this->_oldAttributes[$name] = $this->_attributes[$name] = $db->getLastInsertID($table->sequenceName);
} break;
} }
} }
foreach ($values as $name => $value) {
$this->_oldAttributes[$name] = $value;
}
$this->afterSave(true);
return true;
} }
foreach ($values as $name => $value) {
$this->_oldAttributes[$name] = $value;
}
$this->afterSave(true);
return true;
} }
return false;
} }
/** /**
...@@ -750,39 +747,35 @@ class ActiveRecord extends Model ...@@ -750,39 +747,35 @@ class ActiveRecord extends Model
*/ */
public function update($runValidation = true, $attributes = null) public function update($runValidation = true, $attributes = null)
{ {
if ($runValidation && !$this->validate($attributes)) { if ($runValidation && !$this->validate($attributes) && !$this->beforeSave(false)) {
return false; return false;
} }
if ($this->beforeSave(false)) { $values = $this->getDirtyAttributes($attributes);
$values = $this->getDirtyAttributes($attributes); if (!empty($values)) {
if ($values !== array()) { $condition = $this->getOldPrimaryKey(true);
$condition = $this->getOldPrimaryKey(true); $lock = $this->optimisticLock();
$lock = $this->optimisticLock(); if ($lock !== null) {
if ($lock !== null) { if (!isset($values[$lock])) {
if (!isset($values[$lock])) { $values[$lock] = $this->$lock + 1;
$values[$lock] = $this->$lock + 1;
}
$condition[$lock] = $this->$lock;
}
// We do not check the return value of updateAll() because it's possible
// that the UPDATE statement doesn't change anything and thus returns 0.
$rows = $this->updateAll($values, $condition);
if ($lock !== null && !$rows) {
throw new StaleObjectException('The object being updated is outdated.');
} }
$condition[$lock] = $this->$lock;
}
// We do not check the return value of updateAll() because it's possible
// that the UPDATE statement doesn't change anything and thus returns 0.
$rows = $this->updateAll($values, $condition);
foreach ($values as $name => $value) { if ($lock !== null && !$rows) {
$this->_oldAttributes[$name] = $this->_attributes[$name]; throw new StaleObjectException('The object being updated is outdated.');
} }
$this->afterSave(false); foreach ($values as $name => $value) {
return $rows; $this->_oldAttributes[$name] = $this->_attributes[$name];
} else {
return 0;
} }
$this->afterSave(false);
return $rows;
} else { } else {
return false; return 0;
} }
} }
......
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