Skip to content

Clean code InConditionBuilder. #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Clean code InConditionBuilder. #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
334aa04
Clean code `InConditionBuilder`.
terabytesoftw Mar 2, 2023
aecb602
Fixed tests.
terabytesoftw Mar 2, 2023
f1418f3
Fix tests 2.
terabytesoftw Mar 2, 2023
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
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,16 @@ jobs:

- name: Set environment variables pull request linux.
if: matrix.os == 'ubuntu-latest'
uses: yiisoft/actions/db/environment-linux@master
uses: yiisoft/actions/db/environment-linux@fix-branch-name

- name: Set environment variables pull request windows.
if: matrix.os == 'windows-latest'
uses: yiisoft/actions/db/environment-windows@master
uses: yiisoft/actions/db/environment-windows@fix-branch-name

- name: Install db.
uses: yiisoft/actions/db/subpackage-install@master
with:
BRANCH_NAME: ${{ github.head_ref }}
BRANCH_NAME: ${{ env.BRANCH_NAME }}
COMPOSER_ROOT_VERSION: ${{ env.COMPOSER_ROOT_VERSION }}
CURRENT_PACKAGE: db
FULL_BRANCH_NAME: ${{ env.FULL_BRANCH_NAME }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mutation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ jobs:
run: composer self-update

- name: Set environment variables pull request linux.
uses: yiisoft/actions/db/environment-linux@master
uses: yiisoft/actions/db/environment-linux@fix-branch-name

- name: Install db.
uses: yiisoft/actions/db/subpackage-install@master
with:
BRANCH_NAME: ${{ github.head_ref }}
BRANCH_NAME: ${{ env.BRANCH_NAME }}
COMPOSER_ROOT_VERSION: ${{ env.COMPOSER_ROOT_VERSION }}
CURRENT_PACKAGE: db
FULL_BRANCH_NAME: ${{ env.FULL_BRANCH_NAME }}
Expand Down
18 changes: 9 additions & 9 deletions src/Builder/InConditionBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,23 @@
namespace Yiisoft\Db\Sqlite\Builder;

use Iterator;
use Traversable;
use Yiisoft\Db\Exception\Exception;
use Yiisoft\Db\Exception\InvalidArgumentException;
use Yiisoft\Db\Exception\InvalidConfigException;
use Yiisoft\Db\Exception\NotSupportedException;
use Yiisoft\Db\Expression\ExpressionInterface;
use Yiisoft\Db\QueryBuilder\Condition\Builder\InConditionBuilder as BaseInConditionBuilder;
use Yiisoft\Db\QueryBuilder\QueryBuilderInterface;

use function implode;
use function is_array;
use function str_contains;

/**
* InConditionBuilder builds conditions for {@see `\Yiisoft\Db\QueryBuilder\Condition\InCondition`} IN operator for
* SQLite.
*/
final class InConditionBuilder extends BaseInConditionBuilder
{
public function __construct(private QueryBuilderInterface $queryBuilder)
{
parent::__construct($queryBuilder);
}

/**
* Builds SQL for IN condition.
*
Expand All @@ -48,11 +45,14 @@ protected function buildSubqueryInCondition(
/**
* Builds SQL for IN condition.
*
* @return string SQL.
* @throws Exception
* @throws InvalidArgumentException
* @throws InvalidConfigException
* @throws NotSupportedException
*/
protected function buildCompositeInCondition(
string|null $operator,
Traversable|array $columns,
iterable $columns,
iterable|Iterator $values,
array &$params = []
): string {
Expand Down