diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php index 3ac81ab..28f5884 100644 --- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php +++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php @@ -1277,9 +1277,13 @@ protected function updateDedicatedTableSchema(FieldStorageDefinitionInterface $s $table = $table_mapping->getDedicatedDataTableName($original); $revision_table = $table_mapping->getDedicatedRevisionTableName($original); + // Get the field schemas. $schema = $storage_definition->getSchema(); $original_schema = $original->getSchema(); + // Gets the SQL schema for a dedicated tables. + $actual_schema = $this->getDedicatedTableSchema($storage_definition); + foreach ($original_schema['indexes'] as $name => $columns) { if (!isset($schema['indexes'][$name]) || $columns != $schema['indexes'][$name]) { $real_name = $this->getFieldIndexName($storage_definition, $name); @@ -1306,8 +1310,8 @@ protected function updateDedicatedTableSchema(FieldStorageDefinitionInterface $s $real_columns[] = $table_mapping->getFieldColumnName($storage_definition, $column_name); } } - $this->database->schema()->addIndex($table, $real_name, $real_columns, $schema); - $this->database->schema()->addIndex($revision_table, $real_name, $real_columns, $schema); + $this->database->schema()->addIndex($table, $real_name, $real_columns, $actual_schema[$table]); + $this->database->schema()->addIndex($revision_table, $real_name, $real_columns, $actual_schema[$revision_table]); } } $this->saveFieldSchemaData($storage_definition, $this->getDedicatedTableSchema($storage_definition));