Fixes #14150

yiisoft · May 12, 2017 · c6ab3f8 · c6ab3f8
1 parent b7f0495
commit c6ab3f8
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/db/ActiveQuery.php b/db/ActiveQuery.php
@@ -811,6 +811,10 @@ public function getTablesUsedInFrom()
         // 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 (isset($matches[1])) {