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

Alternative names

Browse Source
This commit is contained in:
Alexander Makarov
2017-04-26 15:36:36 +03:00
parent 63253ceafc
commit 37fc6c5afb
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/db/ActiveQuery.php
View File

@ -796,7 +796,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
* @throws \yii\base\InvalidConfigException * @throws \yii\base\InvalidConfigException
* @since 2.0.12 * @since 2.0.12
*/ */
public function getFromTableNames() public function getTableNamesUsedInFrom()
{ {
$tableNames = []; $tableNames = [];
@ -823,7 +823,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
* @throws \yii\base\InvalidConfigException * @throws \yii\base\InvalidConfigException
* @since 2.0.12 * @since 2.0.12
*/ */
public function getFromAliases() public function getAliasesUsedInFrom()
{ {
$tablesAlias = []; $tablesAlias = [];

2
framework/validators/ExistValidator.php
View File

@ -156,7 +156,7 @@ class ExistValidator extends Validator
/** @var ActiveRecord $targetClass */ /** @var ActiveRecord $targetClass */
$query = $targetClass::find(); $query = $targetClass::find();
$tableAliases = $query->getFromAliases(); $tableAliases = $query->getAliasesUsedInFrom();
$primaryTableAlias = $tableAliases[0]; $primaryTableAlias = $tableAliases[0];
$prefixedConditions = []; $prefixedConditions = [];
foreach ($conditions as $columnName => $columnValue) { foreach ($conditions as $columnName => $columnValue) {

2
framework/validators/UniqueValidator.php
View File

@ -252,7 +252,7 @@ class UniqueValidator extends Validator
/** @var ActiveRecord $targetClass */ /** @var ActiveRecord $targetClass */
$query = $targetClass::find(); $query = $targetClass::find();
$tableAliases = $query->getFromAliases(); $tableAliases = $query->getAliasesUsedInFrom();
$primaryTableAlias = $tableAliases[0]; $primaryTableAlias = $tableAliases[0];
$prefixedConditions = []; $prefixedConditions = [];
foreach ($conditions as $columnName => $columnValue) { foreach ($conditions as $columnName => $columnValue) {

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

@ -236,7 +236,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
{ {
$query = new ActiveQuery(Profile::className()); $query = new ActiveQuery(Profile::className());
$tableNames = $query->getFromTableNames(); $tableNames = $query->getTableNamesUsedInFrom();
$this->assertEquals([Profile::tableName()], $tableNames); $this->assertEquals([Profile::tableName()], $tableNames);
} }
@ -246,7 +246,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
$query = new ActiveQuery(null); $query = new ActiveQuery(null);
$query->from = ['prf' => 'profile', 'usr' => 'user']; $query->from = ['prf' => 'profile', 'usr' => 'user'];
$tableNames = $query->getFromTableNames(); $tableNames = $query->getTableNamesUsedInFrom();
$this->assertEquals(['profile', 'user'], $tableNames); $this->assertEquals(['profile', 'user'], $tableNames);
} }
@ -256,7 +256,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
$query = new ActiveQuery(null); $query = new ActiveQuery(null);
$query->from = 'profile AS \'prf\', user "usr", `order`, "customer"'; $query->from = 'profile AS \'prf\', user "usr", `order`, "customer"';
$tableNames = $query->getFromTableNames(); $tableNames = $query->getTableNamesUsedInFrom();
$this->assertEquals(['profile', 'user', '`order`', '"customer"'], $tableNames); $this->assertEquals(['profile', 'user', '`order`', '"customer"'], $tableNames);
} }
@ -268,14 +268,14 @@ abstract class ActiveQueryTest extends DatabaseTestCase
$this->setExpectedException('\yii\base\InvalidConfigException'); $this->setExpectedException('\yii\base\InvalidConfigException');
$query->getFromTableNames(); $query->getTableNamesUsedInFrom();
} }
public function testGetTablesAlias_notFilledFrom() public function testGetTablesAlias_notFilledFrom()
{ {
$query = new ActiveQuery(Profile::className()); $query = new ActiveQuery(Profile::className());
$tablesAlias = $query->getFromAliases(); $tablesAlias = $query->getAliasesUsedInFrom();
$this->assertEquals([Profile::tableName()], $tablesAlias); $this->assertEquals([Profile::tableName()], $tablesAlias);
} }
@ -285,7 +285,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
$query = new ActiveQuery(null); $query = new ActiveQuery(null);
$query->from = ['prf' => 'profile', 'usr' => 'user']; $query->from = ['prf' => 'profile', 'usr' => 'user'];
$tablesAlias = $query->getFromAliases(); $tablesAlias = $query->getAliasesUsedInFrom();
$this->assertEquals(['prf', 'usr'], $tablesAlias); $this->assertEquals(['prf', 'usr'], $tablesAlias);
} }
@ -295,7 +295,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
$query = new ActiveQuery(null); $query = new ActiveQuery(null);
$query->from = 'profile AS \'prf\', user "usr", service srv, order'; $query->from = 'profile AS \'prf\', user "usr", service srv, order';
$tablesAlias = $query->getFromAliases(); $tablesAlias = $query->getAliasesUsedInFrom();
$this->assertEquals(['prf', 'usr', 'srv', 'order'], $tablesAlias); $this->assertEquals(['prf', 'usr', 'srv', 'order'], $tablesAlias);
} }
@ -307,6 +307,6 @@ abstract class ActiveQueryTest extends DatabaseTestCase
$this->setExpectedException('\yii\base\InvalidConfigException'); $this->setExpectedException('\yii\base\InvalidConfigException');
$query->getFromAliases(); $query->getAliasesUsedInFrom();
} }
} }