Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix operator when using criteria on ManyToMany #6740

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

Merged
lcobucci merged 2 commits into from
Nov 26, 2017
Merged

Fix operator when using criteria on ManyToMany #6740

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15c145f
Add failing test for DCOM-288
mduplouy Sep 30, 2017
7c28a93
Add operator to walkComparison output
mduplouy Sep 30, 2017
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
Prev Previous commit
Add operator to walkComparison output
  • Loading branch information
@mduplouy @lcobucci
mduplouy authored and lcobucci committed Nov 26, 2017
commit 7c28a932aef9f4fb61ba37370623f027f8a03546
9 changes: 5 additions & 4 deletions lib/Doctrine/ORM/Persisters/Collection/ManyToManyPersister.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,10 +259,11 @@ public function loadCriteria(PersistentCollection $collection, Criteria $criteri
$parameters = $this->expandCriteriaParameters($criteria);

foreach ($parameters as $parameter) {
list($name, $value) = $parameter;
$field = $this->quoteStrategy->getColumnName($name, $targetClass, $this->platform);
$whereClauses[] = sprintf('te.%s = ?', $field);
$params[] = $value;
[$name, $value, $operator] = $parameter;

$field = $this->quoteStrategy->getColumnName($name, $targetClass, $this->platform);
$whereClauses[] = sprintf('te.%s %s ?', $field, $operator);
$params[] = $value;
}

$tableName = $this->quoteStrategy->getTableName($targetClass, $this->platform);
Expand Down
8 changes: 4 additions & 4 deletions lib/Doctrine/ORM/Persisters/SqlValueVisitor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ class SqlValueVisitor extends ExpressionVisitor
*/
public function walkComparison(Comparison $comparison)
{
$value = $this->getValueFromComparison($comparison);
$field = $comparison->getField();
$operator = $comparison->getOperator();
$value = $this->getValueFromComparison($comparison);
$field = $comparison->getField();
$operator = $comparison->getOperator();

if (($operator === Comparison::EQ || $operator === Comparison::IS) && $value === null) {
return;
Expand All @@ -61,7 +61,7 @@ public function walkComparison(Comparison $comparison)
}

$this->values[] = $value;
$this->types[] = [$field, $value];
$this->types[] = [$field, $value, $operator];
}

/**
Expand Down