diff --git a/CHANGELOG.md b/CHANGELOG.md index eb7d362..c4e1df0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,7 +53,7 @@ - Chg #330: Rename `insertWithReturningPks()` to `insertReturningPks()` in `Command` and `DMLQueryBuilder` classes (@Tigrov) - Enh #336: Provide `yiisoft/db-implementation` virtual package (@vjik) - Enh #340: Adapt to `Param` refactoring in `yiisoft/db` package (@vjik) -- Enh #341: Adapt to specific condition interfaces removing in `yiisoft/db` package (@vjik) +- Enh #341, #342: Adapt to conditions refactoring in `yiisoft/db` package (@vjik) ## 1.3.0 March 21, 2024 diff --git a/src/Builder/InConditionBuilder.php b/src/Builder/InConditionBuilder.php index f8c7ca0..1f96705 100644 --- a/src/Builder/InConditionBuilder.php +++ b/src/Builder/InConditionBuilder.php @@ -57,9 +57,9 @@ public function build(ExpressionInterface $expression, array &$params = []): str */ protected function splitCondition(InCondition $condition, array &$params): string|null { - $operator = $condition->getOperator(); - $values = $condition->getValues(); - $column = $condition->getColumn(); + $operator = $condition->operator; + $values = $condition->values; + $column = $condition->column; if (!is_array($values)) { return null; diff --git a/src/Builder/LikeConditionBuilder.php b/src/Builder/LikeConditionBuilder.php index 7554253..744a79b 100644 --- a/src/Builder/LikeConditionBuilder.php +++ b/src/Builder/LikeConditionBuilder.php @@ -50,7 +50,7 @@ protected function prepareColumn(LikeCondition $expression, array &$params): str { $column = parent::prepareColumn($expression, $params); - if ($expression->getCaseSensitive() === false) { + if ($expression->caseSensitive === false) { $column = 'LOWER(' . $column . ')'; } @@ -65,7 +65,7 @@ protected function preparePlaceholderName( ): string { $placeholderName = parent::preparePlaceholderName($value, $expression, $escape, $params); - if ($expression->getCaseSensitive() === false) { + if ($expression->caseSensitive === false) { $placeholderName = 'LOWER(' . $placeholderName . ')'; }