Commit e9afcbc3 authored by catch's avatar catch
Browse files

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

parent f7e9cbbc

core/lib/Drupal/Core/Entity/Query/Sql/Condition.php

+9 −2
Original line number Diff line number Diff line
@@ -25,6 +25,13 @@ 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}

   */
@@ -35,13 +42,13 @@ public function compile($conditionContainer) { 
    // 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 : $conditionContainer->sqlQuery;

    $sql_query = $conditionContainer instanceof SelectInterface ? $conditionContainer : $this->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.

        $sql_condition->sqlQuery = $sql_query;

        $condition['field']->sqlQuery = $sql_query;

        $condition['field']->nestedInsideOrCondition = $this->nestedInsideOrCondition || strtoupper($this->conjunction) === 'OR';

        $condition['field']->compile($sql_condition);

        $conditionContainer->condition($sql_condition);

core/lib/Drupal/Core/Entity/Query/Sql/ConditionAggregate.php

+9 −2
Original line number Diff line number Diff line
@@ -12,6 +12,13 @@ 
 */

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}

   */
@@ -21,13 +28,13 @@ public function compile($conditionContainer) { 
    // 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 : $conditionContainer->sqlQuery;

    $sql_query = ($conditionContainer instanceof SelectInterface) ? $conditionContainer : $this->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.

        $sql_condition->sqlQuery = $sql_query;

        $condition['field']->sqlQuery = $sql_query;

        $condition['field']->compile($sql_condition);

        $sql_query->condition($sql_condition);

      }