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

修正Query类的chunk方法

Browse Source
This commit is contained in:
thinkphp
2016-04-25 12:15:12 +08:00
parent 612a9cbae9
commit 964248a10e
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1254,21 +1254,27 @@ class Query
*/ */
public function chunk($count, $callback, $column = null) public function chunk($count, $callback, $column = null)
{ {
$column = $column ?: $this->connection->getTableInfo('', 'pk'); $column = $column ?: $this->connection->getTableInfo('', 'pk');
$options = $this->getOptions(); $options = $this->getOptions();
if (empty($options['table'])) {
$table = $this->connection->getTable();
}
$resultSet = $this->limit($count)->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)) {
return false; return false;
} }
$end = end($resultSet); $end = end($resultSet);
$lastId = is_array($end) ? $end[$column] : $end->$column; $lastId = is_array($end) ? $end[$column] : $end->$column;
$resultSet = $this->options($options) $this->options($options)
->limit($count) ->limit($count)
->where($column, '>', $lastId) ->where($column, '>', $lastId)
->order($column, 'asc') ->order($column, 'asc');
->select(); if (isset($table)) {
$this->table($table);
}
$resultSet = $this->select();
} }
return true; return true;
} }