From 5670dca21a74e86a7ebf4d096d5fb424a219e53c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=91=E6=9E=97?= Date: Sun, 29 May 2022 01:52:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ActiveQuery.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ActiveQuery.php b/ActiveQuery.php index 4d5ccb7..1b9d35d 100644 --- a/ActiveQuery.php +++ b/ActiveQuery.php @@ -200,10 +200,10 @@ class ActiveQuery extends Component implements ISqlBuilder * @return Pagination * @throws Exception */ - public function page(int $size, callable $callback): Pagination + public function page(int $size, callable $callback, int $offset = 0): Pagination { $pagination = new Pagination($this); - $pagination->setOffset(0); + $pagination->setOffset($offset); $pagination->setLimit($size); $pagination->setCallback($callback); return $pagination; @@ -281,16 +281,16 @@ class ActiveQuery extends Component implements ISqlBuilder /** * @param array $data - * @return array|Command|bool|int|string + * @return bool * @throws Exception */ - public function batchUpdate(array $data): Command|array|bool|int|string + public function batchUpdate(array $data): bool { $generate = $this->builder->update($data); if (is_bool($generate)) { return $generate; } - return $this->execute(...$generate)->exec(); + return (bool)$this->execute(...$generate)->exec(); } /** @@ -303,7 +303,7 @@ class ActiveQuery extends Component implements ISqlBuilder [$sql, $params] = $this->builder->insert($data, TRUE); - return $this->execute($sql, $params)->exec(); + return (bool)$this->execute($sql, $params)->exec(); } /**