From 84ec532b6dbd180b4cf4b017663ea9fd6327806b Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Tue, 5 Feb 2019 15:36:36 +0100 Subject: [PATCH] added highwater mark to currently developed migration, added migrate shell script for auto deployement --- ...grate_plus.migration.d7_allpublicfiles.yml | 5 ++-- .../migrate_plus.migration.d7_node_breve.yml | 9 +++++-- ...rate_plus.migration.d7_node_breve_i18n.yml | 9 +++++-- ...igrate_plus.migration.d7_node_materiau.yml | 9 +++++-- ...e_plus.migration.d7_node_materiau_i18n.yml | 9 +++++-- ...lus.migration.d7_taxonomy_term_company.yml | 2 +- ...us.migration.d7_taxonomy_term_showroom.yml | 2 +- ...e_plus.migration.d7_taxonomy_term_tags.yml | 2 +- ...s.migration.d7_taxonomy_term_tags_i18n.yml | 2 +- ...s.migration.d7_taxonomy_term_thesaurus.yml | 2 +- ...ration.d7_taxonomy_term_thesaurus_i18n.yml | 2 +- ...igrate_plus.migration_group.d7_materio.yml | 4 +-- migrate-from-d7.sh | 27 +++++++++++++++++++ .../migrate_plus.migration.d7_node_breve.yml | 6 +++++ ...rate_plus.migration.d7_node_breve_i18n.yml | 5 ++++ ...igrate_plus.migration.d7_node_materiau.yml | 6 +++++ ...e_plus.migration.d7_node_materiau_i18n.yml | 6 +++++ .../src/Plugin/migrate/source/D7NodeBreve.php | 6 ----- .../Plugin/migrate/source/D7NodeBreveI18n.php | 11 ++------ .../Plugin/migrate/source/D7NodeMateriau.php | 2 +- .../migrate/source/D7NodeMateriauI18n.php | 7 ++--- 21 files changed, 95 insertions(+), 38 deletions(-) diff --git a/config/sync/migrate_plus.migration.d7_allpublicfiles.yml b/config/sync/migrate_plus.migration.d7_allpublicfiles.yml index 6a7c886..ddc536d 100644 --- a/config/sync/migrate_plus.migration.d7_allpublicfiles.yml +++ b/config/sync/migrate_plus.migration.d7_allpublicfiles.yml @@ -1,9 +1,9 @@ -uuid: 6d3381ad-523b-4124-8429-532c91814471 +uuid: 08f56f89-ef1b-49ae-8321-61c164b21bc2 langcode: en status: true dependencies: { } _core: - default_config_hash: eW9e-k2ZTYkBblJsG588q7T53MDzhLj-IGx0udg6qto + default_config_hash: WjrNh29LxegDzfT9TlEVu3Bf21NE7GVnBJDWACIN3vg id: d7_allpublicfiles class: null field_plugin_method: null @@ -19,7 +19,6 @@ source: constants: source_base_path: ../../../d7.materio.com/public_html process: - fid: fid filename: filename source_full_path: - diff --git a/config/sync/migrate_plus.migration.d7_node_breve.yml b/config/sync/migrate_plus.migration.d7_node_breve.yml index 63f3f71..3edb878 100644 --- a/config/sync/migrate_plus.migration.d7_node_breve.yml +++ b/config/sync/migrate_plus.migration.d7_node_breve.yml @@ -1,9 +1,9 @@ -uuid: c252747d-7f6d-476f-bcea-6599ce9347a9 +uuid: fe5c7cd7-5404-420c-a41d-144c23f5a2c7 langcode: en status: true dependencies: { } _core: - default_config_hash: KoO_LBuLNgKvzDrrix4nuXbkzp6XWlQaUp9_mpK-tqU + default_config_hash: JA4aMGGDJwLeCUNGla4k3R17rNjUTUbDb3UHhsVIRxQ id: d7_node_breve class: null field_plugin_method: null @@ -17,11 +17,16 @@ label: 'Node Breve' source: plugin: d7_node_breve node_type: breve + high_water_property: + name: changed + alias: 'n' process: type: plugin: default_value default_value: breve title: title + created: created + changed: changed field_migration: plugin: default_value default_value: migration_imported diff --git a/config/sync/migrate_plus.migration.d7_node_breve_i18n.yml b/config/sync/migrate_plus.migration.d7_node_breve_i18n.yml index 48a67d9..d6af321 100644 --- a/config/sync/migrate_plus.migration.d7_node_breve_i18n.yml +++ b/config/sync/migrate_plus.migration.d7_node_breve_i18n.yml @@ -1,9 +1,9 @@ -uuid: 2ea310ab-d6d5-4ec1-982b-c6c66068c395 +uuid: 54e7e1a7-afa1-44a2-b332-419c3cfeb7a4 langcode: en status: true dependencies: { } _core: - default_config_hash: 24TmjnmLfhF_b5Amw02m1ndMgS_in_S13nmHQtnvdsU + default_config_hash: 7wpPpDXK_mZz1BYtN7PBuBjb4hSsSx4ab-sqPW6kwhM id: d7_node_breve_i18n class: null field_plugin_method: null @@ -18,6 +18,9 @@ source: plugin: d7_node_breve_i18n node_type: breve translations: true + high_water_property: + name: changed + alias: 'n' process: nid: plugin: migration_lookup @@ -30,6 +33,8 @@ process: langcode: language content_translation_source: source title: title + created: created + changed: changed body: plugin: iterator source: body diff --git a/config/sync/migrate_plus.migration.d7_node_materiau.yml b/config/sync/migrate_plus.migration.d7_node_materiau.yml index 9bf7bcf..6bcd56d 100644 --- a/config/sync/migrate_plus.migration.d7_node_materiau.yml +++ b/config/sync/migrate_plus.migration.d7_node_materiau.yml @@ -1,9 +1,9 @@ -uuid: e48d0c98-06d6-447c-94dc-9d5e2585fa34 +uuid: 179f73ca-cb6a-4277-9d37-f8b0f804c446 langcode: en status: true dependencies: { } _core: - default_config_hash: rh5NZM-nq2T5x5XOjpaNaHZZFAjkf4nwNthnAEJXN-8 + default_config_hash: vECgUQkA1A8_ZiNqfWtEenHdJrqYKE98xNWqiR19E_4 id: d7_node_materiau class: null field_plugin_method: null @@ -17,11 +17,16 @@ label: 'Node Materiau' source: plugin: d7_node_materiau node_type: materiau + high_water_property: + name: changed + alias: 'n' process: type: plugin: default_value default_value: materiau title: title + created: created + changed: changed field_short_description: field_nature_titre field_migration: plugin: default_value diff --git a/config/sync/migrate_plus.migration.d7_node_materiau_i18n.yml b/config/sync/migrate_plus.migration.d7_node_materiau_i18n.yml index b6c34b2..ea1e52a 100644 --- a/config/sync/migrate_plus.migration.d7_node_materiau_i18n.yml +++ b/config/sync/migrate_plus.migration.d7_node_materiau_i18n.yml @@ -1,9 +1,9 @@ -uuid: 1fddb711-93f5-4215-8ae4-4be3f50dae9c +uuid: 77834f54-2f0e-40ba-8019-69939d0ca1fe langcode: en status: true dependencies: { } _core: - default_config_hash: ezODGhaONTf5KLDIrvVbJJqNKtq0nmV1mbuxKLP7Jzg + default_config_hash: ajKKikYoN4tucCSodObLGpE3uyVsFhzhV-lvIVOlnxY id: d7_node_materiau_i18n class: null field_plugin_method: null @@ -18,6 +18,9 @@ source: plugin: d7_node_materiau_i18n node_type: materiau translations: true + high_water_property: + name: changed + alias: 'n' process: nid: plugin: migration_lookup @@ -30,6 +33,8 @@ process: langcode: language content_translation_source: source title: title + created: created + changed: changed field_short_description: field_nature_titre body: plugin: iterator diff --git a/config/sync/migrate_plus.migration.d7_taxonomy_term_company.yml b/config/sync/migrate_plus.migration.d7_taxonomy_term_company.yml index dcb9083..ae64b47 100644 --- a/config/sync/migrate_plus.migration.d7_taxonomy_term_company.yml +++ b/config/sync/migrate_plus.migration.d7_taxonomy_term_company.yml @@ -1,4 +1,4 @@ -uuid: 9ca88832-0068-4361-b607-b4a39385af4a +uuid: acc28c34-ed9f-426d-af0f-abc8ac5f487f langcode: en status: true dependencies: { } diff --git a/config/sync/migrate_plus.migration.d7_taxonomy_term_showroom.yml b/config/sync/migrate_plus.migration.d7_taxonomy_term_showroom.yml index 14111fd..f824652 100644 --- a/config/sync/migrate_plus.migration.d7_taxonomy_term_showroom.yml +++ b/config/sync/migrate_plus.migration.d7_taxonomy_term_showroom.yml @@ -1,4 +1,4 @@ -uuid: 07f355e3-fa3d-40a3-959d-b7551af3c905 +uuid: a5d4a3ab-6711-4609-8089-aa5dbcf67dd3 langcode: en status: true dependencies: { } diff --git a/config/sync/migrate_plus.migration.d7_taxonomy_term_tags.yml b/config/sync/migrate_plus.migration.d7_taxonomy_term_tags.yml index cb36f05..7dc94b9 100644 --- a/config/sync/migrate_plus.migration.d7_taxonomy_term_tags.yml +++ b/config/sync/migrate_plus.migration.d7_taxonomy_term_tags.yml @@ -1,4 +1,4 @@ -uuid: e6923479-d7fd-439a-9c1f-45d511a20c1a +uuid: 19726b72-67fa-4f1e-9266-a404d9b04c1c langcode: en status: true dependencies: { } diff --git a/config/sync/migrate_plus.migration.d7_taxonomy_term_tags_i18n.yml b/config/sync/migrate_plus.migration.d7_taxonomy_term_tags_i18n.yml index 39c876f..45daa4c 100644 --- a/config/sync/migrate_plus.migration.d7_taxonomy_term_tags_i18n.yml +++ b/config/sync/migrate_plus.migration.d7_taxonomy_term_tags_i18n.yml @@ -1,4 +1,4 @@ -uuid: 8a3ae460-11b6-4f9d-a1b1-32c86fa500ac +uuid: 23fd1ac1-d176-4b6a-9f38-e005f5489745 langcode: en status: true dependencies: { } diff --git a/config/sync/migrate_plus.migration.d7_taxonomy_term_thesaurus.yml b/config/sync/migrate_plus.migration.d7_taxonomy_term_thesaurus.yml index 66a36ca..8dc224f 100644 --- a/config/sync/migrate_plus.migration.d7_taxonomy_term_thesaurus.yml +++ b/config/sync/migrate_plus.migration.d7_taxonomy_term_thesaurus.yml @@ -1,4 +1,4 @@ -uuid: abd3a273-3660-4db4-b7ac-f5562af67097 +uuid: a978099f-5b98-4b31-808a-0642e769690f langcode: en status: true dependencies: { } diff --git a/config/sync/migrate_plus.migration.d7_taxonomy_term_thesaurus_i18n.yml b/config/sync/migrate_plus.migration.d7_taxonomy_term_thesaurus_i18n.yml index 0db7f68..ee7f6f2 100644 --- a/config/sync/migrate_plus.migration.d7_taxonomy_term_thesaurus_i18n.yml +++ b/config/sync/migrate_plus.migration.d7_taxonomy_term_thesaurus_i18n.yml @@ -1,4 +1,4 @@ -uuid: 87ae71f8-6a8e-4156-9376-3b157997a20c +uuid: 2fe883b6-f961-4687-8ad2-25ed24a7ced1 langcode: en status: true dependencies: { } diff --git a/config/sync/migrate_plus.migration_group.d7_materio.yml b/config/sync/migrate_plus.migration_group.d7_materio.yml index 9be07ae..0a96223 100644 --- a/config/sync/migrate_plus.migration_group.d7_materio.yml +++ b/config/sync/migrate_plus.migration_group.d7_materio.yml @@ -1,5 +1,5 @@ -uuid: 6bc216c5-d7bb-4437-8379-698a2dee3586 -langcode: en +uuid: bb745097-c0b1-4e79-b7a2-9a2aebc60081 +langcode: fr status: true dependencies: enforced: diff --git a/migrate-from-d7.sh b/migrate-from-d7.sh index bf9528a..4dda709 100644 --- a/migrate-from-d7.sh +++ b/migrate-from-d7.sh @@ -1,15 +1,42 @@ #! /bin/bash +echo "* * * * * * * * * * * * * * * * *" +echo "* *" +echo "* Migration *" +echo "* *" +echo "* * * * * * * * * * * * * * * * *" drush ms --group=d7_materio +echo " " +echo "Migrating Files" drush mim d7_allpublicfiles --feedback=1000 +echo " " +echo "Migrating Taxonomy" +echo "Migrating thesaurus" drush mim d7_taxonomy_term_thesaurus --update --feedback=100 drush mim d7_taxonomy_term_thesaurus_i18n --update --feedback=100 +echo " " +echo "Migrating tags" drush mim d7_taxonomy_term_tags --update --feedback=100 drush mim d7_taxonomy_term_tags_i18n --update --feedback=100 +echo " " +echo "Migrating companies" drush mim d7_taxonomy_term_company --update --feedback=100 +echo " " +echo "Migrating showroom" drush mim d7_taxonomy_term_showroom --update --feedback=100 + +echo " " +echo "Migrating Nodes" +echo "Migrating breves" +drush mim d7_node_breve --feedback=100 +drush mim d7_node_breve_i18n --feedback=100 + +echo " " +echo "Migrating Materials" +drush mim d7_node_materiau --feedback=1000 +drush mim d7_node_materiau_i18n --feedback=1000 diff --git a/web/modules/custom/materio_migrate/config/install/migrate_plus.migration.d7_node_breve.yml b/web/modules/custom/materio_migrate/config/install/migrate_plus.migration.d7_node_breve.yml index 29c9b38..c316155 100644 --- a/web/modules/custom/materio_migrate/config/install/migrate_plus.migration.d7_node_breve.yml +++ b/web/modules/custom/materio_migrate/config/install/migrate_plus.migration.d7_node_breve.yml @@ -11,6 +11,9 @@ deriver: Drupal\taxonomy\Plugin\migrate\D7TaxonomyTermDeriver source: plugin: d7_node_breve node_type: breve + high_water_property: + name: changed + alias: n destination: plugin: entity:node @@ -22,6 +25,9 @@ process: plugin: default_value default_value: breve title: title + created: created + changed: changed + field_migration: plugin: default_value default_value: 'migration_imported' diff --git a/web/modules/custom/materio_migrate/config/install/migrate_plus.migration.d7_node_breve_i18n.yml b/web/modules/custom/materio_migrate/config/install/migrate_plus.migration.d7_node_breve_i18n.yml index 8881d7a..fa0b68f 100644 --- a/web/modules/custom/materio_migrate/config/install/migrate_plus.migration.d7_node_breve_i18n.yml +++ b/web/modules/custom/materio_migrate/config/install/migrate_plus.migration.d7_node_breve_i18n.yml @@ -12,6 +12,9 @@ source: plugin: d7_node_breve_i18n node_type: breve translations: true + high_water_property: + name: changed + alias: n destination: plugin: entity:node @@ -29,6 +32,8 @@ process: langcode: language content_translation_source: source title: title + created: created + changed: changed body: plugin: iterator source: body diff --git a/web/modules/custom/materio_migrate/config/install/migrate_plus.migration.d7_node_materiau.yml b/web/modules/custom/materio_migrate/config/install/migrate_plus.migration.d7_node_materiau.yml index c3e6769..15620a7 100644 --- a/web/modules/custom/materio_migrate/config/install/migrate_plus.migration.d7_node_materiau.yml +++ b/web/modules/custom/materio_migrate/config/install/migrate_plus.migration.d7_node_materiau.yml @@ -11,6 +11,9 @@ migration_tags: source: plugin: d7_node_materiau node_type: materiau + high_water_property: + name: changed + alias: n destination: plugin: entity:node @@ -22,6 +25,9 @@ process: plugin: default_value default_value: materiau title: title + created: created + changed: changed + field_short_description: field_nature_titre field_migration: plugin: default_value diff --git a/web/modules/custom/materio_migrate/config/install/migrate_plus.migration.d7_node_materiau_i18n.yml b/web/modules/custom/materio_migrate/config/install/migrate_plus.migration.d7_node_materiau_i18n.yml index 5bd6a26..1acf082 100644 --- a/web/modules/custom/materio_migrate/config/install/migrate_plus.migration.d7_node_materiau_i18n.yml +++ b/web/modules/custom/materio_migrate/config/install/migrate_plus.migration.d7_node_materiau_i18n.yml @@ -12,6 +12,9 @@ source: plugin: d7_node_materiau_i18n node_type: materiau translations: true + high_water_property: + name: changed + alias: n destination: plugin: entity:node @@ -29,6 +32,9 @@ process: langcode: language content_translation_source: source title: title + created: created + changed: changed + field_short_description: field_nature_titre body: plugin: iterator diff --git a/web/modules/custom/materio_migrate/src/Plugin/migrate/source/D7NodeBreve.php b/web/modules/custom/materio_migrate/src/Plugin/migrate/source/D7NodeBreve.php index 7473a2d..a372e3e 100644 --- a/web/modules/custom/materio_migrate/src/Plugin/migrate/source/D7NodeBreve.php +++ b/web/modules/custom/materio_migrate/src/Plugin/migrate/source/D7NodeBreve.php @@ -99,12 +99,6 @@ class D7NodeBreve extends FieldableEntity { $query->condition('n.type', $this->configuration['node_type']); } - $this->highwaterField = array( - 'name' => 'changed', - 'alias' => 'n', - 'type' => 'int', - ); - return $query; } diff --git a/web/modules/custom/materio_migrate/src/Plugin/migrate/source/D7NodeBreveI18n.php b/web/modules/custom/materio_migrate/src/Plugin/migrate/source/D7NodeBreveI18n.php index 27849ef..efb5a22 100644 --- a/web/modules/custom/materio_migrate/src/Plugin/migrate/source/D7NodeBreveI18n.php +++ b/web/modules/custom/materio_migrate/src/Plugin/migrate/source/D7NodeBreveI18n.php @@ -27,8 +27,6 @@ class D7NodeBreveI18n extends FieldableEntity { 'source', 'uid', 'status', - 'created', - 'changed', ]) ->fields('n', [ 'nid', @@ -36,6 +34,7 @@ class D7NodeBreveI18n extends FieldableEntity { 'type', 'promote', 'sticky', + 'created', 'changed', ]) ->fields('nr', [ @@ -44,7 +43,7 @@ class D7NodeBreveI18n extends FieldableEntity { ]) ->condition('et.entity_type', 'node') ->condition('et.source', '', '<>') - ->orderBy('changed'); + ->orderBy('n.changed'); $query->addField('nr', 'uid', 'revision_uid'); @@ -55,12 +54,6 @@ class D7NodeBreveI18n extends FieldableEntity { $query->condition('n.type', $this->configuration['node_type']); } - $this->highwaterField = array( - 'name' => 'changed', - 'alias' => 'n', - 'type' => 'int', - ); - return $query; } diff --git a/web/modules/custom/materio_migrate/src/Plugin/migrate/source/D7NodeMateriau.php b/web/modules/custom/materio_migrate/src/Plugin/migrate/source/D7NodeMateriau.php index 4a11da2..f6cbba8 100644 --- a/web/modules/custom/materio_migrate/src/Plugin/migrate/source/D7NodeMateriau.php +++ b/web/modules/custom/materio_migrate/src/Plugin/migrate/source/D7NodeMateriau.php @@ -81,7 +81,7 @@ class D7NodeMateriau extends FieldableEntity { 'log', 'timestamp', ]) - ->orderBy('nid'); + ->orderBy('changed'); $query->addField('n', 'uid', 'node_uid'); $query->addField('nr', 'uid', 'revision_uid'); diff --git a/web/modules/custom/materio_migrate/src/Plugin/migrate/source/D7NodeMateriauI18n.php b/web/modules/custom/materio_migrate/src/Plugin/migrate/source/D7NodeMateriauI18n.php index 65af111..0010fda 100644 --- a/web/modules/custom/materio_migrate/src/Plugin/migrate/source/D7NodeMateriauI18n.php +++ b/web/modules/custom/materio_migrate/src/Plugin/migrate/source/D7NodeMateriauI18n.php @@ -27,8 +27,6 @@ class D7NodeMateriauI18n extends FieldableEntity { 'source', 'uid', 'status', - 'created', - 'changed', ]) ->fields('n', [ 'nid', @@ -36,13 +34,16 @@ class D7NodeMateriauI18n extends FieldableEntity { 'type', 'promote', 'sticky', + 'created', + 'changed', ]) ->fields('nr', [ 'log', 'timestamp', ]) ->condition('et.entity_type', 'node') - ->condition('et.source', '', '<>'); + ->condition('et.source', '', '<>') + ->orderBy('n.changed'); $query->addField('nr', 'uid', 'revision_uid');