diff --git a/core/modules/field/src/Plugin/migrate/source/d7/Field.php b/core/modules/field/src/Plugin/migrate/source/d7/Field.php index d9aef91..c520bbe 100644 --- a/core/modules/field/src/Plugin/migrate/source/d7/Field.php +++ b/core/modules/field/src/Plugin/migrate/source/d7/Field.php @@ -8,6 +8,11 @@ /** * Drupal 7 field source from database. * + * @internal + * + * This class is marked as internal and should not be extended. Use + * Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase instead. + * * @MigrateSource( * id = "d7_field" * ) @@ -23,8 +28,9 @@ public function query() { ->fields('fc') ->fields('fci', ['entity_type']) ->condition('fc.active', 1) + ->condition('fc.storage_active', 1) ->condition('fc.deleted', 0) - ->condition('fc.storage_active', 1); + ->condition('fci.deleted', 0); $query->join('field_config_instance', 'fci', 'fc.id = fci.field_id'); return $query; @@ -35,13 +41,20 @@ public function query() { */ public function fields() { return [ - 'field_name' => $this->t('The name of this field.'), - 'type' => $this->t('The type of this field.'), + 'id' => $this->t('The field ID.'), + 'field_name' => $this->t('The field name.'), + 'type' => $this->t('The field type.'), 'module' => $this->t('The module that implements the field type.'), - 'storage' => $this->t('The field storage.'), + 'active' => $this->t('The field status.'), + 'storage_type' => $this->t('The field storage type.'), + 'storage_module' => $this->t('The module that implements the field storage type.'), + 'storage_active' => $this->t('The field storage status.'), 'locked' => $this->t('Locked'), + 'data' => $this->t('The field data.'), 'cardinality' => $this->t('Cardinality'), 'translatable' => $this->t('Translatable'), + 'deleted' => $this->t('Deleted'), + 'instances' => $this->t('The field instances.'), ]; } @@ -52,6 +65,15 @@ public function prepareRow(Row $row, $keep = TRUE) { foreach (unserialize($row->getSourceProperty('data')) as $key => $value) { $row->setSourceProperty($key, $value); } + + $instances = $this->select('field_config_instance', 'fci') + ->fields('fci') + ->condition('field_name', $row->getSourceProperty('field_name')) + ->condition('entity_type', $row->getSourceProperty('entity_type')) + ->execute() + ->fetchAll(); + $row->setSourceProperty('instances', $instances); + return parent::prepareRow($row); } diff --git a/core/modules/field/tests/src/Kernel/Plugin/migrate/source/d7/FieldTest.php b/core/modules/field/tests/src/Kernel/Plugin/migrate/source/d7/FieldTest.php index 707d624..f904429 100644 --- a/core/modules/field/tests/src/Kernel/Plugin/migrate/source/d7/FieldTest.php +++ b/core/modules/field/tests/src/Kernel/Plugin/migrate/source/d7/FieldTest.php @@ -70,9 +70,29 @@ public function providerSource() { // The expected results. $tests[0]['expected_data'] = [ [ + 'id' => '11', 'field_name' => 'field_file', 'type' => 'file', + 'module' => 'file', + 'active' => '1', + 'storage_type' => 'field_sql_storage', + 'storage_module' => 'field_sql_storage', + 'storage_active' => '1', + 'locked' => '0', + 'data' => 'a:7:{s:12:"translatable";s:1:"0";s:12:"entity_types";a:0:{}s:8:"settings";a:3:{s:13:"display_field";i:0;s:15:"display_default";i:0;s:10:"uri_scheme";s:6:"public";}s:7:"storage";a:5:{s:4:"type";s:17:"field_sql_storage";s:8:"settings";a:0:{}s:6:"module";s:17:"field_sql_storage";s:6:"active";s:1:"1";s:7:"details";a:1:{s:3:"sql";a:2:{s:18:"FIELD_LOAD_CURRENT";a:1:{s:21:"field_data_field_file";a:3:{s:3:"fid";s:14:"field_file_fid";s:7:"display";s:18:"field_file_display";s:11:"description";s:22:"field_file_description";}}s:19:"FIELD_LOAD_REVISION";a:1:{s:25:"field_revision_field_file";a:3:{s:3:"fid";s:14:"field_file_fid";s:7:"display";s:18:"field_file_display";s:11:"description";s:22:"field_file_description";}}}}}s:12:"foreign keys";a:1:{s:3:"fid";a:2:{s:5:"table";s:12:"file_managed";s:7:"columns";a:1:{s:3:"fid";s:3:"fid";}}}s:7:"indexes";a:1:{s:3:"fid";a:1:{i:0;s:3:"fid";}}s:2:"id";s:2:"11";}', + 'cardinality' => '1', + 'translatable' => '0', + 'deleted' => '0', + 'entity_types' => [], + 'settings' => [ + 'display_field' => '0', + 'display_default' => '0', + 'uri_scheme' => 'public', + ], 'storage' => [ + 'type' => 'field_sql_storage', + 'settings' => [], + 'module' => 'field_sql_storage', 'active' => 1, 'details' => [ 'sql' => [ @@ -92,18 +112,44 @@ public function providerSource() { ], ], ], - 'module' => 'field_sql_storage', - 'settings' => [], - 'type' => 'field_sql_storage', ], - 'module' => 'file', - 'locked' => 0, 'entity_type' => 'node', + 'instances' => [ + [ + 'id' => '21', + 'field_id' => '11', + 'field_name' => 'field_file', + 'entity_type' => 'node', + 'bundle' => 'test_content_type', + 'data' => 'a:6:{s:5:"label";s:4:"File";s:6:"widget";a:5:{s:6:"weight";s:1:"5";s:4:"type";s:12:"file_generic";s:6:"module";s:4:"file";s:6:"active";i:1;s:8:"settings";a:1:{s:18:"progress_indicator";s:8:"throbber";}}s:8:"settings";a:5:{s:14:"file_directory";s:0:"";s:15:"file_extensions";s:15:"txt pdf ods odf";s:12:"max_filesize";s:5:"10 MB";s:17:"description_field";i:1;s:18:"user_register_form";b:0;}s:7:"display";a:1:{s:7:"default";a:5:{s:5:"label";s:5:"above";s:4:"type";s:12:"file_default";s:6:"weight";s:1:"5";s:8:"settings";a:0:{}s:6:"module";s:4:"file";}}s:8:"required";i:0;s:11:"description";s:0:"";}', + 'deleted' => '0', + ], + ], ], [ + 'id' => '11', 'field_name' => 'field_file', 'type' => 'file', + 'module' => 'file', + 'active' => '1', + 'storage_type' => 'field_sql_storage', + 'storage_module' => 'field_sql_storage', + 'storage_active' => '1', + 'locked' => '0', + 'data' => 'a:7:{s:12:"translatable";s:1:"0";s:12:"entity_types";a:0:{}s:8:"settings";a:3:{s:13:"display_field";i:0;s:15:"display_default";i:0;s:10:"uri_scheme";s:6:"public";}s:7:"storage";a:5:{s:4:"type";s:17:"field_sql_storage";s:8:"settings";a:0:{}s:6:"module";s:17:"field_sql_storage";s:6:"active";s:1:"1";s:7:"details";a:1:{s:3:"sql";a:2:{s:18:"FIELD_LOAD_CURRENT";a:1:{s:21:"field_data_field_file";a:3:{s:3:"fid";s:14:"field_file_fid";s:7:"display";s:18:"field_file_display";s:11:"description";s:22:"field_file_description";}}s:19:"FIELD_LOAD_REVISION";a:1:{s:25:"field_revision_field_file";a:3:{s:3:"fid";s:14:"field_file_fid";s:7:"display";s:18:"field_file_display";s:11:"description";s:22:"field_file_description";}}}}}s:12:"foreign keys";a:1:{s:3:"fid";a:2:{s:5:"table";s:12:"file_managed";s:7:"columns";a:1:{s:3:"fid";s:3:"fid";}}}s:7:"indexes";a:1:{s:3:"fid";a:1:{i:0;s:3:"fid";}}s:2:"id";s:2:"11";}', + 'cardinality' => '1', + 'translatable' => '0', + 'deleted' => '0', + 'entity_types' => [], + 'settings' => [ + 'display_field' => '0', + 'display_default' => '0', + 'uri_scheme' => 'public', + ], 'storage' => [ + 'type' => 'field_sql_storage', + 'settings' => [], + 'module' => 'field_sql_storage', 'active' => 1, 'details' => [ 'sql' => [ @@ -123,13 +169,19 @@ public function providerSource() { ], ], ], - 'module' => 'field_sql_storage', - 'settings' => [], - 'type' => 'field_sql_storage', ], - 'module' => 'file', - 'locked' => 0, 'entity_type' => 'user', + 'instances' => [ + [ + 'id' => '33', + 'field_id' => '11', + 'field_name' => 'field_file', + 'entity_type' => 'user', + 'bundle' => 'user', + 'data' => 'a:6:{s:5:"label";s:4:"File";s:6:"widget";a:5:{s:6:"weight";s:1:"8";s:4:"type";s:12:"file_generic";s:6:"module";s:4:"file";s:6:"active";i:1;s:8:"settings";a:1:{s:18:"progress_indicator";s:8:"throbber";}}s:8:"settings";a:5:{s:14:"file_directory";s:0:"";s:15:"file_extensions";s:3:"txt";s:12:"max_filesize";s:0:"";s:17:"description_field";i:0;s:18:"user_register_form";i:0;}s:7:"display";a:1:{s:7:"default";a:5:{s:5:"label";s:5:"above";s:4:"type";s:12:"file_default";s:8:"settings";a:0:{}s:6:"module";s:4:"file";s:6:"weight";i:0;}}s:8:"required";i:0;s:11:"description";s:0:"";}', + 'deleted' => '0', + ], + ], ], ];