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

Refactored solution to be contained within ActiveQuery instead of helper

Browse Source
This commit is contained in:
Alexander Makarov
2017-04-25 23:12:50 +03:00
parent 8474927a55
commit 7db93fc33d
6 changed files with 172 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
framework/db/ActiveQuery.php
View File

@ -148,10 +148,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
}
if (empty($this->from)) {
/* @var $modelClass ActiveRecord */
$modelClass = $this->modelClass;
$tableName = $modelClass::tableName();
$this->from = [$tableName];
$this->from = [$this->getPrimaryTableName()];
}
if (empty($this->select) && !empty($this->join)) {
@ -559,9 +556,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
private function getTableNameAndAlias()
{
if (empty($this->from)) {
/* @var $modelClass ActiveRecord */
$modelClass = $this->modelClass;
$tableName = $modelClass::tableName();
$tableName = $this->getPrimaryTableName();
} else {
$tableName = '';
foreach ($this->from as $alias => $tableName) {
@ -783,9 +778,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
list($tableName, ) = $this->getTableNameAndAlias();
$this->from = [$alias => $tableName];
} else {
/* @var $modelClass ActiveRecord */
$modelClass = $this->modelClass;
$tableName = $modelClass::tableName();
$tableName = $this->getPrimaryTableName();
foreach ($this->from as $key => $table) {
if ($table === $tableName) {
@ -796,4 +789,89 @@ class ActiveQuery extends Query implements ActiveQueryInterface
}
return $this;
}
/**
* Table names based on from
* @return string[] table names
* @throws \yii\base\InvalidConfigException
* @since 2.0.12
*/
public function getFromTableNames()
{
$tableNames = [];
if (empty($this->from)) {
$tableNames[] = $this->getPrimaryTableName();
} elseif (is_array($this->from)) {
$tableNames = array_values($this->from);
} elseif (is_string($this->from)) {
$tableNames = preg_split('/\s*,\s*/', trim($this->from), -1, PREG_SPLIT_NO_EMPTY);
} else {
throw new InvalidConfigException(gettype($this->from). ' in $from is not supported.');
}
// Clean up table names
foreach ($tableNames as &$tableName) {
$tableName = preg_replace('/^(\w+)\s*.*$/', '$1', $tableName);
}
return $tableNames;
}
/**
* @return string[] table aliases based on from
* @throws \yii\base\InvalidConfigException
* @since 2.0.12
*/
public function getFromAliases()
{
$tablesAlias = [];
if (empty($this->from)) {
return [$this->getPrimaryTableName()];
}
if (is_string($this->from)) {
$tableNames = preg_split('/\s*,\s*/', trim($this->from), -1, PREG_SPLIT_NO_EMPTY);
} elseif (is_array($this->from)) {
$tableNames = $this->from;
} else {
throw new InvalidConfigException(gettype($this->from). ' in $from is not supported.');
}
foreach ($tableNames as $alias => $tableName) {
if (is_string($alias)) {
$tablesAlias[] = $alias;
} else {
$tablesAlias[] = $this->getAliasFromTableName($tableName);
}
}
return $tablesAlias;
}
/**
* Getting alias from table name
* Input string may contain alias already specified
*
* @param string $tableName
* @return string
* @since 2.0.12
*/
private function getAliasFromTableName($tableName)
{
$cleanedUpTableName = preg_replace('/\'|\"|`|as/u', '', trim($tableName));
return preg_replace('/^.+\s+(\w+)$/', '$1', $cleanedUpTableName);
}
/**
* @return string primary table name
* @since 2.0.12
*/
protected function getPrimaryTableName()
{
/* @var $modelClass ActiveRecord */
$modelClass = $this->modelClass;
return $modelClass::tableName();
}
}