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

改进count查询对group的支持

Browse Source
This commit is contained in:
thinkphp
2017-01-19 18:52:26 +08:00
parent ecd0ff3536
commit e1b35abd51
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -509,10 +509,17 @@ class Query
* COUNT查询 * COUNT查询
* @access public * @access public
* @param string $field 字段名 * @param string $field 字段名
* @return integer * @return integer|string
*/ */
public function count($field = '*') public function count($field = '*')
{ {
if (isset($this->options['group'])) {
// 支持GROUP
$options = $this->getOptions();
$subSql = $this->options($options)->field('count(' . $field . ')')->bind($this->bind)->buildSql();
return $this->table([$subSql => '_group_count_'])->value('COUNT(*) AS tp_count', 0, true);
}
return $this->value('COUNT(' . $field . ') AS tp_count', 0, true); return $this->value('COUNT(' . $field . ') AS tp_count', 0, true);
} }
@@ -2227,7 +2234,7 @@ class Query
if ($data instanceof Query) { if ($data instanceof Query) {
return $data->select(); return $data->select();
} elseif ($data instanceof \Closure) { } elseif ($data instanceof \Closure) {
call_user_func_array($data, [& $this]); call_user_func_array($data, [ & $this]);
$data = null; $data = null;
} }
// 分析查询表达式 // 分析查询表达式
@@ -2327,7 +2334,7 @@ class Query
if ($data instanceof Query) { if ($data instanceof Query) {
return $data->find(); return $data->find();
} elseif ($data instanceof \Closure) { } elseif ($data instanceof \Closure) {
call_user_func_array($data, [& $this]); call_user_func_array($data, [ & $this]);
$data = null; $data = null;
} }
// 分析查询表达式 // 分析查询表达式