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

改进chunk方法 支持在调用chunk之前使用连贯操作方法

Browse Source
This commit is contained in:
thinkphp
2016-04-19 13:25:31 +08:00
parent 7d8ea08194
commit 1f0892f93c
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1180,14 +1180,13 @@ class Query
* @param integer $count 每次处理的数据数量 * @param integer $count 每次处理的数据数量
* @param callable $callback 处理回调方法 * @param callable $callback 处理回调方法
* @param string $column 分批处理的字段名 * @param string $column 分批处理的字段名
* @param array|Closure $where 查询条件
* @return array * @return array
*/ */
public function chunk($count, $callback, $column = null, $where = []) public function chunk($count, $callback, $column = null)
{ {
$column = $column ?: $this->connection->getTableInfo('', 'pk'); $column = $column ?: $this->connection->getTableInfo('', 'pk');
$model = isset($this->options['model']) ? $this->options['model'] : ''; $options = $this->getOptions();
$resultSet = $this->limit($count)->where($where)->order($column, 'asc')->select(); $resultSet = $this->limit($count)->order($column, 'asc')->select();
while (!empty($resultSet)) { while (!empty($resultSet)) {
if (false === call_user_func($callback, $resultSet)) { if (false === call_user_func($callback, $resultSet)) {
@@ -1195,9 +1194,8 @@ class Query
} }
$end = end($resultSet); $end = end($resultSet);
$lastId = is_array($end) ? $end[$column] : $end->$column; $lastId = is_array($end) ? $end[$column] : $end->$column;
$resultSet = $this->model($model) $resultSet = $this->options($options)
->limit($count) ->limit($count)
->where($where)
->where($column, '>', $lastId) ->where($column, '>', $lastId)
->order($column, 'asc') ->order($column, 'asc')
->select(); ->select();