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

改进

Browse Source
This commit is contained in:
thinkphp
2018-04-13 14:39:18 +08:00
parent 287b390c8f
commit 9eb57bf3bc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -191,7 +191,7 @@ abstract class Builder
} elseif (!is_numeric($key)) { } elseif (!is_numeric($key)) {
$array[] = $this->parseKey($key, $options) . ' AS ' . $this->parseKey($field, $options, true); $array[] = $this->parseKey($key, $options) . ' AS ' . $this->parseKey($field, $options, true);
} else { } else {
$array[] = $this->parseKey($field, $options, true); $array[] = $this->parseKey($field, $options);
} }
} }
$fieldsStr = implode(',', $array); $fieldsStr = implode(',', $array);
@@ -579,8 +579,8 @@ abstract class Builder
} else { } else {
$sort = $val; $sort = $val;
} }
$sort = strtoupper($sort);
$sort = in_array(strtolower($sort), ['asc', 'desc'], true) ? ' ' . $sort : ''; $sort = in_array($sort, ['ASC', 'DESC'], true) ? ' ' . $sort : '';
$array[] = $this->parseKey($key, $options, true) . $sort; $array[] = $this->parseKey($key, $options, true) . $sort;
} }
} }