Commit 5015764f authored by catch's avatar catch
Browse files

Issue #3159982 by nuklive, ultrabob, J2, billywardrop, antojose, daffie,... 

Issue #3159982 by nuklive, ultrabob, J2, billywardrop, antojose, daffie, mradcliffe, mcdruid, jungle: AS keyword should be capitalised in SQL queries

(cherry picked from commit fad8b52c)
parent f7a9cf8e

core/lib/Drupal/Core/Database/Driver/mysql/Schema.php

+2 −2
Original line number Diff line number Diff line
@@ -686,11 +686,11 @@ public function getComment($table, $column = NULL) { 
      $condition->condition('column_name', $column);

      $condition->compile($this->connection, $this);

      // Don't use {} around information_schema.columns table.

      return $this->connection->query("SELECT column_comment as column_comment FROM information_schema.columns WHERE " . (string) $condition, $condition->arguments())->fetchField();

      return $this->connection->query("SELECT column_comment AS column_comment FROM information_schema.columns WHERE " . (string) $condition, $condition->arguments())->fetchField();

    }

    $condition->compile($this->connection, $this);

    // Don't use {} around information_schema.tables table.

    $comment = $this->connection->query("SELECT table_comment as table_comment FROM information_schema.tables WHERE " . (string) $condition, $condition->arguments())->fetchField();

    $comment = $this->connection->query("SELECT table_comment AS table_comment FROM information_schema.tables WHERE " . (string) $condition, $condition->arguments())->fetchField();

    // Work-around for MySQL 5.0 bug http://bugs.mysql.com/bug.php?id=11379

    return preg_replace('/; InnoDB free:.*$/', '', $comment);

  }

core/lib/Drupal/Core/Database/Schema.php

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ public function findTables($table_expression) { 
    // couldn't use \Drupal::database()->select() here because it would prefix

    // information_schema.tables and the query would fail.

    // Don't use {} around information_schema.tables table.

    $results = $this->connection->query("SELECT table_name as table_name FROM information_schema.tables WHERE " . (string) $condition, $condition->arguments());

    $results = $this->connection->query("SELECT table_name AS table_name FROM information_schema.tables WHERE " . (string) $condition, $condition->arguments());

    foreach ($results as $table) {

      // Take into account tables that have an individual prefix.

      if (isset($individually_prefixed_tables[$table->table_name])) {

core/modules/block_content/src/Plugin/migrate/source/d7/BlockCustomTranslation.php

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public function query() { 


    // Add in the property, which is either title or body. Cast the bid to text

    // so PostgreSQL can make the join.

    $query->leftJoin(static::I18N_STRING_TABLE, 'i18n', 'i18n.objectid = CAST(b.bid as CHAR(255))');

    $query->leftJoin(static::I18N_STRING_TABLE, 'i18n', 'i18n.objectid = CAST(b.bid AS CHAR(255))');

    $query->condition('i18n.type', 'block');



    // Add in the translation for the property.

core/modules/comment/src/Plugin/views/field/NodeNewComments.php

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ public function preRender(&$values) { 
    }



    if ($nids) {

      $result = $this->database->query("SELECT n.nid, COUNT(c.cid) as num_comments FROM {node} n INNER JOIN {comment_field_data} c ON n.nid = c.entity_id AND c.entity_type = 'node' AND c.default_langcode = 1

      $result = $this->database->query("SELECT n.nid, COUNT(c.cid) AS num_comments FROM {node} n INNER JOIN {comment_field_data} c ON n.nid = c.entity_id AND c.entity_type = 'node' AND c.default_langcode = 1

        LEFT JOIN {history} h ON h.nid = n.nid AND h.uid = :h_uid WHERE n.nid IN ( :nids[] )

        AND c.changed > GREATEST(COALESCE(h.timestamp, :timestamp1), :timestamp2) AND c.status = :status GROUP BY n.nid", [

        ':status' => CommentInterface::PUBLISHED,

core/modules/menu_link_content/src/Plugin/migrate/source/d6/MenuLinkTranslation.php

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ public function query() { 


    // Add in the property, which is either title or description. Cast the mlid

    // to text so PostgreSQL can make the join.

    $query->leftJoin(static::I18N_STRING_TABLE, 'i18n', 'CAST(ml.mlid as CHAR(255)) = i18n.objectid');

    $query->leftJoin(static::I18N_STRING_TABLE, 'i18n', 'CAST(ml.mlid AS CHAR(255)) = i18n.objectid');

    $query->addField('i18n', 'lid');

    $query->addField('i18n', 'property');