php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-03 13:58:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #14211: Fixed regression in Unique and Exist validators

Browse Source
This commit is contained in:
Alexander Makarov
2017-05-26 00:31:30 +03:00
parent dbeadba085
commit 9b8b965fcb
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/db/ActiveQuery.php
View File

@ -822,7 +822,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
.*?
(?:['"`\]]|}})
|
\w+
.*?
)
(?:
(?:
@ -835,7 +835,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
.*?
(?:['"`\]]|}})
|
\w+
.*?
)
)?
\s*

15
tests/framework/db/ActiveQueryTest.php
View File

@ -357,4 +357,19 @@ abstract class ActiveQueryTest extends DatabaseTestCase
'{{%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);
}
}