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

修正count avg方法使用fetchsql无法正确返回sql的问题

Browse Source
This commit is contained in:
thinkphp
2016-11-12 10:38:19 +08:00
parent fd30f090e4
commit a924186ce6
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -378,7 +378,7 @@ class Query
public function value($field, $default = null) public function value($field, $default = null)
{ {
$result = false; $result = false;
if (!empty($this->options['cache'])) { if (empty($options['fetch_sql']) && !empty($this->options['cache'])) {
// 判断查询缓存 // 判断查询缓存
$cache = $this->options['cache']; $cache = $this->options['cache'];
if (empty($this->options['table'])) { if (empty($this->options['table'])) {
@@ -422,7 +422,7 @@ class Query
public function column($field, $key = '') public function column($field, $key = '')
{ {
$result = false; $result = false;
if (!empty($this->options['cache'])) { if (empty($options['fetch_sql']) && !empty($this->options['cache'])) {
// 判断查询缓存 // 判断查询缓存
$cache = $this->options['cache']; $cache = $this->options['cache'];
if (empty($this->options['table'])) { if (empty($this->options['table'])) {
@@ -489,7 +489,8 @@ class Query
*/ */
public function count($field = '*') public function count($field = '*')
{ {
return (int) $this->value('COUNT(' . $field . ') AS tp_count', 0); $value = $this->value('COUNT(' . $field . ') AS tp_count', 0);
return is_numeric($value) ? (int) $value : $value;
} }
/** /**
@@ -500,7 +501,8 @@ class Query
*/ */
public function sum($field = '*') public function sum($field = '*')
{ {
return $this->value('SUM(' . $field . ') AS tp_sum', 0) + 0; $value = $this->value('SUM(' . $field . ') AS tp_sum', 0);
return is_numeric($value) ? $value + 0 : $value;
} }
/** /**
@@ -535,7 +537,8 @@ class Query
*/ */
public function avg($field = '*') public function avg($field = '*')
{ {
return $this->value('AVG(' . $field . ') AS tp_avg', 0) + 0; $value = $this->value('AVG(' . $field . ') AS tp_avg', 0);
return is_numeric($value) ? $value + 0 : $value;
} }
/** /**