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

聚合查询字段支持DISTINCT

Browse Source
This commit is contained in:
thinkphp
2018-10-22 14:15:47 +08:00
parent b0514ee54c
commit 72b6c3ccaa
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -558,11 +558,15 @@ class Query
*/ */
public function aggregate($aggregate, $field, $force = false) public function aggregate($aggregate, $field, $force = false)
{ {
if (0 === stripos($field, 'DISTINCT ')) {
list($distinct, $field) = explode(' ', $field);
}
if (!preg_match('/^[\w\.\*]+$/', $field)) { if (!preg_match('/^[\w\.\*]+$/', $field)) {
throw new Exception('not support data:' . $field); throw new Exception('not support data:' . $field);
} }
$result = $this->value($aggregate . '(' . $field . ') AS tp_' . strtolower($aggregate), 0, $force); $result = $this->value($aggregate . '(' . (!empty($distinct) ? 'DISTINCT ' : '') . $field . ') AS tp_' . strtolower($aggregate), 0, $force);
return $result; return $result;
} }