Error202
/
yii2-save-relations-behavior
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Updated yii2 requirements to 2.0.14 or later 

Some refactoring
tags/1.5.0
Alban Jubert 8 years ago
parent
97d88c73c9
commit
4bc4413615
2 changed files with 66 additions and 63 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      composer.json
  2. 127
      src/SaveRelationsBehavior.php

2
composer.json
Unescape View File

@ -21,7 +21,7 @@
} }
], ],
"require": { "require": {
"yiisoft/yii2": ">=2.0.7" "yiisoft/yii2": ">=2.0.14"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "4.8.36" "phpunit/phpunit": "4.8.36"

127
src/SaveRelationsBehavior.php
Unescape View File

@ -8,6 +8,7 @@ use yii\base\Behavior;
use yii\base\Exception; use yii\base\Exception;
use yii\base\ModelEvent; use yii\base\ModelEvent;
use yii\base\UnknownPropertyException; use yii\base\UnknownPropertyException;
use yii\db\ActiveQueryInterface;
use yii\db\BaseActiveRecord; use yii\db\BaseActiveRecord;
use yii\db\Exception as DbException; use yii\db\Exception as DbException;
use yii\db\Transaction; use yii\db\Transaction;
@ -109,7 +110,7 @@ class SaveRelationsBehavior extends Behavior
public function __set($name, $value) public function __set($name, $value)
{ {
if (in_array($name, $this->_relations)) { if (in_array($name, $this->_relations)) {
Yii::trace("Setting {$name} relation value", __METHOD__); Yii::debug("Setting {$name} relation value", __METHOD__);
if (!isset($this->_oldRelationValue[$name])) { if (!isset($this->_oldRelationValue[$name])) {
if ($this->owner->isNewRecord) { if ($this->owner->isNewRecord) {
if ($this->owner->getRelation($name)->multiple === true) { if ($this->owner->getRelation($name)->multiple === true) {
@ -247,7 +248,7 @@ class SaveRelationsBehavior extends Behavior
if (array_key_exists($relationName, $this->_oldRelationValue)) { // Relation was not set, do nothing... if (array_key_exists($relationName, $this->_oldRelationValue)) { // Relation was not set, do nothing...
$relation = $model->getRelation($relationName); $relation = $model->getRelation($relationName);
if ($relation->multiple === false && !empty($model->{$relationName})) { if ($relation->multiple === false && !empty($model->{$relationName})) {
Yii::trace("Setting foreign keys for {$relationName}", __METHOD__); Yii::debug("Setting foreign keys for {$relationName}", __METHOD__);
foreach ($relation->link as $relatedAttribute => $modelAttribute) { foreach ($relation->link as $relatedAttribute => $modelAttribute) {
if ($model->{$modelAttribute} !== $model->{$relationName}->{$relatedAttribute}) { if ($model->{$modelAttribute} !== $model->{$relationName}->{$relatedAttribute}) {
$model->{$modelAttribute} = $model->{$relationName}->{$relatedAttribute}; $model->{$modelAttribute} = $model->{$relationName}->{$relatedAttribute};
@ -333,7 +334,7 @@ class SaveRelationsBehavior extends Behavior
{ {
$this->validateRelationModel($pettyRelationName, $relationName, $model, $event); $this->validateRelationModel($pettyRelationName, $relationName, $model, $event);
if ($event->isValid && (count($model->dirtyAttributes) || $model->isNewRecord)) { if ($event->isValid && (count($model->dirtyAttributes) || $model->isNewRecord)) {
Yii::trace("Saving {$pettyRelationName} relation model", __METHOD__); Yii::debug("Saving {$pettyRelationName} relation model", __METHOD__);
$model->save(false); $model->save(false);
} }
} }
@ -353,7 +354,7 @@ class SaveRelationsBehavior extends Behavior
if (key_exists($relationName, $this->_relationsScenario)) { if (key_exists($relationName, $this->_relationsScenario)) {
$relationModel->setScenario($this->_relationsScenario[$relationName]); $relationModel->setScenario($this->_relationsScenario[$relationName]);
} }
Yii::trace("Validating {$pettyRelationName} relation model using " . $relationModel->scenario . " scenario", __METHOD__); Yii::debug("Validating {$pettyRelationName} relation model using " . $relationModel->scenario . " scenario", __METHOD__);
if (!$relationModel->validate()) { if (!$relationModel->validate()) {
$this->_addError($relationModel, $model, $relationName, $pettyRelationName); $this->_addError($relationModel, $model, $relationName, $pettyRelationName);
} }
@ -395,7 +396,7 @@ class SaveRelationsBehavior extends Behavior
*/ */
public function afterSave() public function afterSave()
{ {
if ($this->_relationsSaveStarted == false) { if ($this->_relationsSaveStarted === false) {
/** @var BaseActiveRecord $model */ /** @var BaseActiveRecord $model */
$model = $this->owner; $model = $this->owner;
$this->_relationsSaveStarted = true; $this->_relationsSaveStarted = true;
@ -406,78 +407,80 @@ class SaveRelationsBehavior extends Behavior
try { try {
foreach ($this->_relations as $relationName) { foreach ($this->_relations as $relationName) {
if (array_key_exists($relationName, $this->_oldRelationValue)) { // Relation was not set, do nothing... if (array_key_exists($relationName, $this->_oldRelationValue)) { // Relation was not set, do nothing...
Yii::trace("Linking {$relationName} relation", __METHOD__); Yii::debug("Linking {$relationName} relation", __METHOD__);
$relation = $model->getRelation($relationName); $relation = $model->getRelation($relationName);
if ($relation->multiple === true) { // Has many relation if ($relation instanceof ActiveQueryInterface) {
// Process new relations if ($relation->multiple === true) { // Has many relation
$existingRecords = []; // Process new relations
/** @var BaseActiveRecord $relationModel */ $existingRecords = [];
foreach ($model->{$relationName} as $i => $relationModel) { /** @var BaseActiveRecord $relationModel */
if ($relationModel->isNewRecord) { foreach ($model->{$relationName} as $i => $relationModel) {
if ($relation->via !== null) { if ($relationModel->isNewRecord) {
if ($relation->via !== null) {
if ($relationModel->validate()) {
$relationModel->save();
} else {
$pettyRelationName = Inflector::camel2words($relationName, true) . " #{$i}";
$this->_addError($relationModel, $model, $relationName, $pettyRelationName);
throw new DbException("Related record {$pettyRelationName} could not be saved.");
}
}
$junctionTableColumns = $this->_getJunctionTableColumns($relationName, $relationModel);
$model->link($relationName, $relationModel, $junctionTableColumns);
} else {
$existingRecords[] = $relationModel;
}
if (count($relationModel->dirtyAttributes)) {
if ($relationModel->validate()) { if ($relationModel->validate()) {
$relationModel->save(); $relationModel->save();
} else { } else {
$pettyRelationName = Inflector::camel2words($relationName, true) . " #{$i}"; $pettyRelationName = Inflector::camel2words($relationName, true);
$this->_addError($relationModel, $model, $relationName, $pettyRelationName); $this->_addError($relationModel, $model, $relationName, $pettyRelationName);
throw new DbException("Related record {$pettyRelationName} could not be saved."); throw new DbException("Related record {$pettyRelationName} could not be saved.");
} }
} }
$junctionTableColumns = $this->_getJunctionTableColumns($relationName, $relationModel);
$model->link($relationName, $relationModel, $junctionTableColumns);
} else {
$existingRecords[] = $relationModel;
} }
if (count($relationModel->dirtyAttributes)) { $junctionTablePropertiesUsed = array_key_exists($relationName, $this->_relationsExtraColumns);
if ($relationModel->validate()) { // Process existing added and deleted relations
$relationModel->save(); list($addedPks, $deletedPks) = $this->_computePkDiff(
} else { $this->_oldRelationValue[$relationName],
$pettyRelationName = Inflector::camel2words($relationName, true); $existingRecords,
$this->_addError($relationModel, $model, $relationName, $pettyRelationName); $junctionTablePropertiesUsed
throw new DbException("Related record {$pettyRelationName} could not be saved."); );
// Deleted relations
$initialModels = ArrayHelper::index($this->_oldRelationValue[$relationName], function (BaseActiveRecord $model) {
return implode("-", $model->getPrimaryKey(true));
});
$initialRelations = $model->{$relationName};
foreach ($deletedPks as $key) {
$model->unlink($relationName, $initialModels[$key], true);
}
// Added relations
$actualModels = ArrayHelper::index(
$junctionTablePropertiesUsed ? $initialRelations : $model->{$relationName},
function (BaseActiveRecord $model) {
return implode("-", $model->getPrimaryKey(true));
} }
);
foreach ($addedPks as $key) {
$junctionTableColumns = $this->_getJunctionTableColumns($relationName, $actualModels[$key]);
$model->link($relationName, $actualModels[$key], $junctionTableColumns);
} }
} } else { // Has one relation
$junctionTablePropertiesUsed = array_key_exists($relationName, $this->_relationsExtraColumns); if ($this->_oldRelationValue[$relationName] !== $model->{$relationName}) {
// Process existing added and deleted relations if ($model->{$relationName} instanceof BaseActiveRecord) {
list($addedPks, $deletedPks) = $this->_computePkDiff( $model->link($relationName, $model->{$relationName});
$this->_oldRelationValue[$relationName], } else {
$existingRecords, if ($this->_oldRelationValue[$relationName] instanceof BaseActiveRecord) {
$junctionTablePropertiesUsed $model->unlink($relationName, $this->_oldRelationValue[$relationName]);
); }
// Deleted relations }
$initialModels = ArrayHelper::index($this->_oldRelationValue[$relationName], function (BaseActiveRecord $model) {
return implode("-", $model->getPrimaryKey(true));
});
$initialRelations = $model->{$relationName};
foreach ($deletedPks as $key) {
$model->unlink($relationName, $initialModels[$key], true);
}
// Added relations
$actualModels = ArrayHelper::index(
$junctionTablePropertiesUsed ? $initialRelations : $model->{$relationName},
function (BaseActiveRecord $model) {
return implode("-", $model->getPrimaryKey(true));
} }
);
foreach ($addedPks as $key) {
$junctionTableColumns = $this->_getJunctionTableColumns($relationName, $actualModels[$key]);
$model->link($relationName, $actualModels[$key], $junctionTableColumns);
}
} else { // Has one relation
if ($this->_oldRelationValue[$relationName] !== $model->{$relationName}) {
if ($model->{$relationName} instanceof BaseActiveRecord) { if ($model->{$relationName} instanceof BaseActiveRecord) {
$model->link($relationName, $model->{$relationName}); $model->{$relationName}->save();
} else {
if ($this->_oldRelationValue[$relationName] instanceof BaseActiveRecord) {
$model->unlink($relationName, $this->_oldRelationValue[$relationName]);
}
} }
}
if ($model->{$relationName} instanceof BaseActiveRecord) {
$model->{$relationName}->save();
}
}
} }
unset($this->_oldRelationValue[$relationName]); unset($this->_oldRelationValue[$relationName]);
} }

Write Preview
Loading…
Cancel
Save