-
Notifications
You must be signed in to change notification settings - Fork 2.6k
fix: handling of empty array in SQL condition generation #12254
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.
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
Merged
greg0ire
merged 5 commits into
doctrine:2.20.x
from
elliotbruneel:fix/empty-array-query
Nov 10, 2025
+84
−27
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
b24586b
fix: handling of empty array in SQL condition generation
23f2286
chore: update phpstan version and regenerate baseline
32d1e97
chore: improve empty array check in SQL condition generation
4989ca6
test: add test for finding by nullable field with empty array
9ef0f53
fix: update SQL condition for empty array to 1=0 instead of IN (NULL)
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace Doctrine\Tests\ORM\Functional\Ticket; | ||
|
|
||
| use Doctrine\ORM\Mapping\Column; | ||
| use Doctrine\ORM\Mapping\Entity; | ||
| use Doctrine\ORM\Mapping\GeneratedValue; | ||
| use Doctrine\ORM\Mapping\Id; | ||
| use Doctrine\Tests\OrmFunctionalTestCase; | ||
|
|
||
| class GH12254Test extends OrmFunctionalTestCase | ||
| { | ||
| protected function setUp(): void | ||
| { | ||
| parent::setUp(); | ||
|
|
||
| $this->setUpEntitySchema([ | ||
| GH12254EntityA::class, | ||
| ]); | ||
|
|
||
| $this->_em->persist(new GH12254EntityA()); | ||
| $this->_em->flush(); | ||
| $this->_em->clear(); | ||
| } | ||
|
|
||
| public function testFindByEmptyArrayShouldReturnEmptyArray(): void | ||
| { | ||
| // pretend we are starting afresh | ||
| $this->_em = $this->getEntityManager(); | ||
| $result = $this->_em->getRepository(GH12254EntityA::class)->findBy(['id' => []]); | ||
| $this->assertEmpty($result); | ||
| } | ||
|
|
||
| public function testFindByInNullableField(): void | ||
| { | ||
| $this->_em = $this->getEntityManager(); | ||
| $result = $this->_em->getRepository(GH12254EntityA::class)->findBy(['name' => []]); | ||
| $this->assertEmpty($result); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @Entity() | ||
| */ | ||
| class GH12254EntityA | ||
| { | ||
| /** | ||
| * @Column(type="integer") | ||
| * @Id() | ||
| * @GeneratedValue(strategy="AUTO") | ||
| * @var int | ||
| */ | ||
| public $id; | ||
|
|
||
| /** | ||
| * @Column(type="string", nullable=true) | ||
| * @var string|null | ||
| */ | ||
| public $name = null; | ||
| } |
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There should probably be a functional test for this. That way we'll be sure it works with all database platforms. |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where's that coming from? Maybe you need to rebase to make it go away?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's come from the update of phpstan to 2.1.23