Skip to content
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

Case insensitive like #6547

Closed
wants to merge 7 commits into from
Closed
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
5 changes: 5 additions & 0 deletions lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ class BasicEntityPersister implements EntityPersister
Comparison::IN => 'IN (%s)',
Comparison::NIN => 'NOT IN (%s)',
Comparison::CONTAINS => 'LIKE %s',
Comparison::ICONTAINS => 'LIKE %s',
Comparison::STARTS_WITH => 'LIKE %s',
Comparison::ENDS_WITH => 'LIKE %s',
];
Expand Down Expand Up @@ -1616,6 +1617,10 @@ public function getSelectConditionStatementSQL($field, $value, $assoc = null, $c
continue;
}

if ($comparison === Comparison::ICONTAINS) {
$column = $this->platform->getLowerExpression($column);
}

$selectedColumns[] = $column . ' ' . sprintf(self::$comparisonMap[$comparison], $placeholder);

continue;
Expand Down
3 changes: 3 additions & 0 deletions lib/Doctrine/ORM/Persisters/SqlValueVisitor.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@ protected function getValueFromComparison(Comparison $comparison)
case Comparison::CONTAINS:
return "%{$value}%";

case Comparison::ICONTAINS:
return '%' . mb_strtolower($value) . '%';

case Comparison::STARTS_WITH:
return "{$value}%";

Expand Down
5 changes: 5 additions & 0 deletions lib/Doctrine/ORM/Query/QueryExpressionVisitor.php
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,11 @@ public function walkComparison(Comparison $comparison)
$parameter->setValue('%' . $parameter->getValue() . '%', $parameter->getType());
$this->parameters[] = $parameter;

return $this->expr->like($field, $placeholder);
case Comparison::ICONTAINS:
$parameter->setValue('%' . mb_strtolower($parameter->getValue()) . '%', $parameter->getType());
$this->parameters[] = $parameter;

return $this->expr->like($field, $placeholder);
case Comparison::STARTS_WITH:
$parameter->setValue($parameter->getValue() . '%', $parameter->getType());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,4 +183,34 @@ public function testCanContainsWithoutLoadingCollection()

$this->assertFalse($tweets->isInitialized());
}

public function testCanIContainsWithoutLoadingCollection()
{
$user = new User();
$user->name = 'Marco';
$this->_em->persist($user);
$this->_em->flush();

$tweet = new Tweet();
$tweet->author = $user;
$tweet->content = 'Criteria is awesome';
$this->_em->persist($tweet);
$this->_em->flush();

$this->_em->clear();

$criteria = new Criteria();
$criteria->andWhere($criteria->expr()->iContains('content', 'criteria'));

$user = $this->_em->find(User::class, $user->id);
$tweets = $user->tweets->matching($criteria);

$this->assertInstanceOf(LazyCriteriaCollection::class, $tweets);
$this->assertFalse($tweets->isInitialized());

$tweets->contains($tweet);
$this->assertTrue($tweets->contains($tweet));

$this->assertFalse($tweets->isInitialized());
}
}
16 changes: 16 additions & 0 deletions tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -910,6 +910,22 @@ public function testMatchingCriteriaContainsComparison()
$this->assertEquals(2, count($users));
}

public function testMatchingCriteriaIContainsComparison()
{
$this->loadFixture();

$repository = $this->_em->getRepository(CmsUser::class);

$users = $repository->matching(new Criteria(Criteria::expr()->iContains('name', 'foobar')));
$this->assertEquals(0, count($users));

$users = $repository->matching(new Criteria(Criteria::expr()->iContains('name', 'rOm')));
$this->assertEquals(1, count($users));

$users = $repository->matching(new Criteria(Criteria::expr()->iContains('status', 'DEV')));
$this->assertEquals(2, count($users));
}

public function testMatchingCriteriaStartsWithComparison()
{
$this->loadFixture();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ public function comparisonData()
[$cb->notIn('field', ['value']), $qb->notIn('o.field', ':field'), new Parameter('field', ['value'])],

[$cb->contains('field', 'value'), $qb->like('o.field', ':field'), new Parameter('field', '%value%')],
[$cb->iContains('field', 'value'), $qb->like('o.field', ':field'), new Parameter('field', '%value%')],

[$cb->startsWith('field', 'value'), $qb->like('o.field', ':field'), new Parameter('field', 'value%')],
[$cb->endsWith('field', 'value'), $qb->like('o.field', ':field'), new Parameter('field', '%value')],
Expand Down