php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-04 06:37:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactored BaseActiveRecord::isPrimaryKey()

Browse Source
This commit is contained in:
Qiang Xue
2013-12-22 10:19:49 -05:00
parent d5f40b42cf
commit d620f3152e
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
framework/yii/db/BaseActiveRecord.php
View File

@ -1234,11 +1234,10 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface
public static function isPrimaryKey($keys)
{
$pks = static::primaryKey();
foreach ($keys as $key) {
if (!in_array($key, $pks, true)) {
if (count($keys) === count($pks)) {
return count(array_intersect($keys, $pks)) === count($pks);
} else {
return false;
}
}
return count($keys) === count($pks);
}
}

5
framework/yii/validators/UniqueValidator.php
View File

@ -55,7 +55,7 @@ class UniqueValidator extends Validator
return;
}
/** @var \yii\db\ActiveRecordInterface $className */
/** @var ActiveRecordInterface $className */
$className = $this->className === null ? get_class($object) : $this->className;
$attributeName = $this->attributeName === null ? $attribute : $this->attributeName;
@ -67,6 +67,7 @@ class UniqueValidator extends Validator
$exists = $query->exists();
} else {
// if current $object is in the database already we can't use exists()
/** @var ActiveRecordInterface[] $objects */
$objects = $query->limit(2)->all();
$n = count($objects);
if ($n === 1) {
@ -75,7 +76,7 @@ class UniqueValidator extends Validator
$exists = $object->getOldPrimaryKey() != $object->getPrimaryKey();
} else {
// non-primary key, need to exclude the current record based on PK
$exists = array_shift($objects)->getPrimaryKey() != $object->getOldPrimaryKey();
$exists = $objects[0]->getPrimaryKey() != $object->getOldPrimaryKey();
}
} else {
$exists = $n > 1;