diff --git a/core/modules/views/views.install b/core/modules/views/views.install index 8801a93bc1..588e9815e9 100644 --- a/core/modules/views/views.install +++ b/core/modules/views/views.install @@ -412,6 +412,82 @@ function views_update_8201() { // Empty update to cause a cache rebuild so that config schema get refreshed. } +/** + * Update field names for multi-value base fields. + */ +function views_update_8300() { + // Find all multi-value base fields for content entities. + $entity_type_manager = \Drupal::entityTypeManager(); + $entity_field_manager = \Drupal::service('entity_field.manager'); + $table_update_info = []; + + foreach ($entity_type_manager->getDefinitions() as $entity_type_id => $entity_type) { + if ($entity_type->hasHandlerClass('views_data')) { + $base_field_definitions = $entity_field_manager->getBaseFieldDefinitions($entity_type_id); + + $entity_storage = $entity_type_manager->getStorage($entity_type_id); + $table_mapping = $entity_storage->getTableMapping($base_field_definitions); + + foreach ($base_field_definitions as $field_name => $base_field_definition) { + $base_field_storage_definition = $base_field_definition->getFieldStorageDefinition(); + + // Skip single value and custom storage base fields. + if (!$base_field_storage_definition->isMultiple() || $base_field_storage_definition->hasCustomStorage()) { + continue; + } + + // Get the actual table, as well as the column for the main property + // name so we can perform an update later on the views. + $table_name = $table_mapping->getFieldTableName($field_name); + $main_property_name = $base_field_storage_definition->getMainPropertyName(); + + $table_update_info[$table_name][$field_name] = $table_mapping->getFieldColumnName($base_field_storage_definition, $main_property_name); + } + } + } + + $config_factory = \Drupal::configFactory(); + $handler_types = ['fields', 'arguments', 'sorts', 'relationships', 'filters']; + + foreach ($config_factory->listAll('views.view.') as $id) { + $view = $config_factory->getEditable($id); + $changed = FALSE; + + foreach ($view->get('display') as $display_id => &$display) { + foreach ($handler_types as $handler_type) { + $handler_data = $view->get("display.$display_id.display_options.$handler_type"); + + if (empty($handler_data)) { + continue; + } + + foreach ($handler_data as $key => $data) { + // If this handler has a table we're interested in, update the field + // name. + $table = $data['table']; + if (isset($table_update_info[$table])) { + $path = "display.$display_id.display_options.$handler_type.$key.field"; + $original_field_name = $view->get($path); + + // Only if the wrong field name is set do we change the field. It + // could already be using the correct field. Like + // user__roles/roles_target_id. + if (isset($table_update_info[$table][$original_field_name])) { + $view->set($path, $table_update_info[$table][$original_field_name]); + $changed = TRUE; + } + } + } + } + } + + if ($changed) { + $view->save(TRUE); + } + } + +} + /** * @} End of "addtogroup updates-8.2.0". */