Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: QueryBuilder limit(0) bug #8280

Merged
merged 14 commits into from
Dec 16, 2023
Merged

fix: QueryBuilder limit(0) bug #8280

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6ac484b
test: add test for limit(0)
kenjis Nov 30, 2023
4287fcc
fix!: limit(0) returns all records
kenjis Nov 30, 2023
88bf412
test: update expectations
kenjis Nov 30, 2023
05d7a7c
fix!: change $limit default value from 0 to null
kenjis Nov 30, 2023
e46b533
fix!: SQLSRV _limit(0)
kenjis Dec 1, 2023
f23b18a
feat: add feature flag for limit(0)
kenjis Dec 1, 2023
bf05316
config: by default, $limitZeroAsAll = true
kenjis Dec 2, 2023
280d17d
docs: update description for $limitZeroAsAll
kenjis Dec 2, 2023
a833508
docs: add docs
kenjis Dec 2, 2023
7f7029e
test: update test code
kenjis Dec 3, 2023
a05bfeb
fix: limit(0) and get($limit) behavior
kenjis Dec 3, 2023
5cde3b7
docs: update @param
kenjis Dec 9, 2023
05645ce
docs: add about impact on Model
kenjis Dec 9, 2023
20ea393
fix: getWhere(), update(), delete() and $limit=0
kenjis Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: limit(0) and get($limit) behavior
  • Loading branch information
@kenjis
kenjis committed Dec 9, 2023
commit a05bfebe73c4881365f61745782732590cea3977
8 changes: 6 additions & 2 deletions system/Database/BaseBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1489,6 +1489,10 @@ public function orderBy(string $orderBy, string $direction = '', ?bool $escape =
*/
public function limit(?int $value = null, ?int $offset = 0)
{
if (config(Feature::class)->limitZeroAsAll && $value === 0) {
$value = null;
}

if ($value !== null) {
$this->QBLimit = $value;
}
Expand Down Expand Up @@ -1606,8 +1610,8 @@ protected function compileFinalQuery(string $sql): string
*/
public function get(?int $limit = null, int $offset = 0, bool $reset = true)
{
if (config(Feature::class)->limitZeroAsAll) {
$limit ??= 0;
if (config(Feature::class)->limitZeroAsAll && $limit === 0) {
$limit = null;
}

if ($limit !== null) {
Expand Down
4 changes: 4 additions & 0 deletions system/Database/SQLSRV/Builder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,6 +618,10 @@ protected function compileSelect($selectOverride = false): string
*/
public function get(?int $limit = null, int $offset = 0, bool $reset = true)
{
if (config(Feature::class)->limitZeroAsAll && $limit === 0) {
$limit = null;
}

if ($limit !== null) {
$this->limit($limit, $offset);
}
Expand Down