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查询的返回值类型

Browse Source
This commit is contained in:
thinkphp
2018-10-18 19:05:37 +08:00
parent 8652c83ea1
commit 474916983e
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -436,9 +436,10 @@ class Query
// 返回SQL语句 // 返回SQL语句
return $pdo; return $pdo;
} }
$result = $pdo->fetchColumn(); $result = $pdo->fetchColumn();
if ($force) { if ($force) {
$result += 0; $result = (float) $result;
} }
if (isset($cache) && false !== $result) { if (isset($cache) && false !== $result) {
@@ -538,10 +539,13 @@ class Query
$options = $this->getOptions(); $options = $this->getOptions();
$subSql = $this->options($options)->field('count(' . $field . ')')->bind($this->bind)->buildSql(); $subSql = $this->options($options)->field('count(' . $field . ')')->bind($this->bind)->buildSql();
return $this->table([$subSql => '_group_count_'])->value('COUNT(*) AS tp_count', 0, true); $count = $this->table([$subSql => '_group_count_'])->value('COUNT(*) AS tp_count', 0);
} else {
$count = $this->aggregate('COUNT', $field);
} }
return $this->aggregate('COUNT', $field, true); return is_string($count) ? $count : (int) $count;
} }
/** /**