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

改进数据库操作join自身后出错的问题

Browse Source
This commit is contained in:
thinkphp
2016-12-07 07:16:50 +08:00
parent 0788e048a7
commit 4780d194b5
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -183,6 +183,9 @@ abstract class Builder
$item = []; $item = [];
foreach ((array) $tables as $key => $table) { foreach ((array) $tables as $key => $table) {
if (!is_numeric($key)) { if (!is_numeric($key)) {
if (strpos($key, '@think')) {
$key = strstr($key, '@think', true);
}
$key = $this->parseSqlTable($key); $key = $this->parseSqlTable($key);
$item[] = $this->parseKey($key) . ' ' . $this->parseKey($table); $item[] = $this->parseKey($key) . ' ' . $this->parseKey($table);
} else { } else {

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

@@ -716,6 +716,9 @@ class Query
} }
} }
if (isset($alias)) { if (isset($alias)) {
if (isset($this->options['alias'][$table])) {
$table = $table . '@think' . uniqid();
}
$table = [$table => $alias]; $table = [$table => $alias];
$this->alias($table); $this->alias($table);
} }