|
11 | 11 | use Yiisoft\Db\Exception\Exception;
|
12 | 12 | use InvalidArgumentException;
|
13 | 13 | use Yiisoft\Db\Exception\InvalidConfigException;
|
14 |
| -use Yiisoft\Db\QueryBuilder\Condition\InCondition; |
15 |
| -use Yiisoft\Db\QueryBuilder\Condition\ArrayOverlapsCondition; |
16 |
| -use Yiisoft\Db\QueryBuilder\Condition\JsonOverlapsCondition; |
| 14 | +use Yiisoft\Db\QueryBuilder\Condition\In; |
| 15 | +use Yiisoft\Db\QueryBuilder\Condition\ArrayOverlaps; |
| 16 | +use Yiisoft\Db\QueryBuilder\Condition\JsonOverlaps; |
17 | 17 |
|
18 | 18 | use function array_column;
|
19 | 19 | use function array_combine;
|
@@ -571,9 +571,9 @@ protected function filterByModels(array $models): void
|
571 | 571 | $propertyName = array_key_first($this->link);
|
572 | 572 |
|
573 | 573 | match ($this->getArInstance()->columnType($propertyName)) {
|
574 |
| - ColumnType::ARRAY => $this->andWhere(new ArrayOverlapsCondition($columnName, $values)), |
575 |
| - ColumnType::JSON => $this->andWhere(new JsonOverlapsCondition($columnName, $values)), |
576 |
| - default => $this->andWhere(new InCondition($columnName, 'IN', $values)), |
| 574 | + ColumnType::ARRAY => $this->andWhere(new ArrayOverlaps($columnName, $values)), |
| 575 | + ColumnType::JSON => $this->andWhere(new JsonOverlaps($columnName, $values)), |
| 576 | + default => $this->andWhere(new In($columnName, 'IN', $values)), |
577 | 577 | };
|
578 | 578 |
|
579 | 579 | return;
|
@@ -607,7 +607,7 @@ protected function filterByModels(array $models): void
|
607 | 607 | return;
|
608 | 608 | }
|
609 | 609 |
|
610 |
| - $this->andWhere(new InCondition($columnNames, 'IN', $values)); |
| 610 | + $this->andWhere(new In($columnNames, 'IN', $values)); |
611 | 611 | }
|
612 | 612 |
|
613 | 613 | private function getModelKeys(ActiveRecordInterface|array $model, array $properties): array
|
|
0 commit comments