Mirrors/yii2
2
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2026-03-24 07:57:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

#14150: Added {{ and }} to getTablesUsedInFrom() output

Browse Source
This commit is contained in:
Alexander Makarov
2017-05-12 15:55:03 +03:00
parent 5ea1acc960
commit 8a087c8537
4 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/validators/UniqueValidator.php
View File

@@ -176,7 +176,7 @@ class UniqueValidator extends Validator
$primaryAlias = array_keys($query->getTablesUsedInFrom())[0];
$columns = $targetClass::primaryKey();
foreach($columns as $c => $column) {
$columns[$c] = "{{{$primaryAlias}}}.[[$column]]";
$columns[$c] = "{$primaryAlias}.[[$column]]";
}
$query->select($columns);
}
@@ -296,7 +296,7 @@ class UniqueValidator extends Validator
$primaryTableAlias = $tableAliases[0];
$prefixedConditions = [];
foreach ($conditions as $columnName => $columnValue) {
$prefixedColumn = "{{{$primaryTableAlias}}}.[[{$columnName}]]";
$prefixedColumn = "{$primaryTableAlias}.[[{$columnName}]]";
$prefixedConditions[$prefixedColumn] = $columnValue;
}