Mirrors/yii2
2
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2026-03-19 05:37:54 +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

11
framework/db/ActiveQuery.php
View File

@@ -792,6 +792,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
/**
* Returns table names used in [[from]] indexed by aliases.
* Both aliases and names are enclosed into {{ and }}.
* @return string[] table names indexed by aliases
* @throws \yii\base\InvalidConfigException
* @since 2.0.12
@@ -811,18 +812,18 @@ class ActiveQuery extends Query implements ActiveQueryInterface
// Clean up table names and aliases
$cleanedUpTableNames = [];
foreach ($tableNames as $alias => $tableName) {
if (preg_match('~{{(.*?)}}~', $tableName, $matches)) {
$alias = $tableName = $matches[1];
}
if (!is_string($alias)) {
if (preg_match('~^\s*([\'"`\[].*?[\'"`\]]|\w+)(?:(?:\s+(?:as)?\s*)([\'"`\[].*?[\'"`\]]|\w+))?\s*$~iu', $tableName, $matches)) {
if (preg_match('~\s*({{.*?}})\s*~', $tableName, $matches)) {
$alias = $tableName = $matches[1];
} elseif (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];
}
$alias = '{{' . $alias . '}}';
$tableName = '{{' . $tableName . '}}';
}
}
}