Merge pull request #271 from magento-nord/develop

Data Migration Tool Release 2.1.6
magento · Apr 14, 2017 · 7fa859a · 7fa859a
2 parents ad110a7 + 2f6b723
commit 7fa859a
Show file tree

Hide file tree

Showing 45 changed files with 823 additions and 342 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+2.1.6
+=============
+* Added possibility to specify custom port for MySQL server connection
+* Added support for versions:
+
+   * Magento CE: 2.1.6
+   * Magento EE: 2.1.6
+
+* Fixed bugs:
+   * Unable to save Customer's custom attribute value if the attribute has been created after migration
+   * An error occurred during the TierPrice migration step if the product had both Tier and Group Prices and the quantity of a product in Tier Price was 1
+   * Issues [#207](https://github.com/magento/data-migration-tool/issues/207), [#264](https://github.com/magento/data-migration-tool/issues/264): Customer Segments with product attributes in conditions caused Store Front to be inoperative
+   * [Issue #212](https://github.com/magento/data-migration-tool/issues/212): When some system attributes had not been included in a product attribute set, they were checked and linked to such set instead of being added automatically. These system attributes are: category_ids, giftcard_type, price_type, shipment_type, sku_type, weight_type, swatch_image
+
 2.1.5
 =============
 * Updated copyright notice

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

diff --git a/etc/ce-to-ce/map-eav.xml.dist b/etc/ce-to-ce/map-eav.xml.dist
@@ -151,12 +151,6 @@
                     <param name="prefix" value="Migration_"/>
                 </handler>
             </transform>
-            <transform>
-                <field>eav_attribute_group.default_id</field>
-                <handler class="\Migration\Handler\SetValue">
-                    <param name="value" value="0"/>
-                </handler>
-            </transform>
             <transform>
                 <field>catalog_eav_attribute.apply_to</field>
                 <handler class="\Migration\Handler\EavAttribute\ConvertConfigurableAttribute"/>

diff --git a/etc/ce-to-ee/map-eav.xml.dist b/etc/ce-to-ee/map-eav.xml.dist
@@ -155,12 +155,6 @@
                     <param name="prefix" value="Migration_"/>
                 </handler>
             </transform>
-            <transform>
-                <field>eav_attribute_group.default_id</field>
-                <handler class="\Migration\Handler\SetValue">
-                    <param name="value" value="0"/>
-                </handler>
-            </transform>
             <ignore>
                 <field>catalog_eav_attribute.is_configurable</field>
             </ignore>

diff --git a/etc/config.xsd b/etc/config.xsd
@@ -72,6 +72,7 @@
     <xs:complexType name="resourceTypeDatabase">
         <xs:attribute name="name" type="xs:string" use="required"/>
         <xs:attribute name="host" type="xs:string" use="required"/>
+        <xs:attribute name="port" type="xs:string" use="optional"/>
         <xs:attribute name="user" type="xs:string" use="required"/>
         <xs:attribute name="password" type="xs:string" use="optional"/>
     </xs:complexType>

diff --git a/etc/ee-to-ee/1.11.0.0/map.xml.dist b/etc/ee-to-ee/1.11.0.0/map.xml.dist
@@ -1404,7 +1404,9 @@
             </transform>
             <transform>
                 <field>enterprise_customersegment_segment.condition_sql</field>
-                <handler class="Migration\Handler\Rule\CustomerSegmentConditionSql"/>
+                <handler class="\Migration\Handler\SetValue">
+                    <param name="value" value="" />
+                </handler>
             </transform>
             <transform>
                 <field>sales_flat_order_item.weee_tax_applied</field>

diff --git a/etc/ee-to-ee/1.11.0.1/map.xml.dist b/etc/ee-to-ee/1.11.0.1/map.xml.dist
@@ -1404,7 +1404,9 @@
             </transform>
             <transform>
                 <field>enterprise_customersegment_segment.condition_sql</field>
-                <handler class="Migration\Handler\Rule\CustomerSegmentConditionSql"/>
+                <handler class="\Migration\Handler\SetValue">
+                    <param name="value" value="" />
+                </handler>
             </transform>
             <transform>
                 <field>sales_flat_order_item.weee_tax_applied</field>

diff --git a/etc/ee-to-ee/1.11.0.2/map.xml.dist b/etc/ee-to-ee/1.11.0.2/map.xml.dist
@@ -1404,7 +1404,9 @@
             </transform>
             <transform>
                 <field>enterprise_customersegment_segment.condition_sql</field>
-                <handler class="Migration\Handler\Rule\CustomerSegmentConditionSql"/>
+                <handler class="\Migration\Handler\SetValue">
+                    <param name="value" value="" />
+                </handler>
             </transform>
             <transform>
                 <field>sales_flat_order_item.weee_tax_applied</field>

diff --git a/etc/ee-to-ee/1.11.1.0/map.xml.dist b/etc/ee-to-ee/1.11.1.0/map.xml.dist
@@ -1404,7 +1404,9 @@
             </transform>
             <transform>
                 <field>enterprise_customersegment_segment.condition_sql</field>
-                <handler class="Migration\Handler\Rule\CustomerSegmentConditionSql"/>
+                <handler class="\Migration\Handler\SetValue">
+                    <param name="value" value="" />
+                </handler>
             </transform>
             <transform>
                 <field>sales_flat_order_item.weee_tax_applied</field>

diff --git a/etc/ee-to-ee/1.11.2.0/map.xml.dist b/etc/ee-to-ee/1.11.2.0/map.xml.dist
@@ -1404,7 +1404,9 @@
             </transform>
             <transform>
                 <field>enterprise_customersegment_segment.condition_sql</field>
-                <handler class="Migration\Handler\Rule\CustomerSegmentConditionSql"/>
+                <handler class="\Migration\Handler\SetValue">
+                    <param name="value" value="" />
+                </handler>
             </transform>
             <transform>
                 <field>sales_flat_order_item.weee_tax_applied</field>

diff --git a/etc/ee-to-ee/1.12.0.0/map.xml.dist b/etc/ee-to-ee/1.12.0.0/map.xml.dist
@@ -1374,7 +1374,9 @@
             </transform>
             <transform>
                 <field>enterprise_customersegment_segment.condition_sql</field>
-                <handler class="Migration\Handler\Rule\CustomerSegmentConditionSql"/>
+                <handler class="\Migration\Handler\SetValue">
+                    <param name="value" value="" />
+                </handler>
             </transform>
             <transform>
                 <field>sales_flat_order_item.weee_tax_applied</field>

diff --git a/etc/ee-to-ee/1.12.0.1/map.xml.dist b/etc/ee-to-ee/1.12.0.1/map.xml.dist
@@ -1374,7 +1374,9 @@
             </transform>
             <transform>
                 <field>enterprise_customersegment_segment.condition_sql</field>
-                <handler class="Migration\Handler\Rule\CustomerSegmentConditionSql"/>
+                <handler class="\Migration\Handler\SetValue">
+                    <param name="value" value="" />
+                </handler>
             </transform>
             <transform>
                 <field>sales_flat_order_item.weee_tax_applied</field>

diff --git a/etc/ee-to-ee/1.12.0.2/map.xml.dist b/etc/ee-to-ee/1.12.0.2/map.xml.dist
@@ -1374,7 +1374,9 @@
             </transform>
             <transform>
                 <field>enterprise_customersegment_segment.condition_sql</field>
-                <handler class="Migration\Handler\Rule\CustomerSegmentConditionSql"/>
+                <handler class="\Migration\Handler\SetValue">
+                    <param name="value" value="" />
+                </handler>
             </transform>
             <transform>
                 <field>sales_flat_order_item.weee_tax_applied</field>

diff --git a/etc/ee-to-ee/1.13.0.0/map.xml.dist b/etc/ee-to-ee/1.13.0.0/map.xml.dist
@@ -1358,7 +1358,9 @@
             </transform>
             <transform>
                 <field>enterprise_customersegment_segment.condition_sql</field>
-                <handler class="Migration\Handler\Rule\CustomerSegmentConditionSql"/>
+                <handler class="\Migration\Handler\SetValue">
+                    <param name="value" value="" />
+                </handler>
             </transform>
             <transform>
                 <field>sales_flat_order_item.weee_tax_applied</field>

diff --git a/etc/ee-to-ee/1.13.0.1/map.xml.dist b/etc/ee-to-ee/1.13.0.1/map.xml.dist
@@ -1358,7 +1358,9 @@
             </transform>
             <transform>
                 <field>enterprise_customersegment_segment.condition_sql</field>
-                <handler class="Migration\Handler\Rule\CustomerSegmentConditionSql"/>
+                <handler class="\Migration\Handler\SetValue">
+                    <param name="value" value="" />
+                </handler>
             </transform>
             <transform>
                 <field>sales_flat_order_item.weee_tax_applied</field>

diff --git a/etc/ee-to-ee/1.13.0.2/map.xml.dist b/etc/ee-to-ee/1.13.0.2/map.xml.dist
@@ -1358,7 +1358,9 @@
             </transform>
             <transform>
                 <field>enterprise_customersegment_segment.condition_sql</field>
-                <handler class="Migration\Handler\Rule\CustomerSegmentConditionSql"/>
+                <handler class="\Migration\Handler\SetValue">
+                    <param name="value" value="" />
+                </handler>
             </transform>
             <transform>
                 <field>sales_flat_order_item.weee_tax_applied</field>

diff --git a/etc/ee-to-ee/1.13.1.0/map.xml.dist b/etc/ee-to-ee/1.13.1.0/map.xml.dist
@@ -1364,7 +1364,9 @@
             </transform>
             <transform>
                 <field>enterprise_customersegment_segment.condition_sql</field>
-                <handler class="Migration\Handler\Rule\CustomerSegmentConditionSql"/>
+                <handler class="\Migration\Handler\SetValue">
+                    <param name="value" value="" />
+                </handler>
             </transform>
             <transform>
                 <field>sales_flat_order_item.weee_tax_applied</field>

diff --git a/etc/ee-to-ee/1.14.0.0/map.xml.dist b/etc/ee-to-ee/1.14.0.0/map.xml.dist
@@ -1364,7 +1364,9 @@
             </transform>
             <transform>
                 <field>enterprise_customersegment_segment.condition_sql</field>
-                <handler class="Migration\Handler\Rule\CustomerSegmentConditionSql"/>
+                <handler class="\Migration\Handler\SetValue">
+                    <param name="value" value="" />
+                </handler>
             </transform>
             <transform>
                 <field>sales_flat_order_item.weee_tax_applied</field>

diff --git a/etc/ee-to-ee/1.14.0.1/map.xml.dist b/etc/ee-to-ee/1.14.0.1/map.xml.dist
@@ -1364,7 +1364,9 @@
             </transform>
             <transform>
                 <field>enterprise_customersegment_segment.condition_sql</field>
-                <handler class="Migration\Handler\Rule\CustomerSegmentConditionSql"/>
+                <handler class="\Migration\Handler\SetValue">
+                    <param name="value" value="" />
+                </handler>
             </transform>
             <transform>
                 <field>sales_flat_order_item.weee_tax_applied</field>

diff --git a/etc/ee-to-ee/1.14.1.0/map.xml.dist b/etc/ee-to-ee/1.14.1.0/map.xml.dist
@@ -1372,7 +1372,9 @@
             </transform>
             <transform>
                 <field>enterprise_customersegment_segment.condition_sql</field>
-                <handler class="Migration\Handler\Rule\CustomerSegmentConditionSql"/>
+                <handler class="\Migration\Handler\SetValue">
+                    <param name="value" value="" />
+                </handler>
             </transform>
             <transform>
                 <field>sales_flat_order_item.weee_tax_applied</field>

diff --git a/etc/ee-to-ee/1.14.2.0/map.xml.dist b/etc/ee-to-ee/1.14.2.0/map.xml.dist
@@ -1372,7 +1372,9 @@
             </transform>
             <transform>
                 <field>enterprise_customersegment_segment.condition_sql</field>
-                <handler class="Migration\Handler\Rule\CustomerSegmentConditionSql"/>
+                <handler class="\Migration\Handler\SetValue">
+                    <param name="value" value="" />
+                </handler>
             </transform>
             <transform>
                 <field>sales_flat_order_item.weee_tax_applied</field>

diff --git a/etc/ee-to-ee/1.14.2.1/map.xml.dist b/etc/ee-to-ee/1.14.2.1/map.xml.dist
@@ -1372,7 +1372,9 @@
             </transform>
             <transform>
                 <field>enterprise_customersegment_segment.condition_sql</field>
-                <handler class="Migration\Handler\Rule\CustomerSegmentConditionSql"/>
+                <handler class="\Migration\Handler\SetValue">
+                    <param name="value" value="" />
+                </handler>
             </transform>
             <transform>
                 <field>sales_flat_order_item.weee_tax_applied</field>

diff --git a/etc/ee-to-ee/1.14.2.2/map.xml.dist b/etc/ee-to-ee/1.14.2.2/map.xml.dist
@@ -1378,7 +1378,9 @@
             </transform>
             <transform>
                 <field>enterprise_customersegment_segment.condition_sql</field>
-                <handler class="Migration\Handler\Rule\CustomerSegmentConditionSql"/>
+                <handler class="\Migration\Handler\SetValue">
+                    <param name="value" value="" />
+                </handler>
             </transform>
             <transform>
                 <field>sales_flat_order_item.weee_tax_applied</field>

diff --git a/etc/ee-to-ee/1.14.2.3/map.xml.dist b/etc/ee-to-ee/1.14.2.3/map.xml.dist
@@ -1378,7 +1378,9 @@
             </transform>
             <transform>
                 <field>enterprise_customersegment_segment.condition_sql</field>
-                <handler class="Migration\Handler\Rule\CustomerSegmentConditionSql"/>
+                <handler class="\Migration\Handler\SetValue">
+                    <param name="value" value="" />
+                </handler>
             </transform>
             <transform>
                 <field>sales_flat_order_item.weee_tax_applied</field>

diff --git a/etc/ee-to-ee/1.14.2.4/map.xml.dist b/etc/ee-to-ee/1.14.2.4/map.xml.dist
@@ -1378,7 +1378,9 @@
             </transform>
             <transform>
                 <field>enterprise_customersegment_segment.condition_sql</field>
-                <handler class="Migration\Handler\Rule\CustomerSegmentConditionSql"/>
+                <handler class="\Migration\Handler\SetValue">
+                    <param name="value" value="" />
+                </handler>
             </transform>
             <transform>
                 <field>sales_flat_order_item.weee_tax_applied</field>

diff --git a/etc/ee-to-ee/1.14.3.0/map.xml.dist b/etc/ee-to-ee/1.14.3.0/map.xml.dist
@@ -1381,7 +1381,9 @@
             </transform>
             <transform>
                 <field>enterprise_customersegment_segment.condition_sql</field>
-                <handler class="Migration\Handler\Rule\CustomerSegmentConditionSql"/>
+                <handler class="\Migration\Handler\SetValue">
+                    <param name="value" value="" />
+                </handler>
             </transform>
             <transform>
                 <field>sales_flat_order_item.weee_tax_applied</field>

diff --git a/etc/ee-to-ee/1.14.3.1/map.xml.dist b/etc/ee-to-ee/1.14.3.1/map.xml.dist
@@ -1381,7 +1381,9 @@
             </transform>
             <transform>
                 <field>enterprise_customersegment_segment.condition_sql</field>
-                <handler class="Migration\Handler\Rule\CustomerSegmentConditionSql"/>
+                <handler class="\Migration\Handler\SetValue">
+                    <param name="value" value="" />
+                </handler>
             </transform>
             <transform>
                 <field>sales_flat_order_item.weee_tax_applied</field>

diff --git a/etc/ee-to-ee/1.14.3.2/map.xml.dist b/etc/ee-to-ee/1.14.3.2/map.xml.dist
@@ -1381,7 +1381,9 @@
             </transform>
             <transform>
                 <field>enterprise_customersegment_segment.condition_sql</field>
-                <handler class="Migration\Handler\Rule\CustomerSegmentConditionSql"/>
+                <handler class="\Migration\Handler\SetValue">
+                    <param name="value" value="" />
+                </handler>
             </transform>
             <transform>
                 <field>sales_flat_order_item.weee_tax_applied</field>

diff --git a/etc/ee-to-ee/map-eav.xml.dist b/etc/ee-to-ee/map-eav.xml.dist
@@ -150,20 +150,12 @@
                     <param name="prefix" value="Migration_"/>
                 </handler>
             </transform>
-
             <transform>
                 <field>eav_attribute_group.attribute_group_name</field>
                 <handler class="\Migration\Handler\AddPrefix">
                     <param name="prefix" value="Migration_"/>
                 </handler>
             </transform>
-            <transform>
-                <field>eav_attribute_group.default_id</field>
-                <handler class="\Migration\Handler\SetValue">
-                    <param name="value" value="0"/>
-                </handler>
-            </transform>
-
             <transform>
                 <field>enterprise_rma_item_eav_attribute.input_filter</field>
                 <handler class="\Migration\Handler\EavAttribute\ConvertModel"/>

diff --git a/src/Migration/Model/Eav/AttributeGroupNameToCodeMap.php b/src/Migration/Model/Eav/AttributeGroupNameToCodeMap.php
@@ -17,6 +17,7 @@ class AttributeGroupNameToCodeMap
         'General' => 'product-details',
         'Prices' => 'advanced-pricing',
         'Design' => 'design',
+        'Images' => 'image-management'
     ];
 
     /**