From 77ffc10e36270baeb43bd9968f0f6851eb46b95d Mon Sep 17 00:00:00 2001 From: Tigrov Date: Thu, 13 Mar 2025 11:27:50 +0700 Subject: [PATCH 1/2] Remove `hasLimit()` and `hasOffset()` usage --- src/DQLQueryBuilder.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/DQLQueryBuilder.php b/src/DQLQueryBuilder.php index 1735254e..d9e695cb 100644 --- a/src/DQLQueryBuilder.php +++ b/src/DQLQueryBuilder.php @@ -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)) { From 080049c0c9b652d836a14b436188bb765fad4c54 Mon Sep 17 00:00:00 2001 From: Tigrov Date: Thu, 13 Mar 2025 11:32:48 +0700 Subject: [PATCH 2/2] Add line to CHANGELOG.md [skip ci] --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb825738..ed07da7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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