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

Model类get方法使用主键查询自动缓存

Browse Source
This commit is contained in:
thinkphp
2016-08-16 22:39:53 +08:00
parent 8d32fcce08
commit f3ff63268a
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
library/think/Model.php
View File

@@ -985,6 +985,9 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
*/ */
public static function get($data = null, $with = [], $cache = false) public static function get($data = null, $with = [], $cache = false)
{ {
if (!$cache && $data && is_scalar($data)) {
$cache = true;
}
$query = static::parseQuery($data, $with, $cache); $query = static::parseQuery($data, $with, $cache);
return $query->find($data); return $query->find($data);
} }

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

@@ -1768,8 +1768,8 @@ class Query
public function update(array $data) public function update(array $data)
{ {
$options = $this->parseExpress(); $options = $this->parseExpress();
$pk = $this->getPk($options);
if (empty($options['where'])) { if (empty($options['where'])) {
$pk = $this->getPk($options);
// 如果存在主键数据 则自动作为更新条件 // 如果存在主键数据 则自动作为更新条件
if (is_string($pk) && isset($data[$pk])) { if (is_string($pk) && isset($data[$pk])) {
$where[$pk] = $data[$pk]; $where[$pk] = $data[$pk];
@@ -1793,6 +1793,8 @@ class Query
} else { } else {
$options['where']['AND'] = $where; $options['where']['AND'] = $where;
} }
} elseif (is_string($pk) && isset($options['where']['AND'][$pk]) && is_scalar($options['where']['AND'][$pk])) {
$key = 'think:' . $options['table'] . '|' . $options['where']['AND'][$pk];
} }
// 生成UPDATE SQL语句 // 生成UPDATE SQL语句
$sql = $this->builder()->update($data, $options); $sql = $this->builder()->update($data, $options);