php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-02 21:41:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #13704: Fixed yii\validators\UniqueValidator to prefix attribute name with model's database table name

Browse Source
This commit is contained in:
vladis84
2017-03-14 20:37:52 +05:00
committed by Alexander Makarov
parent b00cd65ef3
commit 3c1f3e20cf
3 changed files with 52 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
framework/validators/UniqueValidator.php
View File

@ -10,9 +10,9 @@ namespace yii\validators;
use Yii;
use yii\base\Model;
use yii\db\ActiveQuery;
use yii\db\ActiveRecord;
use yii\db\ActiveQueryInterface;
use yii\db\ActiveRecordInterface;
use yii\db\Query;
use yii\helpers\Inflector;
/**
@ -119,7 +119,7 @@ class UniqueValidator extends Validator
public function validateAttribute($model, $attribute)
{
/* @var $targetClass ActiveRecordInterface */
$targetClass = $this->targetClass === null ? get_class($model) : $this->targetClass;
$targetClass = $this->getTargetClass($model);
$targetAttribute = $this->targetAttribute === null ? $attribute : $this->targetAttribute;
$rawConditions = $this->prepareConditions($targetAttribute, $model, $attribute);
$conditions[] = $this->targetAttributeJunction === 'or' ? 'or' : 'and';
@ -141,6 +141,15 @@ class UniqueValidator extends Validator
}
}
/**
* @param Model $model the data model to be validated
* @return string Target class name
*/
private function getTargetClass($model)
{
return $this->targetClass === null ? get_class($model) : $this->targetClass;
}
/**
* Checks whether the $model exists in the database.
*
@ -234,7 +243,20 @@ class UniqueValidator extends Validator
$conditions = [$targetAttribute => $model->$attribute];
}
return $conditions;
if (!$model instanceof ActiveRecord) {
return $conditions;
}
// Add table prefix for column
$targetClass = $this->getTargetClass($model);
$tableName = $targetClass::tableName();
$conditionsWithTableName = [];
foreach ($conditions as $columnName => $columnValue) {
$prefixedColumnName = "{$tableName}.$columnName";
$conditionsWithTableName[$prefixedColumnName] = $columnValue;
}
return $conditionsWithTableName;
}
/**