Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / web / core / lib / Drupal / Core / Entity / Query / Sql / Tables.php

diff --git a/web/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php b/web/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
index 5fff4aa2caac72480c196099e1604fb105943ab0..a9ff4b136dcc6aac9f4e0db3b6944b12e889a865 100644 (file)
--- a/web/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
+++ b/web/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
@@ -8,6 +8,7 @@ use Drupal\Core\Entity\Query\QueryException;
 use Drupal\Core\Entity\Sql\SqlEntityStorageInterface;
 use Drupal\Core\Entity\Sql\TableMappingInterface;
 use Drupal\Core\Entity\TypedData\EntityDataDefinitionInterface;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\TypedData\DataReferenceDefinitionInterface;
 
 /**
@@ -93,9 +94,11 @@ class Tables implements TablesInterface {
       $specifier = $specifiers[$key];
       if (isset($field_storage_definitions[$specifier])) {
         $field_storage = $field_storage_definitions[$specifier];
+        $column = $field_storage->getMainPropertyName();
       }
       else {
         $field_storage = FALSE;
+        $column = NULL;
       }
 
       // If there is revision support, only the current revisions are being
@@ -120,8 +123,6 @@ class Tables implements TablesInterface {
       // Check whether this field is stored in a dedicated table.
       if ($field_storage && $table_mapping->requiresDedicatedTableStorage($field_storage)) {
         $delta = NULL;
-        // Find the field column.
-        $column = $field_storage->getMainPropertyName();
 
         if ($key < $count) {
           $next = $specifiers[$key + 1];
@@ -175,10 +176,6 @@ class Tables implements TablesInterface {
         }
         $table = $this->ensureFieldTable($index_prefix, $field_storage, $type, $langcode, $base_table, $entity_id_field, $field_id_field, $delta);
         $sql_column = $table_mapping->getFieldColumnName($field_storage, $column);
-        $property_definitions = $field_storage->getPropertyDefinitions();
-        if (isset($property_definitions[$column])) {
-          $this->caseSensitiveFields[$field] = $property_definitions[$column]->getSetting('case_sensitive');
-        }
       }
       // The field is stored in a shared table.
       else {
@@ -238,18 +235,17 @@ class Tables implements TablesInterface {
         }
 
         $table = $this->ensureEntityTable($index_prefix, $sql_column, $type, $langcode, $base_table, $entity_id_field, $entity_tables);
+      }
 
-        // If there is a field storage (some specifiers are not), check for case
-        // sensitivity.
-        if ($field_storage) {
-          $column = $field_storage->getMainPropertyName();
-          $base_field_property_definitions = $field_storage->getPropertyDefinitions();
-          if (isset($base_field_property_definitions[$column])) {
-            $this->caseSensitiveFields[$field] = $base_field_property_definitions[$column]->getSetting('case_sensitive');
-          }
+      // If there is a field storage (some specifiers are not) and a field
+      // column, check for case sensitivity.
+      if ($field_storage && $column) {
+        $property_definitions = $field_storage->getPropertyDefinitions();
+        if (isset($property_definitions[$column])) {
+          $this->caseSensitiveFields[$field] = $property_definitions[$column]->getSetting('case_sensitive');
         }
-
       }
+
       // If there are more specifiers to come, it's a relationship.
       if ($field_storage && $key < $count) {
         // Computed fields have prepared their property definition already, do
@@ -276,14 +272,6 @@ class Tables implements TablesInterface {
           $entity_type = $this->entityManager->getDefinition($entity_type_id);
           $field_storage_definitions = $this->entityManager->getFieldStorageDefinitions($entity_type_id);
           // Add the new entity base table using the table and sql column.
-          // An additional $field_storage argument is being passed to
-          // addNextBaseTable() in order to improve its functionality, for
-          // example by allowing extra processing based on the field type of the
-          // storage. In order to maintain backwards compatibility in 8.4.x, the
-          // new argument has not been added to the signature of that method,
-          // and it will be added only in 8.5.x.
-          // @todo Add the $field_storage argument to addNextBaseTable() in
-          //   8.5.x. https://www.drupal.org/node/2909425
           $base_table = $this->addNextBaseTable($entity_type, $table, $sql_column, $field_storage);
           $propertyDefinitions = [];
           $key++;
@@ -421,8 +409,10 @@ class Tables implements TablesInterface {
    * @param string $table
    *   The table name.
    *
-   * @return array|bool
-   *   The table field mapping for the given table or FALSE if not available.
+   * @return array|false
+   *   An associative array of table field mapping for the given table, keyed by
+   *   columns name and values are just incrementing integers. If the table
+   *   mapping is not available, FALSE is returned.
    */
   protected function getTableMapping($table, $entity_type_id) {
     $storage = $this->entityManager->getStorage($entity_type_id);
@@ -451,11 +441,13 @@ class Tables implements TablesInterface {
    *   This is the table being joined, in the above example, {users}.
    * @param string $sql_column
    *   This is the SQL column in the existing table being joined to.
+   * @param \Drupal\Core\Field\FieldStorageDefinitionInterface $field_storage
+   *   The field storage definition for the field referencing this column.
    *
    * @return string
    *   The alias of the next entity table joined in.
    */
-  protected function addNextBaseTable(EntityType $entity_type, $table, $sql_column) {
+  protected function addNextBaseTable(EntityType $entity_type, $table, $sql_column, FieldStorageDefinitionInterface $field_storage) {
     $join_condition = '%alias.' . $entity_type->getKey('id') . " = $table.$sql_column";
     return $this->sqlQuery->leftJoin($entity_type->getBaseTable(), NULL, $join_condition);
   }