Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2580265 by FeyP, jcisio, s_leu, Berdir, tstoeckler: entity query nested conditions must use LEFT joins when any of the parent condition groups is using OR

merge-requests/1654/head
Francesco Placella 2018-05-17 17:12:38 +02:00
parent 593ded04f3
commit e551206954
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/lib/Drupal/Core/Entity/Query/Sql/Condition.php
View File

@ -12,6 +12,13 @@ use Drupal\Core\Entity\Query\ConditionInterface;
*/ */
class Condition extends ConditionBase { class Condition extends ConditionBase {
/**
* Whether this condition is nested inside an OR condition.
*
* @var bool
*/
protected $nestedInsideOrCondition = FALSE;
/** /**
* The SQL entity query object this condition belongs to. * The SQL entity query object this condition belongs to.
* *
@ -36,11 +43,12 @@ class Condition extends ConditionBase {
$sql_condition = new SqlCondition($condition['field']->getConjunction()); $sql_condition = new SqlCondition($condition['field']->getConjunction());
// Add the SQL query to the object before calling this method again. // Add the SQL query to the object before calling this method again.
$sql_condition->sqlQuery = $sql_query; $sql_condition->sqlQuery = $sql_query;
$condition['field']->nestedInsideOrCondition = $this->nestedInsideOrCondition || strtoupper($this->conjunction) === 'OR';
$condition['field']->compile($sql_condition); $condition['field']->compile($sql_condition);
$conditionContainer->condition($sql_condition); $conditionContainer->condition($sql_condition);
} }
else { else {
$type = strtoupper($this->conjunction) == 'OR' || $condition['operator'] == 'IS NULL' ? 'LEFT' : 'INNER'; $type = $this->nestedInsideOrCondition || strtoupper($this->conjunction) === 'OR' || $condition['operator'] === 'IS NULL' ? 'LEFT' : 'INNER';
$field = $tables->addField($condition['field'], $type, $condition['langcode']); $field = $tables->addField($condition['field'], $type, $condition['langcode']);
$condition['real_field'] = $field; $condition['real_field'] = $field;
static::translateCondition($condition, $sql_query, $tables->isFieldCaseSensitive($condition['field'])); static::translateCondition($condition, $sql_query, $tables->isFieldCaseSensitive($condition['field']));

2
core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php
View File

@ -553,7 +553,7 @@ class EntityQueryTest extends EntityKernelTestBase {
->sort('id') ->sort('id')
->execute(); ->execute();
$this->assertResult(6, 14); $this->assertResult(4, 6, 12, 14);
} }
/** /**