Fixes #14211: Fixed regression in Unique and Exist validators

yiisoft · May 25, 2017 · 9b8b965 · 9b8b965
1 parent dbeadba
commit 9b8b965
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/framework/db/ActiveQuery.php b/framework/db/ActiveQuery.php
@@ -822,7 +822,7 @@ public function getTablesUsedInFrom()
     .*?
     (?:['"`\]]|}})
     |
-    \w+
+    .*?
 )
 (?:
     (?:
@@ -835,7 +835,7 @@ public function getTablesUsedInFrom()
         .*?
         (?:['"`\]]|}})
         |
-        \w+
+        .*?
     )
 )?
 \s*

diff --git a/tests/framework/db/ActiveQueryTest.php b/tests/framework/db/ActiveQueryTest.php
@@ -357,4 +357,19 @@ public function testGetTableAliasFromPrefixedTableName()
             '{{%order_item}}' => '{{%order_item}}',
         ], $tables);
     }
+
+    /**
+     * @see https://github.com/yiisoft/yii2/issues/14211
+     */
+    public function testGetTableAliasFromTableNameWithDatabase()
+    {
+        $query = new ActiveQuery(null);
+        $query->from = 'tickets.workflows';
+
+        $tables = $query->getTablesUsedInFrom();
+
+        $this->assertEquals([
+            '{{tickets.workflows}}' => '{{tickets.workflows}}',
+        ], $tables);
+    }
 }