Skip to content

Remove hasLimit() and hasOffset() usage #310

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

Merged
Tigrov merged 2 commits into from
Mar 14, 2025
Merged

Remove hasLimit() and hasOffset() usage #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77ffc10
Remove `hasLimit()` and `hasOffset()` usage
Tigrov Mar 13, 2025
080049c
Add line to CHANGELOG.md [skip ci]
Tigrov Mar 13, 2025
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
- Enh #306: Minor refactoring (@Tigrov)
- New #307: Add parameters `$ifExists` and `$cascade` to `CommandInterface::dropTable()` and
`DDLQueryBuilderInterface::dropTable()` methods (@vjik)
- Chg #310: Remove usage of `hasLimit()` and `hasOffset()` methods of `DQLQueryBuilder` class (@Tigrov)

## 1.3.0 March 21, 2024

Expand Down
8 changes: 4 additions & 4 deletions src/DQLQueryBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ public function buildOrderByAndLimit(

$filters = [];

if ($this->hasOffset($offset)) {
if (!empty($offset)) {
$filters[] = 'rowNumId > ' .
($offset instanceof ExpressionInterface ? $this->buildExpression($offset) : (string)$offset);
($offset instanceof ExpressionInterface ? $this->buildExpression($offset) : (string) $offset);
}

if ($this->hasLimit($limit)) {
if ($limit !== null) {
$filters[] = 'rownum <= ' .
($limit instanceof ExpressionInterface ? $this->buildExpression($limit) : (string)$limit);
($limit instanceof ExpressionInterface ? $this->buildExpression($limit) : (string) $limit);
}

if (empty($filters)) {
Expand Down