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

Revert "Issue #3311562 by Berdir, andypost: Set sqlQuery in Entity\Query\Sql Condition classes on own class" 

This reverts commit 075c6914b0.
merge-requests/828/head^2
catch 2022-09-27 09:55:54 +01:00
parent 6dfe9bf46c
commit b083e4075f
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,13 +25,6 @@ class Condition extends ConditionBase {
*/
protected $query;
/**
* The current SQL query, set by parent condition compile() method calls.
*
* @var \Drupal\Core\Database\Query\SelectInterface
*/
protected SelectInterface $sqlQuery;
/**
* {@inheritdoc}
*/
@ -42,13 +35,13 @@ class Condition extends ConditionBase {
// SQL query object is only necessary to pass to Query::addField() so it
// can join tables as necessary. On the other hand, conditions need to be
// added to the $conditionContainer object to keep grouping.
$sql_query = $conditionContainer instanceof SelectInterface ? $conditionContainer : $this->sqlQuery;
$sql_query = $conditionContainer instanceof SelectInterface ? $conditionContainer : $conditionContainer->sqlQuery;
$tables = $this->query->getTables($sql_query);
foreach ($this->conditions as $condition) {
if ($condition['field'] instanceof ConditionInterface) {
$sql_condition = $sql_query->getConnection()->condition($condition['field']->getConjunction());
// Add the SQL query to the object before calling this method again.
$condition['field']->sqlQuery = $sql_query;
$sql_condition->sqlQuery = $sql_query;
$condition['field']->nestedInsideOrCondition = $this->nestedInsideOrCondition || strtoupper($this->conjunction) === 'OR';
$condition['field']->compile($sql_condition);
$conditionContainer->condition($sql_condition);

11
core/lib/Drupal/Core/Entity/Query/Sql/ConditionAggregate.php
View File

@ -12,13 +12,6 @@ use Drupal\Core\Entity\Query\QueryBase;
*/
class ConditionAggregate extends ConditionAggregateBase {
/**
* The current SQL query, set by parent condition compile() method calls.
*
* @var \Drupal\Core\Database\Query\SelectInterface
*/
protected SelectInterface $sqlQuery;
/**
* {@inheritdoc}
*/
@ -28,13 +21,13 @@ class ConditionAggregate extends ConditionAggregateBase {
// SQL query object is only necessary to pass to Query::addField() so it
// can join tables as necessary. On the other hand, conditions need to be
// added to the $conditionContainer object to keep grouping.
$sql_query = ($conditionContainer instanceof SelectInterface) ? $conditionContainer : $this->sqlQuery;
$sql_query = ($conditionContainer instanceof SelectInterface) ? $conditionContainer : $conditionContainer->sqlQuery;
$tables = new Tables($sql_query);
foreach ($this->conditions as $condition) {
if ($condition['field'] instanceof ConditionAggregateInterface) {
$sql_condition = $sql_query->getConnection()->condition($condition['field']->getConjunction());
// Add the SQL query to the object before calling this method again.
$condition['field']->sqlQuery = $sql_query;
$sql_condition->sqlQuery = $sql_query;
$condition['field']->compile($sql_condition);
$sql_query->condition($sql_condition);
}