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

改进Query类的find方法数据缓存机制

Browse Source
This commit is contained in:
thinkphp
2017-01-30 15:38:15 +08:00
parent e5b42f95c5
commit aa7a5e8c32
1 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2214,14 +2214,12 @@ class Query
// 执行操作 // 执行操作
$result = '' == $sql ? 0 : $this->execute($sql, $bind); $result = '' == $sql ? 0 : $this->execute($sql, $bind);
if ($result) { if ($result) {
if (is_string($pk)) {
if (isset($where[$pk])) { if (isset($where[$pk])) {
$data[$pk] = $where[$pk]; $data[$pk] = $where[$pk];
} elseif (isset($key) && strpos($key, '|')) { } elseif (is_string($pk) && isset($key) && strpos($key, '|')) {
list($a, $val) = explode('|', $key); list($a, $val) = explode('|', $key);
$data[$pk] = $val; $data[$pk] = $val;
} }
}
$options['data'] = $data; $options['data'] = $data;
$this->trigger('after_update', $options); $this->trigger('after_update', $options);
} }
@@ -2418,17 +2416,29 @@ class Query
// 获取实际执行的SQL语句 // 获取实际执行的SQL语句
return $this->connection->getRealSql($sql, $bind); return $this->connection->getRealSql($sql, $bind);
} }
if (is_string($pk)) {
if (!is_array($data)) {
if (isset($key) && strpos($key, '|')) {
list($a, $val) = explode('|', $key);
$item[$pk] = $val;
} else {
$item[$pk] = $data;
}
$data = $item;
}
}
$options['data'] = $data; $options['data'] = $data;
// 事件回调 // 事件回调
if ($result = $this->trigger('before_find', $options)) { if ($result = $this->trigger('before_find', $options)) {
} else { } else {
// 执行查询 // 执行查询
$result = $this->query($sql, $bind, $options['master'], $options['fetch_pdo']); $resultSet = $this->query($sql, $bind, $options['master'], $options['fetch_pdo']);
if ($result instanceof \PDOStatement) { if ($resultSet instanceof \PDOStatement) {
// 返回PDOStatement对象 // 返回PDOStatement对象
return $result; return $resultSet;
} }
$result = isset($resultSet[0]) ? $resultSet[0] : [];
} }
if (isset($cache)) { if (isset($cache)) {
@@ -2442,32 +2452,31 @@ class Query
} }
// 数据处理 // 数据处理
if (!empty($result[0])) { if (!empty($result)) {
$data = $result[0];
if (!empty($this->model)) { if (!empty($this->model)) {
// 返回模型对象 // 返回模型对象
$model = $this->model; $model = $this->model;
$data = new $model($data); $result = new $model($result);
$data->isUpdate(true, isset($options['where']['AND']) ? $options['where']['AND'] : null); $result->isUpdate(true, isset($options['where']['AND']) ? $options['where']['AND'] : null);
// 关联查询 // 关联查询
if (!empty($options['relation'])) { if (!empty($options['relation'])) {
$data->relationQuery($options['relation']); $result->relationQuery($options['relation']);
} }
// 预载入查询 // 预载入查询
if (!empty($options['with'])) { if (!empty($options['with'])) {
$data->eagerlyResult($data, $options['with']); $result->eagerlyResult($result, $options['with']);
} }
// 关联统计 // 关联统计
if (!empty($options['with_count'])) { if (!empty($options['with_count'])) {
$data->relationCount($data, $options['with_count']); $result->relationCount($result, $options['with_count']);
} }
} }
} elseif (!empty($options['fail'])) { } elseif (!empty($options['fail'])) {
$this->throwNotFound($options); $this->throwNotFound($options);
} else { } else {
$data = null; $result = null;
} }
return $data; return $result;
} }
/** /**
@@ -2635,6 +2644,11 @@ class Query
// 执行操作 // 执行操作
$result = $this->execute($sql, $bind); $result = $this->execute($sql, $bind);
if ($result) { if ($result) {
if (!is_array($data) && is_string($pk) && isset($key) && strpos($key, '|')) {
list($a, $val) = explode('|', $key);
$item[$pk] = $val;
$data = $item;
}
$options['data'] = $data; $options['data'] = $data;
$this->trigger('after_delete', $options); $this->trigger('after_delete', $options);
} }