diff --git a/CHANGELOG.md b/CHANGELOG.md index a5ea3b7b..312cab11 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) - Chg #343: Remove `yiisoft/json` dependency (@Tigrov) ## 1.2.0 March 21, 2024 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. *