php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-15 22:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #160 from creocoder/active-record-refactoring

Browse Source 
ActiveRecord::insert() and ActiveRecord::update() refactoring
This commit is contained in:
Qiang Xue
2013-05-07 07:49:38 -07:00
parent dd5969147d e3f6faf575
commit 1c93c50386
1 changed files with 47 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
framework/db/ActiveRecord.php
View File

@@ -667,12 +667,11 @@ class ActiveRecord extends Model
*/
public function insert($runValidation = true, $attributes = null)
{
if ($runValidation && !$this->validate($attributes)) {
if ($runValidation && !$this->validate($attributes) || !$this->beforeSave(true)) {
return false;
}
if ($this->beforeSave(true)) {
$values = $this->getDirtyAttributes($attributes);
if ($values === array()) {
if (empty($values)) {
foreach ($this->primaryKey() as $key) {
$values[$key] = isset($this->_attributes[$key]) ? $this->_attributes[$key] : null;
}
@@ -696,8 +695,6 @@ class ActiveRecord extends Model
return true;
}
}
return false;
}
/**
* Saves the changes to this active record into the associated database table.
@@ -750,12 +747,11 @@ class ActiveRecord extends Model
*/
public function update($runValidation = true, $attributes = null)
{
if ($runValidation && !$this->validate($attributes)) {
if ($runValidation && !$this->validate($attributes) || !$this->beforeSave(false)) {
return false;
}
if ($this->beforeSave(false)) {
$values = $this->getDirtyAttributes($attributes);
if ($values !== array()) {
if (!empty($values)) {
$condition = $this->getOldPrimaryKey(true);
$lock = $this->optimisticLock();
if ($lock !== null) {
@@ -781,9 +777,6 @@ class ActiveRecord extends Model
} else {
return 0;
}
} else {
return false;
}
}
/**