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

Optimize yii\validators\ExistValidator

Browse Source 
Optimize methods `valueExists()` and `checkTargetRelationExistence()`
This commit is contained in:
Anton
2021-08-04 23:40:25 +03:00
committed by GitHub
parent be1b98b1df
commit 1474e2d61a
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
framework/validators/ExistValidator.php
View File

@ -131,15 +131,13 @@ class ExistValidator extends Validator
$relationQuery->andWhere($this->filter);
}
if ($this->forceMasterDb && method_exists($model::getDb(), 'useMaster')) {
$model::getDb()->useMaster(function() use ($relationQuery, &$exists) {
$exists = $relationQuery->exists();
});
$connection = $model::getDb();
if ($this->forceMasterDb && method_exists($connection, 'useMaster')) {
$exists = $connection->useMaster([$relationQuery, 'exists']);
} else {
$exists = $relationQuery->exists();
}
if (!$exists) {
$this->addError($model, $attribute, $this->message);
}
@ -246,9 +244,9 @@ class ExistValidator extends Validator
}
/**
* Check whether value exists in target table
* Check whether value exists in target table.
*
* @param string $targetClass
* @param string $targetClass the model
* @param QueryInterface $query
* @param mixed $value the value want to be checked
* @return bool
@ -259,8 +257,8 @@ class ExistValidator extends Validator
$exists = false;
if ($this->forceMasterDb && method_exists($db, 'useMaster')) {
$db->useMaster(function ($db) use ($query, $value, &$exists) {
$exists = $this->queryValueExists($query, $value);
$exists = $db->useMaster(function () use ($query, $value) {
return $this->queryValueExists($query, $value);
});
} else {
$exists = $this->queryValueExists($query, $value);
@ -271,7 +269,7 @@ class ExistValidator extends Validator
/**
* Run query to check if value exists
* Run query to check if value exists.
*
* @param QueryInterface $query
* @param mixed $value the value to be checked
@ -280,7 +278,7 @@ class ExistValidator extends Validator
private function queryValueExists($query, $value)
{
if (is_array($value)) {
return $query->count("DISTINCT [[$this->targetAttribute]]") == count(array_unique($value)) ;
return $query->count("DISTINCT [[$this->targetAttribute]]") == count(array_unique($value));
}
return $query->exists();
}