Additional edge case for yiisoft#14150

Deele · May 12, 2017 · 625d554 · 625d554
1 parent 8a087c8
commit 625d554
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 6 deletions.
diff --git a/framework/db/ActiveQuery.php b/framework/db/ActiveQuery.php
@@ -813,17 +813,48 @@ public function getTablesUsedInFrom()
         $cleanedUpTableNames = [];
         foreach ($tableNames as $alias => $tableName) {
             if (!is_string($alias)) {
-                if (preg_match('~\s*({{.*?}})\s*~', $tableName, $matches)) {
-                    $alias = $tableName = $matches[1];
-                } elseif (preg_match('~^\s*([\'"`\[].*?[\'"`\]]|\w+)(?:(?:\s+(?:as)?\s*)([\'"`\[].*?[\'"`\]]|\w+))?\s*$~iu', $tableName, $matches)) {
+                $pattern = <<<PATTERN
+~
+^
+\s*
+(
+    (?:['"`\[]|{{)
+    .*?
+    (?:['"`\]]|}})
+    |
+    \w+
+)
+(?:
+    (?:
+        \s+
+        (?:as)?
+        \s*
+    )
+    (
+       (?:['"`\[]|{{)
+        .*?
+        (?:['"`\]]|}})
+        |
+        \w+
+    )
+)?
+\s*
+$
+~iux
+PATTERN;
+                if (preg_match($pattern, $tableName, $matches)) {
                     if (isset($matches[1])) {
                         if (isset($matches[2])) {
                             list(, $tableName, $alias) = $matches;
                         } else {
                             $tableName = $alias = $matches[1];
                         }
-                        $alias = '{{' . $alias . '}}';
-                        $tableName = '{{' . $tableName . '}}';
+                        if (strncmp($alias, '{{', 2) !== 0) {
+                            $alias = '{{' . $alias . '}}';
+                        }
+                        if (strncmp($tableName, '{{', 2) !== 0) {
+                            $tableName = '{{' . $tableName . '}}';
+                        }
                     }
                 }
             }

diff --git a/tests/framework/db/ActiveQueryTest.php b/tests/framework/db/ActiveQueryTest.php
@@ -319,7 +319,7 @@ public function testGetTablesAlias_isFromArray()
     public function testGetTablesAlias_isFromString()
     {
         $query = new ActiveQuery(null);
-        $query->from = 'profile AS \'prf\', user "usr", service srv, order, [a b] [c d]';
+        $query->from = 'profile AS \'prf\', user "usr", service srv, order, [a b] [c d], {{something}} AS myalias';
 
         $tables = $query->getTablesUsedInFrom();
 
@@ -329,6 +329,7 @@ public function testGetTablesAlias_isFromString()
             '{{srv}}' => '{{service}}',
             '{{order}}' => '{{order}}',
             '{{c d}}' => '{{a b}}',
+            '{{myalias}}' => '{{something}}'
         ], $tables);
     }