Merge pull request #312 from magento-nord/develop

Data Migration Tool Release 2.1.7
magento · Jun 2, 2017 · 76d45af · 76d45af
2 parents 7fa859a + cf4040a
commit 76d45af
Show file tree

Hide file tree

Showing 21 changed files with 8,052 additions and 90 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+2.1.7
+=============
+* Added support for versions:
+
+   * Magento CE: 1.9.3.3, 2.1.7
+   * Magento EE: 1.14.3.3, 2.1.7
+
+* Fixed bugs:
+   * [Issue #283](https://github.com/magento/data-migration-tool/issues/283): Ignored attributes were not cleaned properly in the following extended attribute tables: `catalog_eav_attribute`, `customer_eav_attribute`
+   * [Issue #176](https://github.com/magento/data-migration-tool/issues/176): Ignored fields in the `map-eav.xml` file caused errors during migration if the table fields could not be NULL (set as NOT NULL)
+
 2.1.6
 =============
 * Added possibility to specify custom port for MySQL server connection

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "magento/data-migration-tool",
     "description": "Migration Tool",
-    "version": "2.1.6",
+    "version": "2.1.7",
     "require": {
         "symfony/console": "~2.3",
         "magento/framework": "~100.1",

diff --git a/etc/ce-to-ce/1.9.3.3/config.xml.dist b/etc/ce-to-ce/1.9.3.3/config.xml.dist
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="../../config.xsd">
+    <steps mode="settings">
+        <step title="Settings Step">
+            <integrity>Migration\Step\Settings\Integrity</integrity>
+            <data>Migration\Step\Settings\Data</data>
+        </step>
+        <step title="Stores Step">
+            <integrity>Migration\Step\Stores\Integrity</integrity>
+            <data>Migration\Step\Stores\Data</data>
+            <volume>Migration\Step\Stores\Volume</volume>
+        </step>
+    </steps>
+    <steps mode="data">
+        <step title="Data Integrity Step">
+            <integrity>Migration\Step\DataIntegrity\Integrity</integrity>
+        </step>
+        <step title="EAV Step">
+            <integrity>Migration\Step\Eav\Integrity</integrity>
+            <data>Migration\Step\Eav\Data</data>
+            <volume>Migration\Step\Eav\Volume</volume>
+        </step>
+        <step title="Customer Attributes Step">
+            <integrity>Migration\Step\Customer\Integrity</integrity>
+            <data>Migration\Step\Customer\Data</data>
+            <volume>Migration\Step\Customer\Volume</volume>
+        </step>
+        <step title="Map Step">
+            <integrity>Migration\Step\Map\Integrity</integrity>
+            <data>Migration\Step\Map\Data</data>
+            <volume>Migration\Step\Map\Volume</volume>
+        </step>
+        <step title="Url Rewrite Step">
+            <integrity>Migration\Step\UrlRewrite\Version191to2000</integrity>
+            <data>Migration\Step\UrlRewrite\Version191to2000</data>
+            <volume>Migration\Step\UrlRewrite\Version191to2000</volume>
+        </step>
+        <step title="Log Step">
+            <integrity>Migration\Step\Log\Integrity</integrity>
+            <data>Migration\Step\Log\Data</data>
+            <volume>Migration\Step\Log\Volume</volume>
+        </step>
+        <step title="Ratings Step">
+            <integrity>Migration\Step\Ratings\Integrity</integrity>
+            <data>Migration\Step\Ratings\Data</data>
+            <volume>Migration\Step\Ratings\Volume</volume>
+        </step>
+        <step title="ConfigurablePrices step">
+            <integrity>Migration\Step\ConfigurablePrices\Integrity</integrity>
+            <data>Migration\Step\ConfigurablePrices\Data</data>
+            <volume>Migration\Step\ConfigurablePrices\Volume</volume>
+        </step>
+        <step title="OrderGrids Step">
+            <integrity>Migration\Step\OrderGrids\Integrity</integrity>
+            <data>Migration\Step\OrderGrids\Data</data>
+            <volume>Migration\Step\OrderGrids\Volume</volume>
+        </step>
+        <step title="Tier Price Step">
+            <integrity>Migration\Step\TierPrice\Integrity</integrity>
+            <data>Migration\Step\TierPrice\Data</data>
+            <volume>Migration\Step\TierPrice\Volume</volume>
+        </step>
+        <step title="SalesIncrement Step">
+            <integrity>Migration\Step\SalesIncrement\Integrity</integrity>
+            <data>Migration\Step\SalesIncrement\Data</data>
+            <volume>Migration\Step\SalesIncrement\Volume</volume>
+        </step>
+        <step title="PostProcessing Step">
+            <data>Migration\Step\PostProcessing\Data</data>
+        </step>
+    </steps>
+    <steps mode="delta">
+        <step title="Customer Attributes Step">
+            <delta>Migration\Step\Customer\Delta</delta>
+            <volume>Migration\Step\Customer\Volume</volume>
+        </step>
+        <step title="Map Step">
+            <delta>Migration\Step\Map\Delta</delta>
+            <volume>Migration\Step\Map\Volume</volume>
+        </step>
+        <step title="Log Step">
+            <delta>Migration\Step\Log\Delta</delta>
+            <volume>Migration\Step\Log\Volume</volume>
+        </step>
+        <step title="OrderGrids Step">
+            <delta>Migration\Step\OrderGrids\Delta</delta>
+            <volume>Migration\Step\OrderGrids\Volume</volume>
+        </step>
+        <step title="SalesIncrement Step">
+            <delta>Migration\Step\SalesIncrement\Delta</delta>
+            <volume>Migration\Step\SalesIncrement\Volume</volume>
+        </step>
+    </steps>
+    <source>
+        <database host="localhost" name="magento1" user="root"/>
+    </source>
+    <destination>
+        <database host="localhost" name="magento2" user="root"/>
+    </destination>
+    <options>
+        <map_file>etc/ce-to-ce/1.9.3.3/map.xml.dist</map_file>
+        <eav_map_file>etc/ce-to-ce/map-eav.xml.dist</eav_map_file>
+        <eav_document_groups_file>etc/ce-to-ce/eav-document-groups.xml.dist</eav_document_groups_file>
+        <eav_attribute_groups_file>etc/ce-to-ce/eav-attribute-groups.xml.dist</eav_attribute_groups_file>
+        <log_map_file>etc/ce-to-ce/map-log.xml.dist</log_map_file>
+        <log_document_groups_file>etc/ce-to-ce/log-document-groups.xml.dist</log_document_groups_file>
+        <settings_map_file>etc/ce-to-ce/settings.xml.dist</settings_map_file>
+        <customer_map_file>etc/ce-to-ce/map-customer.xml.dist</customer_map_file>
+        <customer_document_groups_file>etc/ce-to-ce/customer-document-groups.xml.dist</customer_document_groups_file>
+        <customer_attribute_groups_file>etc/ce-to-ce/customer-attribute-groups.xml.dist</customer_attribute_groups_file>
+        <delta_document_groups_file>etc/ce-to-ce/deltalog.xml.dist</delta_document_groups_file>
+        <order_grids_document_groups_file>etc/ce-to-ce/order-grids-document-groups.xml.dist</order_grids_document_groups_file>
+        <map_document_groups>etc/ce-to-ce/map-document-groups.xml.dist</map_document_groups>
+        <class_map>etc/ce-to-ce/class-map.xml.dist</class_map>
+        <tier_price_map_file>etc/ce-to-ce/1.9.3.3/map-tier-price.xml.dist</tier_price_map_file>
+        <!--
+        In case bulk_size=0 it will be auto-detected for every document.
+        -->
+        <bulk_size>0</bulk_size>
+        <!--
+        Set direct_document_copy = 1 for better performance.
+        NOTE: 'source' and 'destination' databases MUST be placed on the same MySQL instance
+        and 'destination' user MUST be granted with 'SELECT' permissions on 'source' database
+         -->
+        <direct_document_copy>0</direct_document_copy>
+        <source_prefix />
+        <dest_prefix />
+        <auto_resolve_urlrewrite_duplicates>0</auto_resolve_urlrewrite_duplicates>
+        <log_file>migration.log</log_file>
+        <progress_bar_format>%percent%% [%bar%] Remaining Time: %remaining%</progress_bar_format>
+        <upgrade_customer_password_hash>1</upgrade_customer_password_hash>
+        <edition_migrate>ce-to-ce</edition_migrate>
+        <edition_number>1.9.3.3</edition_number>
+        <init_statements_source>SET NAMES utf8;</init_statements_source>
+        <init_statements_destination>SET NAMES utf8;</init_statements_destination>
+        <crypt_key />
+    </options>
+</config>
diff --git a/etc/ce-to-ce/1.9.3.3/map-tier-price.xml.dist b/etc/ce-to-ce/1.9.3.3/map-tier-price.xml.dist
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<map xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="../../map.xsd">
+    <source>
+        <field_rules>
+            <ignore>
+                <field>catalog_product_entity_group_price.is_percent</field>
+            </ignore>
+        </field_rules>
+    </source>
+    <destination/>
+</map>