Skip to content

Commit 7191f7c

Browse files
victor-v-radvictor-v-rad
authored
Merge pull request #810 from magento/2.3-develop
Data Migration Tool Release 2.3.5
2 parents d3493ed + 055ec6d commit 7191f7c

File tree

155 files changed

+12642
-4010
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+12642
-4010
lines changed

‎.github/CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ The Data Migration Tool development team will review all issues and contribution
2323
If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free). This will allow you to collaborate with the Data Migration Tool development team, fork the the tool project and send pull requests.
2424

2525
1. Search current [listed issues](https://github.com/magento/data-migration-tool/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
26-
2. Review the [Contributor License Agreement](https://magento.com/legaldocuments/mca) if this is your first time contributing.
26+
2. Review and sign the [Contributor License Agreement (CLA)](https://opensource.adobe.com/cla.html) if this is your first time contributing. You only need to sign the CLA once.
2727
3. Create and test your work.
2828
4. Fork the Data Migration Tool repository.
2929
5. Once your contribution is received the Data Migration Tool development team will review the contribution and collaborate with you as needed.

‎CHANGELOG.md

+24
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,27 @@
1+
2.3.5
2+
=============
3+
* Merge of EAV Structure of Magento 1 with Magento 2
4+
* Added support for versions:
5+
6+
* Magento Open Source: 2.3.5, 1.9.4.5
7+
* Magento Commerce: 2.3.5, 1.14.4.5
8+
9+
* Fixed bugs:
10+
11+
* Error `Base table or view not found` during migration from Open Source to Commerce
12+
* Recurring Profile attributes are migrated but Magento 2 does not support Recurring Payments anymore
13+
* Error of enterprise-tables not being present in opensource database
14+
* Trouble with password hashes
15+
* Add missed delta functionality to ConfigurablePrices Step
16+
* Keeping sequence product / sequence catalog category updated
17+
* Wildcard must represent zero or more character
18+
* Reducing the number of validate type calls while reading data from the map.xml file
19+
* Cannot migrate settings if settings.xml file is out of Data Migration Tool root directory
20+
* Volume check is run for index tables of catalog rule
21+
* Initializing the record transformer before the loop
22+
* [Issue #541](https://github.com/magento/data-migration-tool/issues/541): Don't migrate the attribute url_path from product entities
23+
* [Issue #791](https://github.com/magento/data-migration-tool/issues/791): Error during migration when use prefix for tables
24+
125
2.3.4
226
=============
327
* Added ability for Data Migration Tool to load group-xml files outside its own directory

‎composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "magento/data-migration-tool",
33
"description": "Migration Tool",
4-
"version": "2.3.4",
4+
"version": "2.3.5",
55
"require": {
66
"symfony/console": "~4.1.0||~4.2.0||~4.3.0||~4.4.0",
77
"magento/framework": "*",

‎etc/commerce-to-commerce/1.11.0.0/map.xml.dist

+18-41
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,6 @@
144144
<ignore>
145145
<document>catalog_category_anc_products_index_tmp</document>
146146
</ignore>
147-
<ignore>
148-
<document>catalog_category_flat_cl</document>
149-
</ignore>
150147
<ignore>
151148
<document>catalog_product_index*</document>
152149
</ignore>
@@ -156,9 +153,6 @@
156153
<ignore>
157154
<document>catalog_product_enabled_index</document>
158155
</ignore>
159-
<ignore>
160-
<document>catalog_product_flat_cl</document>
161-
</ignore>
162156
<ignore>
163157
<document>cataloginventory_stock_status</document>
164158
</ignore>
@@ -459,9 +453,6 @@
459453
<ignore>
460454
<document>catalog_category_flat*</document>
461455
</ignore>
462-
<ignore>
463-
<document>catalog_category_flat_store_*</document>
464-
</ignore>
465456
<ignore>
466457
<document>googleoptimizer_code</document>
467458
</ignore>
@@ -1234,21 +1225,21 @@
12341225
<field>catalog_category_entity_varchar.value</field>
12351226
<handler class="\Migration\Handler\SetValueAttributeCondition">
12361227
<param name="attributeCode" value="custom_design" />
1237-
<param name="value" value="null" />
1228+
<param name="value" value="NULL" />
12381229
</handler>
12391230
</transform>
12401231
<transform>
12411232
<field>catalog_product_entity_varchar.value</field>
12421233
<handler class="\Migration\Handler\SetValueAttributeCondition">
12431234
<param name="attributeCode" value="custom_design" />
1244-
<param name="value" value="null" />
1235+
<param name="value" value="NULL" />
12451236
</handler>
12461237
</transform>
12471238
<transform>
12481239
<field>catalog_category_entity_text.value</field>
12491240
<handler class="\Migration\Handler\SetValueAttributeCondition">
12501241
<param name="attributeCode" value="custom_layout_update" />
1251-
<param name="value" value="null" />
1242+
<param name="value" value="NULL" />
12521243
</handler>
12531244
</transform>
12541245
<transform>
@@ -1576,6 +1567,10 @@
15761567
<field>catalog_product_entity_text.value</field>
15771568
<handler class="\Migration\Handler\CleanMultiselect" />
15781569
</transform>
1570+
<transform>
1571+
<field>catalog_product_entity_varchar.value</field>
1572+
<handler class="\Migration\Handler\CleanMultiselect" />
1573+
</transform>
15791574
<transform>
15801575
<field>email_template.is_legacy</field>
15811576
<handler class="\Migration\Handler\SetValue">
@@ -2022,9 +2017,6 @@
20222017
<ignore>
20232018
<document>signifyd_case</document>
20242019
</ignore>
2025-
<ignore>
2026-
<document>catalog_product_index_price*</document>
2027-
</ignore>
20282020
<ignore>
20292021
<document>magento_acknowledged_bulk</document>
20302022
</ignore>
@@ -2209,7 +2201,7 @@
22092201
<document>sequence_order_*</document>
22102202
</ignore>
22112203
<ignore>
2212-
<document>sequence_shipment*</document>
2204+
<document>sequence_shipment_*</document>
22132205
</ignore>
22142206
<ignore>
22152207
<document>sequence_rma_item_*</document>
@@ -2355,9 +2347,6 @@
23552347
<ignore>
23562348
<document>captcha_log</document>
23572349
</ignore>
2358-
<ignore>
2359-
<document>catalog_product_index_group_price</document>
2360-
</ignore>
23612350
<ignore>
23622351
<document>catalogrule_customer_group</document>
23632352
</ignore>
@@ -2403,12 +2392,6 @@
24032392
<ignore>
24042393
<document>tax_order_aggregated_updated</document>
24052394
</ignore>
2406-
<ignore>
2407-
<document>catalog_product_index_price</document>
2408-
</ignore>
2409-
<ignore>
2410-
<document>catalog_product_index_price*</document>
2411-
</ignore>
24122395
<ignore>
24132396
<document>reporting_module_status</document>
24142397
</ignore>
@@ -2797,10 +2780,7 @@
27972780
<document>inventory_source_stock_link</document>
27982781
</ignore>
27992782
<ignore>
2800-
<document>inventory_stock</document>
2801-
</ignore>
2802-
<ignore>
2803-
<document>inventory_stock_*</document>
2783+
<document>inventory_stock*</document>
28042784
</ignore>
28052785
<ignore>
28062786
<document>inventory_geoname</document>
@@ -2826,6 +2806,15 @@
28262806
<ignore>
28272807
<document>yotpo_sync</document>
28282808
</ignore>
2809+
<ignore>
2810+
<document>yotpo_order_status_history</document>
2811+
</ignore>
2812+
<ignore>
2813+
<document>pagebuilder_template</document>
2814+
</ignore>
2815+
<ignore>
2816+
<document>email_coupon_attribute</document>
2817+
</ignore>
28292818
</document_rules>
28302819
<field_rules>
28312820
<transform>
@@ -3422,12 +3411,6 @@
34223411
<ignore>
34233412
<datatype>catalog_product_bundle_price_index.customer_group_id</datatype>
34243413
</ignore>
3425-
<ignore>
3426-
<datatype>catalog_product_index_price.customer_group_id</datatype>
3427-
</ignore>
3428-
<ignore>
3429-
<datatype>catalog_product_index_tier_price.customer_group_id</datatype>
3430-
</ignore>
34313414
<ignore>
34323415
<datatype>catalogrule_customer_group.customer_group_id</datatype>
34333416
</ignore>
@@ -3476,12 +3459,6 @@
34763459
<ignore>
34773460
<datatype>catalog_product_bundle_price_index.customer_group_id</datatype>
34783461
</ignore>
3479-
<ignore>
3480-
<datatype>catalog_product_index_price.customer_group_id</datatype>
3481-
</ignore>
3482-
<ignore>
3483-
<datatype>catalog_product_index_tier_price.customer_group_id</datatype>
3484-
</ignore>
34853462
<ignore>
34863463
<datatype>catalogrule_customer_group.customer_group_id</datatype>
34873464
</ignore>

‎etc/commerce-to-commerce/1.11.0.1/map.xml.dist

+18-41
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,6 @@
144144
<ignore>
145145
<document>catalog_category_anc_products_index_tmp</document>
146146
</ignore>
147-
<ignore>
148-
<document>catalog_category_flat_cl</document>
149-
</ignore>
150147
<ignore>
151148
<document>catalog_product_index*</document>
152149
</ignore>
@@ -156,9 +153,6 @@
156153
<ignore>
157154
<document>catalog_product_enabled_index</document>
158155
</ignore>
159-
<ignore>
160-
<document>catalog_product_flat_cl</document>
161-
</ignore>
162156
<ignore>
163157
<document>cataloginventory_stock_status</document>
164158
</ignore>
@@ -459,9 +453,6 @@
459453
<ignore>
460454
<document>catalog_category_flat*</document>
461455
</ignore>
462-
<ignore>
463-
<document>catalog_category_flat_store_*</document>
464-
</ignore>
465456
<ignore>
466457
<document>googleoptimizer_code</document>
467458
</ignore>
@@ -1234,21 +1225,21 @@
12341225
<field>catalog_category_entity_varchar.value</field>
12351226
<handler class="\Migration\Handler\SetValueAttributeCondition">
12361227
<param name="attributeCode" value="custom_design" />
1237-
<param name="value" value="null" />
1228+
<param name="value" value="NULL" />
12381229
</handler>
12391230
</transform>
12401231
<transform>
12411232
<field>catalog_product_entity_varchar.value</field>
12421233
<handler class="\Migration\Handler\SetValueAttributeCondition">
12431234
<param name="attributeCode" value="custom_design" />
1244-
<param name="value" value="null" />
1235+
<param name="value" value="NULL" />
12451236
</handler>
12461237
</transform>
12471238
<transform>
12481239
<field>catalog_category_entity_text.value</field>
12491240
<handler class="\Migration\Handler\SetValueAttributeCondition">
12501241
<param name="attributeCode" value="custom_layout_update" />
1251-
<param name="value" value="null" />
1242+
<param name="value" value="NULL" />
12521243
</handler>
12531244
</transform>
12541245
<transform>
@@ -1576,6 +1567,10 @@
15761567
<field>catalog_product_entity_text.value</field>
15771568
<handler class="\Migration\Handler\CleanMultiselect" />
15781569
</transform>
1570+
<transform>
1571+
<field>catalog_product_entity_varchar.value</field>
1572+
<handler class="\Migration\Handler\CleanMultiselect" />
1573+
</transform>
15791574
<transform>
15801575
<field>email_template.is_legacy</field>
15811576
<handler class="\Migration\Handler\SetValue">
@@ -2022,9 +2017,6 @@
20222017
<ignore>
20232018
<document>signifyd_case</document>
20242019
</ignore>
2025-
<ignore>
2026-
<document>catalog_product_index_price*</document>
2027-
</ignore>
20282020
<ignore>
20292021
<document>magento_acknowledged_bulk</document>
20302022
</ignore>
@@ -2209,7 +2201,7 @@
22092201
<document>sequence_order_*</document>
22102202
</ignore>
22112203
<ignore>
2212-
<document>sequence_shipment*</document>
2204+
<document>sequence_shipment_*</document>
22132205
</ignore>
22142206
<ignore>
22152207
<document>sequence_rma_item_*</document>
@@ -2355,9 +2347,6 @@
23552347
<ignore>
23562348
<document>captcha_log</document>
23572349
</ignore>
2358-
<ignore>
2359-
<document>catalog_product_index_group_price</document>
2360-
</ignore>
23612350
<ignore>
23622351
<document>catalogrule_customer_group</document>
23632352
</ignore>
@@ -2403,12 +2392,6 @@
24032392
<ignore>
24042393
<document>tax_order_aggregated_updated</document>
24052394
</ignore>
2406-
<ignore>
2407-
<document>catalog_product_index_price</document>
2408-
</ignore>
2409-
<ignore>
2410-
<document>catalog_product_index_price*</document>
2411-
</ignore>
24122395
<ignore>
24132396
<document>reporting_module_status</document>
24142397
</ignore>
@@ -2797,10 +2780,7 @@
27972780
<document>inventory_source_stock_link</document>
27982781
</ignore>
27992782
<ignore>
2800-
<document>inventory_stock</document>
2801-
</ignore>
2802-
<ignore>
2803-
<document>inventory_stock_*</document>
2783+
<document>inventory_stock*</document>
28042784
</ignore>
28052785
<ignore>
28062786
<document>inventory_geoname</document>
@@ -2826,6 +2806,15 @@
28262806
<ignore>
28272807
<document>yotpo_sync</document>
28282808
</ignore>
2809+
<ignore>
2810+
<document>yotpo_order_status_history</document>
2811+
</ignore>
2812+
<ignore>
2813+
<document>pagebuilder_template</document>
2814+
</ignore>
2815+
<ignore>
2816+
<document>email_coupon_attribute</document>
2817+
</ignore>
28292818
</document_rules>
28302819
<field_rules>
28312820
<transform>
@@ -3422,12 +3411,6 @@
34223411
<ignore>
34233412
<datatype>catalog_product_bundle_price_index.customer_group_id</datatype>
34243413
</ignore>
3425-
<ignore>
3426-
<datatype>catalog_product_index_price.customer_group_id</datatype>
3427-
</ignore>
3428-
<ignore>
3429-
<datatype>catalog_product_index_tier_price.customer_group_id</datatype>
3430-
</ignore>
34313414
<ignore>
34323415
<datatype>catalogrule_customer_group.customer_group_id</datatype>
34333416
</ignore>
@@ -3476,12 +3459,6 @@
34763459
<ignore>
34773460
<datatype>catalog_product_bundle_price_index.customer_group_id</datatype>
34783461
</ignore>
3479-
<ignore>
3480-
<datatype>catalog_product_index_price.customer_group_id</datatype>
3481-
</ignore>
3482-
<ignore>
3483-
<datatype>catalog_product_index_tier_price.customer_group_id</datatype>
3484-
</ignore>
34853462
<ignore>
34863463
<datatype>catalogrule_customer_group.customer_group_id</datatype>
34873464
</ignore>

0 commit comments

Comments
 (0)