Mirrors/yii2
2
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2026-03-12 02:09:48 +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

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

@@ -239,7 +239,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
$tables = $query->getTablesUsedInFrom();
$this->assertEquals([
Profile::tableName() => Profile::tableName(),
'{{' . Profile::tableName() . '}}' => '{{' . Profile::tableName() . '}}',
], $tables);
}
@@ -247,17 +247,17 @@ abstract class ActiveQueryTest extends DatabaseTestCase
{
$query = new ActiveQuery(null);
$query->from = [
'prf' => 'profile',
'usr' => 'user',
'a b' => 'c d',
'{{prf}}' => '{{profile}}',
'{{usr}}' => '{{user}}',
'{{a b}}' => '{{c d}}',
];
$tables = $query->getTablesUsedInFrom();
$this->assertEquals([
'prf' => 'profile',
'usr' => 'user',
'a b' => 'c d',
'{{prf}}' => '{{profile}}',
'{{usr}}' => '{{user}}',
'{{a b}}' => '{{c d}}',
], $tables);
}
@@ -269,11 +269,11 @@ abstract class ActiveQueryTest extends DatabaseTestCase
$tables = $query->getTablesUsedInFrom();
$this->assertEquals([
'prf' => 'profile',
'usr' => 'user',
'order' => 'order',
'customer' => 'customer',
'c d' => 'a b',
'{{prf}}' => '{{profile}}',
'{{usr}}' => '{{user}}',
'{{order}}' => '{{order}}',
'{{customer}}' => '{{customer}}',
'{{c d}}' => '{{a b}}',
], $tables);
}
@@ -294,7 +294,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
$tables = $query->getTablesUsedInFrom();
$this->assertEquals([
Profile::tableName() => Profile::tableName(),
'{{' . Profile::tableName() . '}}' => '{{' . Profile::tableName() . '}}',
], $tables);
}
@@ -302,17 +302,17 @@ abstract class ActiveQueryTest extends DatabaseTestCase
{
$query = new ActiveQuery(null);
$query->from = [
'prf' => 'profile',
'usr' => 'user',
'a b' => 'c d',
'{{prf}}' => '{{profile}}',
'{{usr}}' => '{{user}}',
'{{a b}}' => '{{c d}}',
];
$tables = $query->getTablesUsedInFrom();
$this->assertEquals([
'prf' => 'profile',
'usr' => 'user',
'a b' => 'c d',
'{{prf}}' => '{{profile}}',
'{{usr}}' => '{{user}}',
'{{a b}}' => '{{c d}}',
], $tables);
}
@@ -324,11 +324,11 @@ abstract class ActiveQueryTest extends DatabaseTestCase
$tables = $query->getTablesUsedInFrom();
$this->assertEquals([
'prf' => 'profile',
'usr' => 'user',
'srv' => 'service',
'order' => 'order',
'c d' => 'a b',
'{{prf}}' => '{{profile}}',
'{{usr}}' => '{{user}}',
'{{srv}}' => '{{service}}',
'{{order}}' => '{{order}}',
'{{c d}}' => '{{a b}}',
], $tables);
}
@@ -353,7 +353,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
$tables = $query->getTablesUsedInFrom();
$this->assertEquals([
'%order_item' => '%order_item',
'{{%order_item}}' => '{{%order_item}}',
], $tables);
}
}