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

Further changes for unique and exist validators

Browse Source 
- Combined methods for getting names and aliases of from tables
- Normalized names and aliases
- Added MSSQL syntax
- Added support for spaces in aliases and table names
This commit is contained in:
Alexander Makarov
2017-05-10 00:34:45 +03:00
parent 37fc6c5afb
commit 23cc4bf4fe
5 changed files with 78 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
framework/db/ActiveQuery.php
View File

@ -791,77 +791,45 @@ class ActiveQuery extends Query implements ActiveQueryInterface
}
/**
* Table names based on [[from]]
* @return string[] table names
* Returns table names used in [[from]] indexed by aliases.
* @return string[] table names indexed by aliases
* @throws \yii\base\InvalidConfigException
* @since 2.0.12
*/
public function getTableNamesUsedInFrom()
public function getTablesUsedInFrom()
{
$tableNames = [];
if (empty($this->from)) {
$tableNames[] = $this->getPrimaryTableName();
$tableNames = [$this->getPrimaryTableName()];
} elseif (is_array($this->from)) {
$tableNames = array_values($this->from);
$tableNames = $this->from;
} elseif (is_string($this->from)) {
$tableNames = preg_split('/\s*,\s*/', trim($this->from), -1, PREG_SPLIT_NO_EMPTY);
} else {
throw new InvalidConfigException(gettype($this->from) . ' in $from is not supported.');
}
// Clean up table names
foreach ($tableNames as &$tableName) {
$tableName = preg_replace('/^(\w+)\s*.*$/', '$1', $tableName);
}
return $tableNames;
}
/**
* @return string[] table aliases based on [[from]]
* @throws \yii\base\InvalidConfigException
* @since 2.0.12
*/
public function getAliasesUsedInFrom()
{
$tablesAlias = [];
if (empty($this->from)) {
return [$this->getPrimaryTableName()];
}
if (is_string($this->from)) {
$tableNames = preg_split('/\s*,\s*/', trim($this->from), -1, PREG_SPLIT_NO_EMPTY);
} elseif (is_array($this->from)) {
$tableNames = $this->from;
} else {
throw new InvalidConfigException(gettype($this->from) . ' in $from is not supported.');
}
// Clean up table names and aliases
$cleanedUpTableNames = [];
foreach ($tableNames as $alias => $tableName) {
if (is_string($alias)) {
$tablesAlias[] = $alias;
} else {
$tablesAlias[] = $this->getAliasFromTableName($tableName);
if (!is_string($alias)) {
if (preg_match('~^\s*([\'"`\[].*?[\'"`\]]|\w+)(?:(?:\s+(?:as)?\s*)([\'"`\[].*?[\'"`\]]|\w+))?\s*$~iu', $tableName, $matches)) {
if (isset($matches[1])) {
if (isset($matches[2])) {
list(, $tableName, $alias) = $matches;
} else {
$tableName = $alias = $matches[1];
}
}
}
}
$tableName = str_replace(["'", '"', '`', '[', ']'], '', $tableName);
$alias = str_replace(["'", '"', '`', '[', ']'], '', $alias);
$cleanedUpTableNames[$alias] = $tableName;
}
return $tablesAlias;
}
/**
* Getting alias from table name
* Input string may contain alias already specified
*
* @param string $tableName
* @return string
* @since 2.0.12
*/
private function getAliasFromTableName($tableName)
{
$cleanedUpTableName = preg_replace('/\'|\"|`|as/u', '', trim($tableName));
return preg_replace('/^.+\s+(\w+)$/', '$1', $cleanedUpTableName);
return $cleanedUpTableNames;
}
/**

4
framework/validators/ExistValidator.php
View File

@ -156,11 +156,11 @@ class ExistValidator extends Validator
/** @var ActiveRecord $targetClass */
$query = $targetClass::find();
$tableAliases = $query->getAliasesUsedInFrom();
$tableAliases = array_keys($query->getTablesUsedInFrom());
$primaryTableAlias = $tableAliases[0];
$prefixedConditions = [];
foreach ($conditions as $columnName => $columnValue) {
$prefixedColumn = "{$primaryTableAlias}.{$columnName}";
$prefixedColumn = "{{{$primaryTableAlias}}}.[[{$columnName}]]";
$prefixedConditions[$prefixedColumn] = $columnValue;
}

4
framework/validators/UniqueValidator.php
View File

@ -252,11 +252,11 @@ class UniqueValidator extends Validator
/** @var ActiveRecord $targetClass */
$query = $targetClass::find();
$tableAliases = $query->getAliasesUsedInFrom();
$tableAliases = array_keys($query->getTablesUsedInFrom());
$primaryTableAlias = $tableAliases[0];
$prefixedConditions = [];
foreach ($conditions as $columnName => $columnValue) {
$prefixedColumn = "{$primaryTableAlias}.{$columnName}";
$prefixedColumn = "{{{$primaryTableAlias}}}.[[{$columnName}]]";
$prefixedConditions[$prefixedColumn] = $columnValue;
}