Merge pull request #173 from magento-nord/develop

Data Migration Tool Release 2.1.2
magento · Oct 18, 2016 · 6a2426e · 6a2426e
2 parents edb4e0e + e951b77
commit 6a2426e
Show file tree

Hide file tree

Showing 153 changed files with 9,595 additions and 849 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+2.1.2
+=============
+* Added support for migration for the following versions:
+
+    * Magento CE version 1.9.3.0, 2.1.2
+    * Magento EE version 1.14.3.0, 2.1.2
+
+* Fixed bugs:
+    * CMS pages with custom layout were not fully functional after migration
+    * Some pages in the Admin Panel could not be displayed due to incorrect redirects
+    * [Issue #96](https://github.com/magento/data-migration-tool/issues/96): Incorrect UTF-8 character conversion (<code>?</code> appeared instead of symbols)
+    * Issues [#115](https://github.com/magento/data-migration-tool/issues/115), [#159](https://github.com/magento/data-migration-tool/issues/159), [#134](https://github.com/magento/data-migration-tool/issues/134): EAV attributes can now be fully ignored by specifying their entity types
+    * [Issue #161](https://github.com/magento/data-migration-tool/issues/161): The <code>advanced/modules_disable_output</code> keys are now ignored by using wildcards (instead of specifying their full names) in the configuration file
+
 2.1.1
 =============
 * Improvements in migration of Magento 1 CE stores upgraded to 1.6 and later versions from versions earlier than 1.6 version
@@ -58,4 +72,3 @@
     *   [Issue#46](https://github.com/magento/data-migration-tool-ce/issues/46) Improved URL rewrite validation
     *   [Issue#33](https://github.com/magento/data-migration-tool-ce/issues/33) Resolved issue that resulted in the `inet_ntop(): Invalid in_addr value` error
     *   [Issue#12](https://github.com/magento/data-migration-tool-ce/issues/12) Duplicate entries in the `catalogsearch_query` table are no longer migrated
-
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "magento/data-migration-tool",
     "description": "Migration Tool",
-    "version": "2.1.1",
+    "version": "2.1.2",
     "require": {
         "symfony/console": "~2.3",
         "magento/framework": "~100.1",

diff --git a/etc/ce-to-ce/1.6.0.0/config.xml.dist b/etc/ce-to-ce/1.6.0.0/config.xml.dist
@@ -69,7 +69,6 @@
             <volume>Migration\Step\SalesIncrement\Volume</volume>
         </step>
         <step title="PostProcessing Step">
-            <integrity>Migration\Step\PostProcessing\Integrity</integrity>
             <data>Migration\Step\PostProcessing\Data</data>
         </step>
     </steps>
@@ -134,6 +133,8 @@
         <upgrade_customer_password_hash>1</upgrade_customer_password_hash>
         <edition_migrate>ce-to-ce</edition_migrate>
         <edition_number>1.6.0.0</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.6.0.0/map.xml.dist b/etc/ce-to-ce/1.6.0.0/map.xml.dist
@@ -851,6 +851,7 @@
                 <field>cms_page.root_template</field>
                 <handler class="\Migration\Handler\Convert">
                     <param name="map" value="[one_column:1column;two_columns_left:2columns-left;two_columns_right:2columns-right;three_columns:3columns]" />
+                    <param name="defaultValue" value="1column" />
                 </handler>
             </transform>
             <transform>

diff --git a/etc/ce-to-ce/1.6.1.0/config.xml.dist b/etc/ce-to-ce/1.6.1.0/config.xml.dist
@@ -69,7 +69,6 @@
             <volume>Migration\Step\SalesIncrement\Volume</volume>
         </step>
         <step title="PostProcessing Step">
-            <integrity>Migration\Step\PostProcessing\Integrity</integrity>
             <data>Migration\Step\PostProcessing\Data</data>
         </step>
     </steps>
@@ -134,6 +133,8 @@
         <upgrade_customer_password_hash>1</upgrade_customer_password_hash>
         <edition_migrate>ce-to-ce</edition_migrate>
         <edition_number>1.6.1.0</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.6.1.0/map.xml.dist b/etc/ce-to-ce/1.6.1.0/map.xml.dist
@@ -848,6 +848,7 @@
                 <field>cms_page.root_template</field>
                 <handler class="\Migration\Handler\Convert">
                     <param name="map" value="[one_column:1column;two_columns_left:2columns-left;two_columns_right:2columns-right;three_columns:3columns]" />
+                    <param name="defaultValue" value="1column" />
                 </handler>
             </transform>
             <transform>

diff --git a/etc/ce-to-ce/1.6.2.0/config.xml.dist b/etc/ce-to-ce/1.6.2.0/config.xml.dist
@@ -69,7 +69,6 @@
             <volume>Migration\Step\SalesIncrement\Volume</volume>
         </step>
         <step title="PostProcessing Step">
-            <integrity>Migration\Step\PostProcessing\Integrity</integrity>
             <data>Migration\Step\PostProcessing\Data</data>
         </step>
     </steps>
@@ -134,6 +133,8 @@
         <upgrade_customer_password_hash>1</upgrade_customer_password_hash>
         <edition_migrate>ce-to-ce</edition_migrate>
         <edition_number>1.6.2.0</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.6.2.0/map.xml.dist b/etc/ce-to-ce/1.6.2.0/map.xml.dist
@@ -848,6 +848,7 @@
                 <field>cms_page.root_template</field>
                 <handler class="\Migration\Handler\Convert">
                     <param name="map" value="[one_column:1column;two_columns_left:2columns-left;two_columns_right:2columns-right;three_columns:3columns]" />
+                    <param name="defaultValue" value="1column" />
                 </handler>
             </transform>
             <transform>

diff --git a/etc/ce-to-ce/1.7.0.0/config.xml.dist b/etc/ce-to-ce/1.7.0.0/config.xml.dist
@@ -69,7 +69,6 @@
             <volume>Migration\Step\SalesIncrement\Volume</volume>
         </step>
         <step title="PostProcessing Step">
-            <integrity>Migration\Step\PostProcessing\Integrity</integrity>
             <data>Migration\Step\PostProcessing\Data</data>
         </step>
     </steps>
@@ -134,6 +133,8 @@
         <upgrade_customer_password_hash>1</upgrade_customer_password_hash>
         <edition_migrate>ce-to-ce</edition_migrate>
         <edition_number>1.7.0.0</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.7.0.0/map.xml.dist b/etc/ce-to-ce/1.7.0.0/map.xml.dist
@@ -857,6 +857,7 @@
                 <field>cms_page.root_template</field>
                 <handler class="\Migration\Handler\Convert">
                     <param name="map" value="[one_column:1column;two_columns_left:2columns-left;two_columns_right:2columns-right;three_columns:3columns]" />
+                    <param name="defaultValue" value="1column" />
                 </handler>
             </transform>
             <transform>

diff --git a/etc/ce-to-ce/1.7.0.1/config.xml.dist b/etc/ce-to-ce/1.7.0.1/config.xml.dist
@@ -69,7 +69,6 @@
             <volume>Migration\Step\SalesIncrement\Volume</volume>
         </step>
         <step title="PostProcessing Step">
-            <integrity>Migration\Step\PostProcessing\Integrity</integrity>
             <data>Migration\Step\PostProcessing\Data</data>
         </step>
     </steps>
@@ -134,6 +133,8 @@
         <upgrade_customer_password_hash>1</upgrade_customer_password_hash>
         <edition_migrate>ce-to-ce</edition_migrate>
         <edition_number>1.7.0.1</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.7.0.1/map.xml.dist b/etc/ce-to-ce/1.7.0.1/map.xml.dist
@@ -857,6 +857,7 @@
                 <field>cms_page.root_template</field>
                 <handler class="\Migration\Handler\Convert">
                     <param name="map" value="[one_column:1column;two_columns_left:2columns-left;two_columns_right:2columns-right;three_columns:3columns]" />
+                    <param name="defaultValue" value="1column" />
                 </handler>
             </transform>
             <transform>

diff --git a/etc/ce-to-ce/1.7.0.2/config.xml.dist b/etc/ce-to-ce/1.7.0.2/config.xml.dist
@@ -69,7 +69,6 @@
             <volume>Migration\Step\SalesIncrement\Volume</volume>
         </step>
         <step title="PostProcessing Step">
-            <integrity>Migration\Step\PostProcessing\Integrity</integrity>
             <data>Migration\Step\PostProcessing\Data</data>
         </step>
     </steps>
@@ -134,6 +133,8 @@
         <upgrade_customer_password_hash>1</upgrade_customer_password_hash>
         <edition_migrate>ce-to-ce</edition_migrate>
         <edition_number>1.7.0.2</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.7.0.2/map.xml.dist b/etc/ce-to-ce/1.7.0.2/map.xml.dist
@@ -857,6 +857,7 @@
                 <field>cms_page.root_template</field>
                 <handler class="\Migration\Handler\Convert">
                     <param name="map" value="[one_column:1column;two_columns_left:2columns-left;two_columns_right:2columns-right;three_columns:3columns]" />
+                    <param name="defaultValue" value="1column" />
                 </handler>
             </transform>
             <transform>

diff --git a/etc/ce-to-ce/1.8.0.0/config.xml.dist b/etc/ce-to-ce/1.8.0.0/config.xml.dist
@@ -69,7 +69,6 @@
             <volume>Migration\Step\SalesIncrement\Volume</volume>
         </step>
         <step title="PostProcessing Step">
-            <integrity>Migration\Step\PostProcessing\Integrity</integrity>
             <data>Migration\Step\PostProcessing\Data</data>
         </step>
     </steps>
@@ -134,6 +133,8 @@
         <upgrade_customer_password_hash>1</upgrade_customer_password_hash>
         <edition_migrate>ce-to-ce</edition_migrate>
         <edition_number>1.8.0.0</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.8.0.0/map.xml.dist b/etc/ce-to-ce/1.8.0.0/map.xml.dist
@@ -857,6 +857,7 @@
                 <field>cms_page.root_template</field>
                 <handler class="\Migration\Handler\Convert">
                     <param name="map" value="[one_column:1column;two_columns_left:2columns-left;two_columns_right:2columns-right;three_columns:3columns]" />
+                    <param name="defaultValue" value="1column" />
                 </handler>
             </transform>
             <transform>

diff --git a/etc/ce-to-ce/1.8.1.0/config.xml.dist b/etc/ce-to-ce/1.8.1.0/config.xml.dist
@@ -69,7 +69,6 @@
             <volume>Migration\Step\SalesIncrement\Volume</volume>
         </step>
         <step title="PostProcessing Step">
-            <integrity>Migration\Step\PostProcessing\Integrity</integrity>
             <data>Migration\Step\PostProcessing\Data</data>
         </step>
     </steps>
@@ -134,6 +133,8 @@
         <upgrade_customer_password_hash>1</upgrade_customer_password_hash>
         <edition_migrate>ce-to-ce</edition_migrate>
         <edition_number>1.8.1.0</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.8.1.0/map.xml.dist b/etc/ce-to-ce/1.8.1.0/map.xml.dist
@@ -854,6 +854,7 @@
                 <field>cms_page.root_template</field>
                 <handler class="\Migration\Handler\Convert">
                     <param name="map" value="[one_column:1column;two_columns_left:2columns-left;two_columns_right:2columns-right;three_columns:3columns]" />
+                    <param name="defaultValue" value="1column" />
                 </handler>
             </transform>
             <transform>

diff --git a/etc/ce-to-ce/1.9.0.0/config.xml.dist b/etc/ce-to-ce/1.9.0.0/config.xml.dist
@@ -69,7 +69,6 @@
             <volume>Migration\Step\SalesIncrement\Volume</volume>
         </step>
         <step title="PostProcessing Step">
-            <integrity>Migration\Step\PostProcessing\Integrity</integrity>
             <data>Migration\Step\PostProcessing\Data</data>
         </step>
     </steps>
@@ -134,6 +133,8 @@
         <upgrade_customer_password_hash>1</upgrade_customer_password_hash>
         <edition_migrate>ce-to-ce</edition_migrate>
         <edition_number>1.9.0.0</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.0.0/map.xml.dist b/etc/ce-to-ce/1.9.0.0/map.xml.dist
@@ -857,6 +857,7 @@
                 <field>cms_page.root_template</field>
                 <handler class="\Migration\Handler\Convert">
                     <param name="map" value="[one_column:1column;two_columns_left:2columns-left;two_columns_right:2columns-right;three_columns:3columns]" />
+                    <param name="defaultValue" value="1column" />
                 </handler>
             </transform>
             <transform>

diff --git a/etc/ce-to-ce/1.9.0.1/config.xml.dist b/etc/ce-to-ce/1.9.0.1/config.xml.dist
@@ -69,7 +69,6 @@
             <volume>Migration\Step\SalesIncrement\Volume</volume>
         </step>
         <step title="PostProcessing Step">
-            <integrity>Migration\Step\PostProcessing\Integrity</integrity>
             <data>Migration\Step\PostProcessing\Data</data>
         </step>
     </steps>
@@ -134,6 +133,8 @@
         <upgrade_customer_password_hash>1</upgrade_customer_password_hash>
         <edition_migrate>ce-to-ce</edition_migrate>
         <edition_number>1.9.0.1</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.0.1/map.xml.dist b/etc/ce-to-ce/1.9.0.1/map.xml.dist
@@ -857,6 +857,7 @@
                 <field>cms_page.root_template</field>
                 <handler class="\Migration\Handler\Convert">
                     <param name="map" value="[one_column:1column;two_columns_left:2columns-left;two_columns_right:2columns-right;three_columns:3columns]" />
+                    <param name="defaultValue" value="1column" />
                 </handler>
             </transform>
             <transform>

diff --git a/etc/ce-to-ce/1.9.1.0/config.xml.dist b/etc/ce-to-ce/1.9.1.0/config.xml.dist
@@ -69,7 +69,6 @@
             <volume>Migration\Step\SalesIncrement\Volume</volume>
         </step>
         <step title="PostProcessing Step">
-            <integrity>Migration\Step\PostProcessing\Integrity</integrity>
             <data>Migration\Step\PostProcessing\Data</data>
         </step>
     </steps>
@@ -134,6 +133,8 @@
         <upgrade_customer_password_hash>1</upgrade_customer_password_hash>
         <edition_migrate>ce-to-ce</edition_migrate>
         <edition_number>1.9.1.0</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.1.0/map.xml.dist b/etc/ce-to-ce/1.9.1.0/map.xml.dist
@@ -857,6 +857,7 @@
                 <field>cms_page.root_template</field>
                 <handler class="\Migration\Handler\Convert">
                     <param name="map" value="[one_column:1column;two_columns_left:2columns-left;two_columns_right:2columns-right;three_columns:3columns]" />
+                    <param name="defaultValue" value="1column" />
                 </handler>
             </transform>
             <transform>

diff --git a/etc/ce-to-ce/1.9.1.1/config.xml.dist b/etc/ce-to-ce/1.9.1.1/config.xml.dist
@@ -69,7 +69,6 @@
             <volume>Migration\Step\SalesIncrement\Volume</volume>
         </step>
         <step title="PostProcessing Step">
-            <integrity>Migration\Step\PostProcessing\Integrity</integrity>
             <data>Migration\Step\PostProcessing\Data</data>
         </step>
     </steps>
@@ -134,6 +133,8 @@
         <upgrade_customer_password_hash>1</upgrade_customer_password_hash>
         <edition_migrate>ce-to-ce</edition_migrate>
         <edition_number>1.9.1.1</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.1.1/map.xml.dist b/etc/ce-to-ce/1.9.1.1/map.xml.dist
@@ -857,6 +857,7 @@
                 <field>cms_page.root_template</field>
                 <handler class="\Migration\Handler\Convert">
                     <param name="map" value="[one_column:1column;two_columns_left:2columns-left;two_columns_right:2columns-right;three_columns:3columns]" />
+                    <param name="defaultValue" value="1column" />
                 </handler>
             </transform>
             <transform>

diff --git a/etc/ce-to-ce/1.9.2.0/config.xml.dist b/etc/ce-to-ce/1.9.2.0/config.xml.dist
@@ -69,7 +69,6 @@
             <volume>Migration\Step\SalesIncrement\Volume</volume>
         </step>
         <step title="PostProcessing Step">
-            <integrity>Migration\Step\PostProcessing\Integrity</integrity>
             <data>Migration\Step\PostProcessing\Data</data>
         </step>
     </steps>
@@ -134,6 +133,8 @@
         <upgrade_customer_password_hash>1</upgrade_customer_password_hash>
         <edition_migrate>ce-to-ce</edition_migrate>
         <edition_number>1.9.2.0</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.2.0/map.xml.dist b/etc/ce-to-ce/1.9.2.0/map.xml.dist
@@ -857,6 +857,7 @@
                 <field>cms_page.root_template</field>
                 <handler class="\Migration\Handler\Convert">
                     <param name="map" value="[one_column:1column;two_columns_left:2columns-left;two_columns_right:2columns-right;three_columns:3columns]" />
+                    <param name="defaultValue" value="1column" />
                 </handler>
             </transform>
             <transform>

diff --git a/etc/ce-to-ce/1.9.2.1/config.xml.dist b/etc/ce-to-ce/1.9.2.1/config.xml.dist
@@ -69,7 +69,6 @@
             <volume>Migration\Step\SalesIncrement\Volume</volume>
         </step>
         <step title="PostProcessing Step">
-            <integrity>Migration\Step\PostProcessing\Integrity</integrity>
             <data>Migration\Step\PostProcessing\Data</data>
         </step>
     </steps>
@@ -134,6 +133,8 @@
         <upgrade_customer_password_hash>1</upgrade_customer_password_hash>
         <edition_migrate>ce-to-ce</edition_migrate>
         <edition_number>1.9.2.1</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.2.1/map.xml.dist b/etc/ce-to-ce/1.9.2.1/map.xml.dist
@@ -857,6 +857,7 @@
                 <field>cms_page.root_template</field>
                 <handler class="\Migration\Handler\Convert">
                     <param name="map" value="[one_column:1column;two_columns_left:2columns-left;two_columns_right:2columns-right;three_columns:3columns]" />
+                    <param name="defaultValue" value="1column" />
                 </handler>
             </transform>
             <transform>

diff --git a/etc/ce-to-ce/1.9.2.2/config.xml.dist b/etc/ce-to-ce/1.9.2.2/config.xml.dist
@@ -69,7 +69,6 @@
             <volume>Migration\Step\SalesIncrement\Volume</volume>
         </step>
         <step title="PostProcessing Step">
-            <integrity>Migration\Step\PostProcessing\Integrity</integrity>
             <data>Migration\Step\PostProcessing\Data</data>
         </step>
     </steps>
@@ -134,6 +133,8 @@
         <upgrade_customer_password_hash>1</upgrade_customer_password_hash>
         <edition_migrate>ce-to-ce</edition_migrate>
         <edition_number>1.9.2.2</edition_number>
+        <init_statements_source>SET NAMES utf8;</init_statements_source>
+        <init_statements_destination>SET NAMES utf8;</init_statements_destination>
         <crypt_key />
     </options>
 </config>