refactor: Query Builder WHERE/HAVING condition handling#10217
Open
memleakd wants to merge 3 commits into
Open
Conversation
- Route WHERE/HAVING condition insertion through shared prefix handling - Extract WHERE/HAVING condition compilation into focused private helpers - Add regression coverage for operator and null condition handling - Reduce the BaseBuilder empty() PHPStan baseline count Signed-off-by: memleakd <121398829+memleakd@users.noreply.github.com>
Signed-off-by: memleakd <121398829+memleakd@users.noreply.github.com>
michalsn
reviewed
May 23, 2026
Signed-off-by: memleakd <121398829+memleakd@users.noreply.github.com>
Contributor
Author
|
Thank you @michalsn. Pushed a small update to keep the shared helper focused on the common path. |
There was a problem hiding this comment.
Pull request overview
This PR refactors CodeIgniter4’s Query Builder internals for building/compiling WHERE and HAVING conditions by centralizing prefix handling and condition compilation into private helpers, aiming to preserve existing SQL output while improving maintainability. It also updates static-analysis baselines and adds regression tests for a few key operator cases.
Changes:
- Centralized
WHERE/HAVINGprefixing into new private helpers and streamlined condition compilation inBaseBuilder. - Added regression tests covering
LIKEwith value, and= null/!= nullcompiling toIS (NOT) NULL. - Updated PHPStan baseline counts related to
empty()usage.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| utils/phpstan-baseline/empty.notAllowed.neon | Updates baseline counts after reducing empty() usage in the builder. |
| tests/system/Database/Builder/WhereTest.php | Adds regression coverage for specific operator/null-handling cases. |
| system/Database/BaseBuilder.php | Refactors internal WHERE/HAVING condition prefixing and compilation via new helpers. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+154
to
+165
| /** | ||
| * @param mixed $value | ||
| */ | ||
| #[DataProvider('provideWhereOperatorRegressionCases')] | ||
| public function testWhereOperatorRegressionCases(string $key, $value, string $expectedSQL): void | ||
| { | ||
| $builder = $this->db->table('jobs job'); | ||
|
|
||
| $builder->where($key, $value); | ||
|
|
||
| $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect())); | ||
| } |
Comment on lines
+1120
to
+1129
| /** | ||
| * @param 'QBHaving'|'QBWhere' $clause | ||
| * @param array<string, mixed> $condition | ||
| */ | ||
| private function addWhereHavingCondition(string $clause, array $condition, string $type): void | ||
| { | ||
| $condition['condition'] = $this->getWhereHavingPrefix($clause, $type) . $condition['condition']; | ||
|
|
||
| $this->{$clause}[] = $condition; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This PR proposes refactoring the internal Query Builder handling for
WHEREandHAVINGconditions without changing public APIs or expected SQL output.The existing condition-building paths each handled parts of prefixing, grouping, and compilation themselves. This centralizes those pieces into small private helpers so the behavior is easier to follow and safer to maintain.
It also adds regression coverage for a few important condition cases:
LIKEwith a bound value= nullcompiling toIS NULL!= nullcompiling toIS NOT NULLThis is intentionally a behavior-preserving cleanup. No new user-facing API is added, so there is no user guide or changelog entry.
Checklist: