Unverified Commit d78e53bb authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3189880 by mondrake, raman.b, Pooja Ganjage, daffie, Megha_kundar, dww,... 

Issue #3189880 by mondrake, raman.b, Pooja Ganjage, daffie, Megha_kundar, dww, S_Bhandari: Use square brackets syntax in sql queries
parent 6f4c546d

core/includes/form.inc

+1 −1
Changes for core/includes/form.inc: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -627,7 +627,7 @@ function template_preprocess_form_element_label(&$variables) { 
 *     $context['sandbox']['progress'] = 0;

 *     $context['sandbox']['current_id'] = 0;

 *     $context['sandbox']['max'] = \Drupal::database()

 *       ->query('SELECT COUNT(DISTINCT id) FROM {example}')

 *       ->query('SELECT COUNT(DISTINCT [id]) FROM {example}')

 *       ->fetchField();

 *   }

 *   $limit = 5;

core/lib/Drupal/Core/Cache/DatabaseCacheTagsChecksum.php

+1 −1
Changes for core/lib/Drupal/Core/Cache/DatabaseCacheTagsChecksum.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ protected function doInvalidateTags(array $tags) { 
      foreach ($tags as $tag) {

        $this->connection->merge('cachetags')

          ->insertFields(['invalidations' => 1])

          ->expression('invalidations', 'invalidations + 1')

          ->expression('invalidations', '[invalidations] + 1')

          ->key('tag', $tag)

          ->execute();

      }

core/lib/Drupal/Core/Database/Driver/pgsql/Select.php

+1 −1
Changes for core/lib/Drupal/Core/Database/Driver/pgsql/Select.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ public function orderRandom() { 
   *

   * @code

   *   $query = \Drupal::database()->select('example', 'e');

   *   $query->join('example_revision', 'er', 'e.vid = er.vid');

   *   $query->join('example_revision', 'er', '[e].[vid] = [er].[vid]');

   *   $query

   *     ->distinct()

   *     ->fields('e')

core/lib/Drupal/Core/Database/Query/SelectInterface.php

+1 −1
Changes for core/lib/Drupal/Core/Database/Query/SelectInterface.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ public function addJoin($type, $table, $alias = NULL, $condition = NULL, $argume 
   *

   *   Example:

   *   @code

   *   $query->addExpression('SUBSTRING(thread, 1, (LENGTH(thread) - 1))', 'order_field');

   *   $query->addExpression('SUBSTRING([thread], 1, (LENGTH([thread]) - 1))', 'order_field');

   *   $query->orderBy('order_field', 'ASC');

   *   @endcode

   * @param $direction

core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php

+4 −4
Changes for core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ protected function loadFromSharedTables(array &$values, array &$translations, $l 
        $all_fields = $revisioned_fields;

        if ($data_fields) {

          $all_fields = array_merge($revisioned_fields, $data_fields);

          $query->leftJoin($this->dataTable, 'data', "(revision.$this->idKey = data.$this->idKey and revision.$this->langcodeKey = data.$this->langcodeKey)");

          $query->leftJoin($this->dataTable, 'data', "([revision].[$this->idKey] = [data].[$this->idKey] AND [revision].[$this->langcodeKey] = [data].[$this->langcodeKey])");

          $column_names = [];

          // Some fields can have more then one columns in the data table so

          // column names are needed.
@@ -695,10 +695,10 @@ protected function buildQuery($ids, $revision_ids = FALSE) { 
    $query->addTag($this->entityTypeId . '_load_multiple');



    if ($revision_ids) {

      $query->join($this->revisionTable, 'revision', "revision.{$this->idKey} = base.{$this->idKey} AND revision.{$this->revisionKey} IN (:revisionIds[])", [':revisionIds[]' => $revision_ids]);

      $query->join($this->revisionTable, 'revision', "[revision].[{$this->idKey}] = [base].[{$this->idKey}] AND [revision].[{$this->revisionKey}] IN (:revisionIds[])", [':revisionIds[]' => $revision_ids]);

    }

    elseif ($this->revisionTable) {

      $query->join($this->revisionTable, 'revision', "revision.{$this->revisionKey} = base.{$this->revisionKey}");

      $query->join($this->revisionTable, 'revision', "[revision].[{$this->revisionKey}] = [base].[{$this->revisionKey}]");

    }



    // Add fields from the {entity} table.
@@ -724,7 +724,7 @@ protected function buildQuery($ids, $revision_ids = FALSE) { 


      // Compare revision ID of the base and revision table, if equal then this

      // is the default revision.

      $query->addExpression('CASE base.' . $this->revisionKey . ' WHEN revision.' . $this->revisionKey . ' THEN 1 ELSE 0 END', 'isDefaultRevision');

      $query->addExpression('CASE [base].[' . $this->revisionKey . '] WHEN [revision].[' . $this->revisionKey . '] THEN 1 ELSE 0 END', 'isDefaultRevision');

    }



    $query->fields('base', $entity_fields);