mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-06 15:02:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

改进Query类的table方法和alias方法

Browse Source
This commit is contained in:
thinkphp
2016-10-09 12:08:49 +08:00
parent 6f9fc912df
commit e3ec75d001
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
library/think/db/Query.php
View File

@@ -1046,7 +1046,8 @@ class Query
} }
} elseif (strpos($table, ' ')) { } elseif (strpos($table, ' ')) {
list($table, $alias) = explode(' ', $table); list($table, $alias) = explode(' ', $table);
$this->alias([$table => $alias]); $table = [$table => $alias];
$this->alias($table);
} }
} else { } else {
$tables = $table; $tables = $table;
@@ -1189,7 +1190,11 @@ class Query
$this->options['alias'][$key] = $val; $this->options['alias'][$key] = $val;
} }
} else { } else {
$table = isset($this->options['table']) ? $this->options['table'] : $this->getTable(); if (isset($this->options['table'])) {
$table = is_array($this->options['table']) ? key($this->options['table']) : $this->options['table'];
} else {
$table = $this->getTable();
}
$this->options['alias'][$table] = $alias; $this->options['alias'][$table] = $alias;
} }