From c5effa6e8631190bdf846e42550e78fa4e7e40b4 Mon Sep 17 00:00:00 2001 From: Tigrov Date: Thu, 13 Mar 2025 09:31:10 +0700 Subject: [PATCH 1/2] Remove `hasLimit()` and `hasOffset()` usage --- src/DQLQueryBuilder.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/DQLQueryBuilder.php b/src/DQLQueryBuilder.php index 1284d903..1f485aa2 100644 --- a/src/DQLQueryBuilder.php +++ b/src/DQLQueryBuilder.php @@ -84,13 +84,13 @@ public function buildLimit(ExpressionInterface|int|null $limit, ExpressionInterf { $sql = ''; - if ($this->hasLimit($limit)) { + if ($limit !== null) { $sql = 'LIMIT ' . ($limit instanceof ExpressionInterface ? $this->buildExpression($limit) : (string)$limit); - if ($this->hasOffset($offset)) { + if (!empty($offset)) { $sql .= ' OFFSET ' . ($offset instanceof ExpressionInterface ? $this->buildExpression($offset) : (string)$offset); } - } elseif ($this->hasOffset($offset)) { + } elseif (!empty($offset)) { /** * Limit isn't optional in SQLite. * From b962bc72d5b85f6b312d9d0369e0fbbb47c4e4a7 Mon Sep 17 00:00:00 2001 From: Tigrov Date: Thu, 13 Mar 2025 10:37:34 +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 03156050..34f86933 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ - Chg #339: Change return type of `Command::insertWithReturningPks()` method to `array|false` (@Tigrov) - New #319: Add parameters `$ifExists` and `$cascade` to `CommandInterface::dropTable()` and `DDLQueryBuilderInterface::dropTable()` methods (@vjik) +- Chg #342: Remove usage of `hasLimit()` and `hasOffset()` methods of `DQLQueryBuilder` class (@Tigrov) ## 1.2.0 March 21, 2024