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

改进table方法的解析

Browse Source
This commit is contained in:
thinkphp
2016-10-06 20:37:12 +08:00
parent e6976918de
commit 32e001cdc6
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
library/think/db/Builder.php
View File

@@ -173,29 +173,25 @@ abstract class Builder
/**
* table分析
* @access protected
* @param mixed $table
* @param mixed $tables
* @param array $options
* @return string
*/
protected function parseTable($tables, $options = [])
{
if (is_array($tables)) {
// 支持别名定义
foreach ($tables as $table => $alias) {
$array[] = !is_numeric($table) ?
$this->parseKey($table) . ' ' . $this->parseKey($alias) :
$this->parseKey($alias);
}
$tables = implode(',', $array);
} elseif (is_string($tables)) {
$tables = $this->parseSqlTable($tables);
if (isset($options['alias'][$tables])) {
$tables = $this->parseKey($tables) . ' ' . $this->parseKey($options['alias'][$tables]);
if (is_string($tables)) {
$tables = (array) $tables;
}
$item = [];
foreach ($tables as $table) {
$table = $this->parseSqlTable($table);
if (isset($options['alias'][$table])) {
$item[] = $this->parseKey($table) . ' ' . $this->parseKey($options['alias'][$table]);
} else {
$tables = $this->parseKey($tables);
$item[] = $this->parseKey($table);
}
}
return $tables;
return implode(',', $item);
}
/**

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

@@ -1049,6 +1049,17 @@ class Query
list($table, $alias) = explode(' ', $table);
$this->alias([$table => $alias]);
}
} else {
$tables = $table;
$table = [];
foreach ($tables as $key => $val) {
if (is_numeric($key)) {
$table[] = $val;
} else {
$this->alias([$key => $val]);
$table[] = $key;
}
}
}
$this->options['table'] = $table;
return $this;