Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
- Enh #340: Adapt to `Param` refactoring in `yiisoft/db` package (@vjik)
- Enh #341, #342, #345: Adapt to conditions refactoring in `yiisoft/db` package (@vjik)
- Enh #348: Remove `TableSchema` class and refactor `Schema` class (@Tigrov)
- Enh #350: Adapt to `Like` changes in `yiisoft/db` package (@vjik)

## 1.3.0 March 21, 2024

Expand Down
36 changes: 14 additions & 22 deletions src/Builder/LikeBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
use Yiisoft\Db\Expression\ExpressionInterface;
use Yiisoft\Db\QueryBuilder\Condition\Like;
use Yiisoft\Db\QueryBuilder\QueryBuilderInterface;
use Yiisoft\Db\Schema\Quoter;

use function substr;

Expand All @@ -28,29 +27,23 @@ final class LikeBuilder extends \Yiisoft\Db\QueryBuilder\Condition\Builder\LikeB
'!' => '!!',
];

public function __construct(private QueryBuilderInterface $queryBuilder)
{
public function __construct(
private readonly QueryBuilderInterface $queryBuilder,
) {
parent::__construct($queryBuilder, $this->getEscapeSql());
}

public function build(ExpressionInterface $expression, array &$params = []): string
{
if (!isset($this->escapingReplacements['\\'])) {
/*
* Different pdo_oci8 versions may or may not implement `PDO::quote()`, so {@see Quoter::quoteValue()} may or
* may not quote `\`.
*/
$this->escapingReplacements['\\'] = substr($this->queryBuilder->getQuoter()->quoteValue('\\'), 1, -1);
}

return parent::build($expression, $params);
/**
* Different pdo_oci8 versions may or may not implement `PDO::quote()`, so {@see Quoter::quoteValue()} may or
* may not quote `\`.
*/
$this->escapingReplacements['\\'] = substr($this->queryBuilder->getQuoter()->quoteValue('\\'), 1, -1);
}

protected function prepareColumn(Like $expression, array &$params): string
protected function prepareColumn(Like $condition, array &$params): string
{
$column = parent::prepareColumn($expression, $params);
$column = parent::prepareColumn($condition, $params);

if ($expression->caseSensitive === false) {
if ($condition->caseSensitive === false) {
$column = 'LOWER(' . $column . ')';
}

Expand All @@ -59,13 +52,12 @@ protected function prepareColumn(Like $expression, array &$params): string

protected function preparePlaceholderName(
string|ExpressionInterface $value,
Like $expression,
?array $escape,
Like $condition,
array &$params,
): string {
$placeholderName = parent::preparePlaceholderName($value, $expression, $escape, $params);
$placeholderName = parent::preparePlaceholderName($value, $condition, $params);

if ($expression->caseSensitive === false) {
if ($condition->caseSensitive === false) {
$placeholderName = 'LOWER(' . $placeholderName . ')';
}

Expand Down
Loading