From 1b43ba0ef7ded68e8280fc0f08fac6324ce9da66 Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Sun, 27 Dec 2015 14:52:34 +0200 Subject: [PATCH 01/71] MAGETWO-47116: Integrity and volume check errors on the latest mainline --- etc/ce-to-ce/1.6.0.0/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/1.6.1.0/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/1.6.2.0/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/1.7.0.0/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/1.7.0.1/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/1.7.0.2/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/1.8.0.0/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/1.8.1.0/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/1.9.0.0/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/1.9.0.1/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/1.9.1.0/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/1.9.1.1/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/1.9.2.0/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/1.9.2.1/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/1.9.2.2/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/class-map.xml.dist | 2 +- 16 files changed, 226 insertions(+), 1 deletion(-) 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 index 91ab747a0..913c3fdbc 100644 --- a/etc/ce-to-ce/1.6.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.0.0/map.xml.dist @@ -1270,6 +1270,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1649,6 +1661,9 @@ weee_tax.state + + catalog_category_product.entity_id + 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 index c17a3ad43..720712e89 100644 --- a/etc/ce-to-ce/1.6.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.1.0/map.xml.dist @@ -1258,6 +1258,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1652,6 +1664,9 @@ weee_tax.state + + catalog_category_product.entity_id + 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 index 179d6ab32..5f6c25b7d 100644 --- a/etc/ce-to-ce/1.6.2.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.2.0/map.xml.dist @@ -1258,6 +1258,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1649,6 +1661,9 @@ weee_tax.state + + catalog_category_product.entity_id + 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 index fd4463f59..f8343f6a7 100644 --- a/etc/ce-to-ce/1.7.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.0/map.xml.dist @@ -1227,6 +1227,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1501,6 +1513,9 @@ weee_tax.state + + catalog_category_product.entity_id + 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 index fd4463f59..f8343f6a7 100644 --- a/etc/ce-to-ce/1.7.0.1/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.1/map.xml.dist @@ -1227,6 +1227,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1501,6 +1513,9 @@ weee_tax.state + + catalog_category_product.entity_id + 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 index fd4463f59..f8343f6a7 100644 --- a/etc/ce-to-ce/1.7.0.2/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.2/map.xml.dist @@ -1227,6 +1227,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1501,6 +1513,9 @@ weee_tax.state + + catalog_category_product.entity_id + 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 index 227fecb44..a9fde1fbf 100644 --- a/etc/ce-to-ce/1.8.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.8.0.0/map.xml.dist @@ -1227,6 +1227,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1479,6 +1491,9 @@ weee_tax.state + + catalog_category_product.entity_id + 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 index a4e815935..780114484 100644 --- a/etc/ce-to-ce/1.8.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.8.1.0/map.xml.dist @@ -1224,6 +1224,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1476,6 +1488,9 @@ weee_tax.state + + catalog_category_product.entity_id + 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 index d2316dd23..f50dd6bf0 100644 --- a/etc/ce-to-ce/1.9.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.0.0/map.xml.dist @@ -1227,6 +1227,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1485,6 +1497,9 @@ weee_tax.state + + catalog_category_product.entity_id + 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 index d2316dd23..f50dd6bf0 100644 --- a/etc/ce-to-ce/1.9.0.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.0.1/map.xml.dist @@ -1227,6 +1227,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1485,6 +1497,9 @@ weee_tax.state + + catalog_category_product.entity_id + 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 index 5e4dba6be..dfbcf4f88 100644 --- a/etc/ce-to-ce/1.9.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.1.0/map.xml.dist @@ -1209,6 +1209,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1467,6 +1479,9 @@ weee_tax.state + + catalog_category_product.entity_id + 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 index 5e4dba6be..dfbcf4f88 100644 --- a/etc/ce-to-ce/1.9.1.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.1.1/map.xml.dist @@ -1209,6 +1209,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1467,6 +1479,9 @@ weee_tax.state + + catalog_category_product.entity_id + 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 index 8ef7c3e04..9703b6b2b 100644 --- a/etc/ce-to-ce/1.9.2.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.0/map.xml.dist @@ -1223,6 +1223,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1487,6 +1499,9 @@ rating_option_vote.remote_ip_long + + catalog_category_product.entity_id + 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 index 8ef7c3e04..9703b6b2b 100644 --- a/etc/ce-to-ce/1.9.2.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.1/map.xml.dist @@ -1223,6 +1223,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1487,6 +1499,9 @@ rating_option_vote.remote_ip_long + + catalog_category_product.entity_id + diff --git a/etc/ce-to-ce/1.9.2.2/map.xml.dist b/etc/ce-to-ce/1.9.2.2/map.xml.dist index 7fdfdad56..84148bf46 100644 --- a/etc/ce-to-ce/1.9.2.2/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.2/map.xml.dist @@ -1229,6 +1229,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1493,6 +1505,9 @@ rating_option_vote.remote_ip_long + + catalog_category_product.entity_id + diff --git a/etc/ce-to-ce/class-map.xml.dist b/etc/ce-to-ce/class-map.xml.dist index b52b8cbb7..4fe88d49c 100644 --- a/etc/ce-to-ce/class-map.xml.dist +++ b/etc/ce-to-ce/class-map.xml.dist @@ -96,7 +96,7 @@ catalog/product_attribute_backend_media - Magento\Catalog\Model\Product\Attribute\Backend\Media + catalog/product_attribute_backend_msrp From 1dc9e39f26bc273f062868dd99cccbb5753037a7 Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Sun, 31 Jan 2016 17:18:30 +0200 Subject: [PATCH 02/71] MAGETWO-48594: Integrity check errors ce-to-ce 31/01/16 --- etc/ce-to-ce/1.6.0.0/map.xml.dist | 26 ++++++++++++++- etc/ce-to-ce/1.6.1.0/map.xml.dist | 41 ++++++++++++++++++++++- etc/ce-to-ce/1.6.2.0/map.xml.dist | 41 ++++++++++++++++++++++- etc/ce-to-ce/1.7.0.0/map.xml.dist | 41 ++++++++++++++++++++++- etc/ce-to-ce/1.7.0.1/map.xml.dist | 41 ++++++++++++++++++++++- etc/ce-to-ce/1.7.0.2/map.xml.dist | 41 ++++++++++++++++++++++- etc/ce-to-ce/1.8.0.0/map.xml.dist | 41 ++++++++++++++++++++++- etc/ce-to-ce/1.8.1.0/map.xml.dist | 41 ++++++++++++++++++++++- etc/ce-to-ce/1.9.0.0/map.xml.dist | 41 ++++++++++++++++++++++- etc/ce-to-ce/1.9.0.1/map.xml.dist | 41 ++++++++++++++++++++++- etc/ce-to-ce/1.9.1.0/map.xml.dist | 41 ++++++++++++++++++++++- etc/ce-to-ce/1.9.1.1/map.xml.dist | 41 ++++++++++++++++++++++- etc/ce-to-ce/1.9.2.0/map.xml.dist | 41 ++++++++++++++++++++++- etc/ce-to-ce/1.9.2.1/map.xml.dist | 41 ++++++++++++++++++++++- etc/ce-to-ce/1.9.2.2/map.xml.dist | 41 ++++++++++++++++++++++- etc/ce-to-ce/1.9.2.3/map.xml.dist | 54 +++++++++++++++++++++++++++++++ 16 files changed, 639 insertions(+), 15 deletions(-) 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 index 913c3fdbc..f0959e04c 100644 --- a/etc/ce-to-ce/1.6.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.0.0/map.xml.dist @@ -1065,6 +1065,15 @@ weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1390,6 +1399,12 @@ customer_grid_flat + + admin_user_session + + + password_reset_request_event + @@ -1655,6 +1670,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1662,7 +1680,13 @@ weee_tax.state - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url 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 index 720712e89..fb22289cd 100644 --- a/etc/ce-to-ce/1.6.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.1.0/map.xml.dist @@ -1047,12 +1047,36 @@ salesrule.website_ids + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1366,6 +1390,12 @@ customer_grid_flat + + admin_user_session + + + password_reset_request_event + @@ -1658,6 +1688,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1665,7 +1698,13 @@ weee_tax.state - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url 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 index 5f6c25b7d..876a48a56 100644 --- a/etc/ce-to-ce/1.6.2.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.2.0/map.xml.dist @@ -1047,12 +1047,36 @@ salesrule.website_ids + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1366,6 +1390,12 @@ customer_grid_flat + + admin_user_session + + + password_reset_request_event + @@ -1655,6 +1685,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1662,7 +1695,13 @@ weee_tax.state - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url 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 index f8343f6a7..7d6678436 100644 --- a/etc/ce-to-ce/1.7.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.0/map.xml.dist @@ -1016,12 +1016,36 @@ newsletter_template.template_text_preprocessed + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1293,6 +1317,12 @@ customer_grid_flat + + admin_user_session + + + password_reset_request_event + @@ -1507,6 +1537,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1514,7 +1547,13 @@ weee_tax.state - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url 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 index f8343f6a7..7d6678436 100644 --- a/etc/ce-to-ce/1.7.0.1/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.1/map.xml.dist @@ -1016,12 +1016,36 @@ newsletter_template.template_text_preprocessed + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1293,6 +1317,12 @@ customer_grid_flat + + admin_user_session + + + password_reset_request_event + @@ -1507,6 +1537,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1514,7 +1547,13 @@ weee_tax.state - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url 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 index f8343f6a7..7d6678436 100644 --- a/etc/ce-to-ce/1.7.0.2/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.2/map.xml.dist @@ -1016,12 +1016,36 @@ newsletter_template.template_text_preprocessed + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1293,6 +1317,12 @@ customer_grid_flat + + admin_user_session + + + password_reset_request_event + @@ -1507,6 +1537,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1514,7 +1547,13 @@ weee_tax.state - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url 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 index a9fde1fbf..bea8228f0 100644 --- a/etc/ce-to-ce/1.8.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.8.0.0/map.xml.dist @@ -1016,12 +1016,36 @@ newsletter_template.template_text_preprocessed + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1293,6 +1317,12 @@ customer_grid_flat + + admin_user_session + + + password_reset_request_event + @@ -1485,6 +1515,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1492,7 +1525,13 @@ weee_tax.state - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url 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 index 780114484..0b1210c0b 100644 --- a/etc/ce-to-ce/1.8.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.8.1.0/map.xml.dist @@ -1013,12 +1013,36 @@ newsletter_template.template_text_preprocessed + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1290,6 +1314,12 @@ customer_grid_flat + + admin_user_session + + + password_reset_request_event + @@ -1482,6 +1512,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1489,7 +1522,13 @@ weee_tax.state - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url 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 index f50dd6bf0..a9a85e5b7 100644 --- a/etc/ce-to-ce/1.9.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.0.0/map.xml.dist @@ -1016,12 +1016,36 @@ newsletter_template.template_text_preprocessed + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1299,6 +1323,12 @@ customer_grid_flat + + admin_user_session + + + password_reset_request_event + @@ -1491,6 +1521,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1498,7 +1531,13 @@ weee_tax.state - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url 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 index f50dd6bf0..a9a85e5b7 100644 --- a/etc/ce-to-ce/1.9.0.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.0.1/map.xml.dist @@ -1016,12 +1016,36 @@ newsletter_template.template_text_preprocessed + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1299,6 +1323,12 @@ customer_grid_flat + + admin_user_session + + + password_reset_request_event + @@ -1491,6 +1521,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1498,7 +1531,13 @@ weee_tax.state - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url 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 index dfbcf4f88..2dd252b77 100644 --- a/etc/ce-to-ce/1.9.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.1.0/map.xml.dist @@ -998,12 +998,36 @@ newsletter_template.template_text_preprocessed + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1281,6 +1305,12 @@ customer_grid_flat + + admin_user_session + + + password_reset_request_event + @@ -1473,6 +1503,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1480,7 +1513,13 @@ weee_tax.state - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url 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 index dfbcf4f88..2dd252b77 100644 --- a/etc/ce-to-ce/1.9.1.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.1.1/map.xml.dist @@ -998,12 +998,36 @@ newsletter_template.template_text_preprocessed + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1281,6 +1305,12 @@ customer_grid_flat + + admin_user_session + + + password_reset_request_event + @@ -1473,6 +1503,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1480,7 +1513,13 @@ weee_tax.state - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url 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 index 9703b6b2b..567d57ff4 100644 --- a/etc/ce-to-ce/1.9.2.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.0/map.xml.dist @@ -1006,6 +1006,21 @@ newsletter_template.template_text_preprocessed + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month @@ -1018,6 +1033,15 @@ rating_option_vote.remote_ip_long + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1295,6 +1319,12 @@ customer_grid_flat + + admin_user_session + + + password_reset_request_event + @@ -1487,6 +1517,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1500,7 +1533,13 @@ rating_option_vote.remote_ip_long - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url 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 index 9703b6b2b..567d57ff4 100644 --- a/etc/ce-to-ce/1.9.2.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.1/map.xml.dist @@ -1006,6 +1006,21 @@ newsletter_template.template_text_preprocessed + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month @@ -1018,6 +1033,15 @@ rating_option_vote.remote_ip_long + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1295,6 +1319,12 @@ customer_grid_flat + + admin_user_session + + + password_reset_request_event + @@ -1487,6 +1517,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1500,7 +1533,13 @@ rating_option_vote.remote_ip_long - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url diff --git a/etc/ce-to-ce/1.9.2.2/map.xml.dist b/etc/ce-to-ce/1.9.2.2/map.xml.dist index 84148bf46..ae476accf 100644 --- a/etc/ce-to-ce/1.9.2.2/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.2/map.xml.dist @@ -1012,6 +1012,21 @@ newsletter_template.template_text_preprocessed + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month @@ -1024,6 +1039,15 @@ rating_option_vote.remote_ip_long + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1301,6 +1325,12 @@ customer_grid_flat + + admin_user_session + + + password_reset_request_event + @@ -1493,6 +1523,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1506,7 +1539,13 @@ rating_option_vote.remote_ip_long - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url diff --git a/etc/ce-to-ce/1.9.2.3/map.xml.dist b/etc/ce-to-ce/1.9.2.3/map.xml.dist index 7fdfdad56..ae476accf 100644 --- a/etc/ce-to-ce/1.9.2.3/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.3/map.xml.dist @@ -1012,6 +1012,21 @@ newsletter_template.template_text_preprocessed + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month @@ -1024,6 +1039,15 @@ rating_option_vote.remote_ip_long + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1229,6 +1253,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1289,6 +1325,12 @@ customer_grid_flat + + admin_user_session + + + password_reset_request_event + @@ -1481,6 +1523,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1493,6 +1538,15 @@ rating_option_vote.remote_ip_long + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + From 047ca3e67cc66a36ea100f8f847134118a5b254f Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Mon, 4 Apr 2016 13:30:23 +0300 Subject: [PATCH 03/71] MAGETWO-51341: Fix Integrity check errors ce-to-ce --- etc/ce-to-ce/1.6.0.0/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.6.1.0/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.6.2.0/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.7.0.0/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.7.0.1/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.7.0.2/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.8.0.0/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.8.1.0/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.9.0.0/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.9.0.1/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.9.1.0/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.9.1.1/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.9.2.0/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.9.2.1/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.9.2.2/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.9.2.3/map.xml.dist | 13 ++++++ etc/ce-to-ce/map-customer.xml.dist | 9 ++++ src/Migration/Handler/Synonym.php | 72 ++++++++++++++++++++++++++++++ src/Migration/Step/Eav/Volume.php | 6 ++- 19 files changed, 294 insertions(+), 1 deletion(-) create mode 100644 src/Migration/Handler/Synonym.php 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 index f0959e04c..e1dd12940 100644 --- a/etc/ce-to-ce/1.6.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.0.0/map.xml.dist @@ -918,6 +918,10 @@ catalog_product_entity_media_gallery.value_id + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1059,6 +1063,9 @@ salesrule.website_ids + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1405,6 +1412,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + 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 index fb22289cd..837869e0b 100644 --- a/etc/ce-to-ce/1.6.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.1.0/map.xml.dist @@ -906,6 +906,10 @@ catalog_product_entity_media_gallery.value_id + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1062,6 +1066,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1396,6 +1403,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + 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 index 876a48a56..faa4f98e3 100644 --- a/etc/ce-to-ce/1.6.2.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.2.0/map.xml.dist @@ -906,6 +906,10 @@ catalog_product_entity_media_gallery.value_id + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1062,6 +1066,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1396,6 +1403,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + 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 index 7d6678436..df1419a55 100644 --- a/etc/ce-to-ce/1.7.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.0/map.xml.dist @@ -887,6 +887,10 @@ catalog_product_entity_media_gallery.value_id + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1031,6 +1035,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1323,6 +1330,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + 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 index 7d6678436..df1419a55 100644 --- a/etc/ce-to-ce/1.7.0.1/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.1/map.xml.dist @@ -887,6 +887,10 @@ catalog_product_entity_media_gallery.value_id + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1031,6 +1035,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1323,6 +1330,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + 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 index 7d6678436..df1419a55 100644 --- a/etc/ce-to-ce/1.7.0.2/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.2/map.xml.dist @@ -887,6 +887,10 @@ catalog_product_entity_media_gallery.value_id + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1031,6 +1035,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1323,6 +1330,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + 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 index bea8228f0..33784cda5 100644 --- a/etc/ce-to-ce/1.8.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.8.0.0/map.xml.dist @@ -887,6 +887,10 @@ catalog_product_entity_media_gallery.value_id + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1031,6 +1035,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1323,6 +1330,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + 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 index 0b1210c0b..6a1d684f5 100644 --- a/etc/ce-to-ce/1.8.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.8.1.0/map.xml.dist @@ -884,6 +884,10 @@ catalog_product_entity_media_gallery.value_id + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1028,6 +1032,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1320,6 +1327,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + 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 index a9a85e5b7..2bbb53af9 100644 --- a/etc/ce-to-ce/1.9.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.0.0/map.xml.dist @@ -887,6 +887,10 @@ catalog_product_entity_media_gallery.value_id + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1031,6 +1035,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1329,6 +1336,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + 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 index a9a85e5b7..2bbb53af9 100644 --- a/etc/ce-to-ce/1.9.0.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.0.1/map.xml.dist @@ -887,6 +887,10 @@ catalog_product_entity_media_gallery.value_id + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1031,6 +1035,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1329,6 +1336,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + 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 index 2dd252b77..76de72c3c 100644 --- a/etc/ce-to-ce/1.9.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.1.0/map.xml.dist @@ -869,6 +869,10 @@ catalog_product_entity_media_gallery.value_id + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1013,6 +1017,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1311,6 +1318,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + 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 index 2dd252b77..76de72c3c 100644 --- a/etc/ce-to-ce/1.9.1.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.1.1/map.xml.dist @@ -869,6 +869,10 @@ catalog_product_entity_media_gallery.value_id + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1013,6 +1017,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1311,6 +1318,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + 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 index 567d57ff4..1f18eeaa1 100644 --- a/etc/ce-to-ce/1.9.2.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.0/map.xml.dist @@ -877,6 +877,10 @@ sendfriend_log.ip + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1021,6 +1025,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1325,6 +1332,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + 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 index 567d57ff4..1f18eeaa1 100644 --- a/etc/ce-to-ce/1.9.2.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.1/map.xml.dist @@ -877,6 +877,10 @@ sendfriend_log.ip + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1021,6 +1025,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1325,6 +1332,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + diff --git a/etc/ce-to-ce/1.9.2.2/map.xml.dist b/etc/ce-to-ce/1.9.2.2/map.xml.dist index ae476accf..a8b7a5b6c 100644 --- a/etc/ce-to-ce/1.9.2.2/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.2/map.xml.dist @@ -883,6 +883,10 @@ sendfriend_log.ip + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1027,6 +1031,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1331,6 +1338,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + diff --git a/etc/ce-to-ce/1.9.2.3/map.xml.dist b/etc/ce-to-ce/1.9.2.3/map.xml.dist index ae476accf..a8b7a5b6c 100644 --- a/etc/ce-to-ce/1.9.2.3/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.3/map.xml.dist @@ -883,6 +883,10 @@ sendfriend_log.ip + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1027,6 +1031,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1331,6 +1338,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + diff --git a/etc/ce-to-ce/map-customer.xml.dist b/etc/ce-to-ce/map-customer.xml.dist index c1c002587..a46e609ab 100644 --- a/etc/ce-to-ce/map-customer.xml.dist +++ b/etc/ce-to-ce/map-customer.xml.dist @@ -156,6 +156,15 @@ customer_address_entity.vat_request_success + + customer_entity.failures_num + + + customer_entity.first_failure + + + customer_entity.lock_expires + diff --git a/src/Migration/Handler/Synonym.php b/src/Migration/Handler/Synonym.php new file mode 100644 index 000000000..fc2a9b581 --- /dev/null +++ b/src/Migration/Handler/Synonym.php @@ -0,0 +1,72 @@ +source = $source; + $this->destination = $destination; + } + + /** + * {@inheritdoc} + */ + public function handle(Record $recordToHandle, Record $oppositeRecord) + { + $this->validate($recordToHandle); + $synonyms = $recordToHandle->getValue($this->field); + $storeId = $recordToHandle->getValue('store_id'); + if (empty($synonyms)) { + return; + } + $synonyms .= sprintf('"%s",', $recordToHandle->getValue('query_text')); + $websiteId = $this->getWebsiteId($storeId); + $record = ['synonyms' => $synonyms, 'store_id' => $storeId, 'website_id' => $websiteId]; + $this->destination->saveRecords($this->synonymsTable, [$record]); + } + + /** + * @param $storeId + * @return array + */ + protected function getWebsiteId($storeId) + { + if (empty($this->storeWebsite[$storeId])) { + /** @var Mysql $adapter */ + $adapter = $this->source->getAdapter(); + $query = $adapter->getSelect()->from($this->source->addDocumentPrefix('core_store'), ['website_id']) + ->where('store_id = ?', $storeId); + $this->storeWebsite[$storeId] = $query->getAdapter()->fetchOne($query); + } + return $this->storeWebsite[$storeId]; + } +} diff --git a/src/Migration/Step/Eav/Volume.php b/src/Migration/Step/Eav/Volume.php index 207229434..b9df53142 100644 --- a/src/Migration/Step/Eav/Volume.php +++ b/src/Migration/Step/Eav/Volume.php @@ -128,7 +128,11 @@ protected function validateCatalogEavAttributes() { foreach ($this->helper->getDestinationRecords('catalog_eav_attribute') as $attribute) { foreach (['frontend_input_renderer'] as $field) { - if ($attribute[$field] !== null && !class_exists($attribute[$field])) { + if ($attribute[$field] !== null + // @Todo: remove this after MAGETWO-51403 completion + && $attribute[$field] != 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\BaseImage' + && !class_exists($attribute[$field] + )) { $this->errors[] = 'Incorrect value: '. $attribute[$field] . ' in: catalog_eav_attribute.' . $field . ' for attribute_id=' . $attribute['attribute_id']; From d60f838fbab0582c6cc3fc010248bcfa8441b0b1 Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Tue, 12 Apr 2016 16:28:59 +0300 Subject: [PATCH 04/71] MAGETWO-48596: Fix Integrity check errors ce-to-ee --- etc/ce-to-ce/1.6.0.0/config.xml.dist | 1 + etc/ce-to-ce/1.6.1.0/config.xml.dist | 1 + etc/ce-to-ce/1.6.2.0/config.xml.dist | 1 + etc/ce-to-ce/1.7.0.0/config.xml.dist | 1 + etc/ce-to-ce/1.7.0.1/config.xml.dist | 1 + etc/ce-to-ce/1.7.0.2/config.xml.dist | 1 + etc/ce-to-ce/1.8.0.0/config.xml.dist | 1 + etc/ce-to-ce/1.8.1.0/config.xml.dist | 1 + etc/ce-to-ce/1.9.0.0/config.xml.dist | 1 + etc/ce-to-ce/1.9.0.1/config.xml.dist | 1 + etc/ce-to-ce/1.9.1.0/config.xml.dist | 1 + etc/ce-to-ce/1.9.1.1/config.xml.dist | 1 + etc/ce-to-ce/1.9.2.0/config.xml.dist | 1 + etc/ce-to-ce/1.9.2.2/config.xml.dist | 1 + etc/ce-to-ce/1.9.2.3/config.xml.dist | 1 + etc/ce-to-ee/1.6.0.0/config.xml.dist | 1 + etc/ce-to-ee/1.6.0.0/map.xml.dist | 265 ++++++++++++++++ etc/ce-to-ee/1.6.1.0/config.xml.dist | 1 + etc/ce-to-ee/1.6.1.0/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/1.6.2.0/config.xml.dist | 1 + etc/ce-to-ee/1.6.2.0/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/1.7.0.0/config.xml.dist | 1 + etc/ce-to-ee/1.7.0.0/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/1.7.0.1/config.xml.dist | 1 + etc/ce-to-ee/1.7.0.1/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/1.7.0.2/config.xml.dist | 1 + etc/ce-to-ee/1.7.0.2/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/1.8.0.0/config.xml.dist | 1 + etc/ce-to-ee/1.8.0.0/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/1.8.1.0/config.xml.dist | 1 + etc/ce-to-ee/1.8.1.0/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/1.9.0.0/config.xml.dist | 1 + etc/ce-to-ee/1.9.0.0/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/1.9.0.1/config.xml.dist | 1 + etc/ce-to-ee/1.9.0.1/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/1.9.1.0/config.xml.dist | 1 + etc/ce-to-ee/1.9.1.0/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/1.9.1.1/config.xml.dist | 1 + etc/ce-to-ee/1.9.1.1/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/1.9.2.0/config.xml.dist | 1 + etc/ce-to-ee/1.9.2.0/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/1.9.2.1/config.xml.dist | 1 + etc/ce-to-ee/1.9.2.1/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/1.9.2.2/config.xml.dist | 1 + etc/ce-to-ee/1.9.2.2/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/1.9.2.3/config.xml.dist | 1 + etc/ce-to-ee/1.9.2.3/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/class-map.xml.dist | 2 +- etc/ce-to-ee/map-customer.xml.dist | 9 + etc/config.xsd | 1 + etc/ee-to-ee/1.11.0.0/config.xml.dist | 1 + etc/ee-to-ee/1.11.0.1/config.xml.dist | 1 + etc/ee-to-ee/1.11.0.2/config.xml.dist | 1 + etc/ee-to-ee/1.11.1.0/config.xml.dist | 1 + etc/ee-to-ee/1.11.2.0/config.xml.dist | 1 + etc/ee-to-ee/1.12.0.0/config.xml.dist | 1 + etc/ee-to-ee/1.12.0.1/config.xml.dist | 1 + etc/ee-to-ee/1.12.0.2/config.xml.dist | 1 + etc/ee-to-ee/1.13.0.0/config.xml.dist | 1 + etc/ee-to-ee/1.13.0.1/config.xml.dist | 1 + etc/ee-to-ee/1.13.0.2/config.xml.dist | 1 + etc/ee-to-ee/1.13.1.0/config.xml.dist | 1 + etc/ee-to-ee/1.14.0.0/config.xml.dist | 1 + etc/ee-to-ee/1.14.0.1/config.xml.dist | 1 + etc/ee-to-ee/1.14.1.0/config.xml.dist | 1 + etc/ee-to-ee/1.14.2.0/config.xml.dist | 1 + etc/ee-to-ee/1.14.2.1/config.xml.dist | 1 + etc/ee-to-ee/1.14.2.2/config.xml.dist | 1 + etc/ee-to-ee/1.14.2.3/config.xml.dist | 1 + etc/ee-to-ee/class-map.xml.dist | 2 +- etc/ee-to-ee/map-customer.xml.dist | 9 + src/Migration/Config.php | 6 + src/Migration/Handler/FieldCopy.php | 39 +++ src/Migration/Handler/Sequence.php | 55 ++++ src/Migration/ResourceModel/Adapter/Mysql.php | 29 +- src/Migration/ResourceModel/Destination.php | 14 +- src/Migration/ResourceModel/Source.php | 14 +- .../Step/ConfigurablePrices/Helper.php | 16 +- src/Migration/Step/TierPrice/Helper.php | 23 +- 79 files changed, 4982 insertions(+), 22 deletions(-) create mode 100644 src/Migration/Handler/FieldCopy.php create mode 100644 src/Migration/Handler/Sequence.php 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 index ad4113373..ed94c213b 100644 --- a/etc/ce-to-ce/1.6.0.0/config.xml.dist +++ b/etc/ce-to-ce/1.6.0.0/config.xml.dist @@ -123,6 +123,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce 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 index f53f88f0e..635716c19 100644 --- a/etc/ce-to-ce/1.6.1.0/config.xml.dist +++ b/etc/ce-to-ce/1.6.1.0/config.xml.dist @@ -123,6 +123,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce 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 index 92cbdf806..c18b0e5b7 100644 --- a/etc/ce-to-ce/1.6.2.0/config.xml.dist +++ b/etc/ce-to-ce/1.6.2.0/config.xml.dist @@ -123,6 +123,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce 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 index d9926c72d..af19b2a1e 100644 --- a/etc/ce-to-ce/1.7.0.0/config.xml.dist +++ b/etc/ce-to-ce/1.7.0.0/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce 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 index 5d3892148..20d7126fe 100644 --- a/etc/ce-to-ce/1.7.0.1/config.xml.dist +++ b/etc/ce-to-ce/1.7.0.1/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce 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 index 8d65379dc..f817f1590 100644 --- a/etc/ce-to-ce/1.7.0.2/config.xml.dist +++ b/etc/ce-to-ce/1.7.0.2/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce 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 index 35319daca..02d7a8cfa 100644 --- a/etc/ce-to-ce/1.8.0.0/config.xml.dist +++ b/etc/ce-to-ce/1.8.0.0/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce 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 index 1d6783266..79197db88 100644 --- a/etc/ce-to-ce/1.8.1.0/config.xml.dist +++ b/etc/ce-to-ce/1.8.1.0/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce 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 index 8efe0cd0e..7b98925a6 100644 --- a/etc/ce-to-ce/1.9.0.0/config.xml.dist +++ b/etc/ce-to-ce/1.9.0.0/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce 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 index 8e3b21e20..bbf7ad766 100644 --- a/etc/ce-to-ce/1.9.0.1/config.xml.dist +++ b/etc/ce-to-ce/1.9.0.1/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce 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 index fd5450e9a..97dd7ad69 100644 --- a/etc/ce-to-ce/1.9.1.0/config.xml.dist +++ b/etc/ce-to-ce/1.9.1.0/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce 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 index 31683c487..c0e906ba1 100644 --- a/etc/ce-to-ce/1.9.1.1/config.xml.dist +++ b/etc/ce-to-ce/1.9.1.1/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce 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 index 9df7e3aee..d077a2c36 100644 --- a/etc/ce-to-ce/1.9.2.0/config.xml.dist +++ b/etc/ce-to-ce/1.9.2.0/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce 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 index 227e2d970..9351e75ca 100644 --- a/etc/ce-to-ce/1.9.2.2/config.xml.dist +++ b/etc/ce-to-ce/1.9.2.2/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce diff --git a/etc/ce-to-ce/1.9.2.3/config.xml.dist b/etc/ce-to-ce/1.9.2.3/config.xml.dist index 83f372bad..d66acc3ad 100644 --- a/etc/ce-to-ce/1.9.2.3/config.xml.dist +++ b/etc/ce-to-ce/1.9.2.3/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce diff --git a/etc/ce-to-ee/1.6.0.0/config.xml.dist b/etc/ce-to-ee/1.6.0.0/config.xml.dist index 59211efc0..bbdecfbb8 100644 --- a/etc/ce-to-ee/1.6.0.0/config.xml.dist +++ b/etc/ce-to-ee/1.6.0.0/config.xml.dist @@ -123,6 +123,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.6.0.0/map.xml.dist b/etc/ce-to-ee/1.6.0.0/map.xml.dist index 650d1c57f..6cee280bf 100644 --- a/etc/ce-to-ee/1.6.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.6.0.0/map.xml.dist @@ -826,6 +826,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -930,6 +1006,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1071,6 +1183,9 @@ salesrule.website_ids + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1681,6 +1796,60 @@ visual_merchandiser_rule + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1748,6 +1917,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2606,6 +2811,66 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.6.1.0/config.xml.dist b/etc/ce-to-ee/1.6.1.0/config.xml.dist index 4d4e9e75a..b9b22509a 100644 --- a/etc/ce-to-ee/1.6.1.0/config.xml.dist +++ b/etc/ce-to-ee/1.6.1.0/config.xml.dist @@ -123,6 +123,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.6.1.0/map.xml.dist b/etc/ce-to-ee/1.6.1.0/map.xml.dist index 1322ce1a1..e0c8fb086 100644 --- a/etc/ce-to-ee/1.6.1.0/map.xml.dist +++ b/etc/ce-to-ee/1.6.1.0/map.xml.dist @@ -814,6 +814,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -918,6 +994,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1059,12 +1171,39 @@ salesrule.website_ids + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1657,6 +1796,60 @@ visual_merchandiser_rule + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1748,6 +1941,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2609,12 +2838,81 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/1.6.2.0/config.xml.dist b/etc/ce-to-ee/1.6.2.0/config.xml.dist index 00928df3e..524639b93 100644 --- a/etc/ce-to-ee/1.6.2.0/config.xml.dist +++ b/etc/ce-to-ee/1.6.2.0/config.xml.dist @@ -123,6 +123,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.6.2.0/map.xml.dist b/etc/ce-to-ee/1.6.2.0/map.xml.dist index 75400c63e..3c4826cee 100644 --- a/etc/ce-to-ee/1.6.2.0/map.xml.dist +++ b/etc/ce-to-ee/1.6.2.0/map.xml.dist @@ -814,6 +814,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -918,6 +994,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1059,12 +1171,39 @@ salesrule.website_ids + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1657,6 +1796,60 @@ visual_merchandiser_rule + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1748,6 +1941,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2606,12 +2835,81 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/1.7.0.0/config.xml.dist b/etc/ce-to-ee/1.7.0.0/config.xml.dist index 595443179..9bb85c4ac 100644 --- a/etc/ce-to-ee/1.7.0.0/config.xml.dist +++ b/etc/ce-to-ee/1.7.0.0/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.7.0.0/map.xml.dist b/etc/ce-to-ee/1.7.0.0/map.xml.dist index 6501a1ffc..8a7e41aac 100644 --- a/etc/ce-to-ee/1.7.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.7.0.0/map.xml.dist @@ -811,6 +811,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -887,6 +963,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1016,12 +1128,39 @@ newsletter_template.template_text_preprocessed + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1572,6 +1711,60 @@ visual_merchandiser_rule + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1657,6 +1850,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2413,12 +2642,81 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/1.7.0.1/config.xml.dist b/etc/ce-to-ee/1.7.0.1/config.xml.dist index 462d6c0ce..8c9283fd1 100644 --- a/etc/ce-to-ee/1.7.0.1/config.xml.dist +++ b/etc/ce-to-ee/1.7.0.1/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.7.0.1/map.xml.dist b/etc/ce-to-ee/1.7.0.1/map.xml.dist index 6501a1ffc..8a7e41aac 100644 --- a/etc/ce-to-ee/1.7.0.1/map.xml.dist +++ b/etc/ce-to-ee/1.7.0.1/map.xml.dist @@ -811,6 +811,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -887,6 +963,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1016,12 +1128,39 @@ newsletter_template.template_text_preprocessed + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1572,6 +1711,60 @@ visual_merchandiser_rule + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1657,6 +1850,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2413,12 +2642,81 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/1.7.0.2/config.xml.dist b/etc/ce-to-ee/1.7.0.2/config.xml.dist index 6fe38abb4..4176ab7f9 100644 --- a/etc/ce-to-ee/1.7.0.2/config.xml.dist +++ b/etc/ce-to-ee/1.7.0.2/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.7.0.2/map.xml.dist b/etc/ce-to-ee/1.7.0.2/map.xml.dist index 6501a1ffc..8a7e41aac 100644 --- a/etc/ce-to-ee/1.7.0.2/map.xml.dist +++ b/etc/ce-to-ee/1.7.0.2/map.xml.dist @@ -811,6 +811,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -887,6 +963,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1016,12 +1128,39 @@ newsletter_template.template_text_preprocessed + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1572,6 +1711,60 @@ visual_merchandiser_rule + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1657,6 +1850,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2413,12 +2642,81 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/1.8.0.0/config.xml.dist b/etc/ce-to-ee/1.8.0.0/config.xml.dist index 5cbe22c79..f944980b4 100644 --- a/etc/ce-to-ee/1.8.0.0/config.xml.dist +++ b/etc/ce-to-ee/1.8.0.0/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.8.0.0/map.xml.dist b/etc/ce-to-ee/1.8.0.0/map.xml.dist index 04e501943..96df2da70 100644 --- a/etc/ce-to-ee/1.8.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.8.0.0/map.xml.dist @@ -811,6 +811,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -887,6 +963,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1016,12 +1128,39 @@ newsletter_template.template_text_preprocessed + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1572,6 +1711,60 @@ visual_merchandiser_rule + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1650,6 +1843,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2391,12 +2620,81 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/1.8.1.0/config.xml.dist b/etc/ce-to-ee/1.8.1.0/config.xml.dist index 4cd128a41..b074fcef1 100644 --- a/etc/ce-to-ee/1.8.1.0/config.xml.dist +++ b/etc/ce-to-ee/1.8.1.0/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.8.1.0/map.xml.dist b/etc/ce-to-ee/1.8.1.0/map.xml.dist index a66496c62..3fff4ddb8 100644 --- a/etc/ce-to-ee/1.8.1.0/map.xml.dist +++ b/etc/ce-to-ee/1.8.1.0/map.xml.dist @@ -808,6 +808,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -884,6 +960,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1013,12 +1125,39 @@ newsletter_template.template_text_preprocessed + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1569,6 +1708,60 @@ visual_merchandiser_rule + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1647,6 +1840,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2388,12 +2617,81 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/1.9.0.0/config.xml.dist b/etc/ce-to-ee/1.9.0.0/config.xml.dist index 263651da4..4ef42ba83 100644 --- a/etc/ce-to-ee/1.9.0.0/config.xml.dist +++ b/etc/ce-to-ee/1.9.0.0/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.9.0.0/map.xml.dist b/etc/ce-to-ee/1.9.0.0/map.xml.dist index 234504f5b..fceeb5f35 100644 --- a/etc/ce-to-ee/1.9.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.9.0.0/map.xml.dist @@ -811,6 +811,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -887,6 +963,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1016,12 +1128,39 @@ newsletter_template.template_text_preprocessed + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1572,6 +1711,60 @@ visual_merchandiser_rule + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1650,6 +1843,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2391,12 +2620,81 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/1.9.0.1/config.xml.dist b/etc/ce-to-ee/1.9.0.1/config.xml.dist index 642dd725e..a072615c9 100644 --- a/etc/ce-to-ee/1.9.0.1/config.xml.dist +++ b/etc/ce-to-ee/1.9.0.1/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.9.0.1/map.xml.dist b/etc/ce-to-ee/1.9.0.1/map.xml.dist index 04e501943..96df2da70 100644 --- a/etc/ce-to-ee/1.9.0.1/map.xml.dist +++ b/etc/ce-to-ee/1.9.0.1/map.xml.dist @@ -811,6 +811,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -887,6 +963,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1016,12 +1128,39 @@ newsletter_template.template_text_preprocessed + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1572,6 +1711,60 @@ visual_merchandiser_rule + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1650,6 +1843,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2391,12 +2620,81 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/1.9.1.0/config.xml.dist b/etc/ce-to-ee/1.9.1.0/config.xml.dist index 298693b51..0398baf29 100644 --- a/etc/ce-to-ee/1.9.1.0/config.xml.dist +++ b/etc/ce-to-ee/1.9.1.0/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.9.1.0/map.xml.dist b/etc/ce-to-ee/1.9.1.0/map.xml.dist index c9c123327..8d88ecd3a 100644 --- a/etc/ce-to-ee/1.9.1.0/map.xml.dist +++ b/etc/ce-to-ee/1.9.1.0/map.xml.dist @@ -793,6 +793,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -869,6 +945,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -998,12 +1110,39 @@ newsletter_template.template_text_preprocessed + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1554,6 +1693,60 @@ visual_merchandiser_rule + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1632,6 +1825,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2373,12 +2602,81 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/1.9.1.1/config.xml.dist b/etc/ce-to-ee/1.9.1.1/config.xml.dist index 4e9b3367d..a4f65e1dc 100644 --- a/etc/ce-to-ee/1.9.1.1/config.xml.dist +++ b/etc/ce-to-ee/1.9.1.1/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.9.1.1/map.xml.dist b/etc/ce-to-ee/1.9.1.1/map.xml.dist index c9c123327..8d88ecd3a 100644 --- a/etc/ce-to-ee/1.9.1.1/map.xml.dist +++ b/etc/ce-to-ee/1.9.1.1/map.xml.dist @@ -793,6 +793,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -869,6 +945,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -998,12 +1110,39 @@ newsletter_template.template_text_preprocessed + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1554,6 +1693,60 @@ visual_merchandiser_rule + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1632,6 +1825,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2373,12 +2602,81 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/1.9.2.0/config.xml.dist b/etc/ce-to-ee/1.9.2.0/config.xml.dist index b4aec3c71..538a27b36 100644 --- a/etc/ce-to-ee/1.9.2.0/config.xml.dist +++ b/etc/ce-to-ee/1.9.2.0/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.9.2.0/map.xml.dist b/etc/ce-to-ee/1.9.2.0/map.xml.dist index 426217e83..45bfc0385 100644 --- a/etc/ce-to-ee/1.9.2.0/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.0/map.xml.dist @@ -793,6 +793,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -877,6 +953,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1006,6 +1118,24 @@ newsletter_template.template_text_preprocessed + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month @@ -1018,6 +1148,15 @@ rating_option_vote.remote_ip_long + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1574,6 +1713,60 @@ visual_merchandiser_rule + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1652,6 +1845,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2393,6 +2622,66 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2405,6 +2694,15 @@ rating_option_vote.remote_ip_long + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/1.9.2.1/config.xml.dist b/etc/ce-to-ee/1.9.2.1/config.xml.dist index d5b9dc035..eb3094e96 100644 --- a/etc/ce-to-ee/1.9.2.1/config.xml.dist +++ b/etc/ce-to-ee/1.9.2.1/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.9.2.1/map.xml.dist b/etc/ce-to-ee/1.9.2.1/map.xml.dist index 426217e83..45bfc0385 100644 --- a/etc/ce-to-ee/1.9.2.1/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.1/map.xml.dist @@ -793,6 +793,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -877,6 +953,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1006,6 +1118,24 @@ newsletter_template.template_text_preprocessed + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month @@ -1018,6 +1148,15 @@ rating_option_vote.remote_ip_long + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1574,6 +1713,60 @@ visual_merchandiser_rule + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1652,6 +1845,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2393,6 +2622,66 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2405,6 +2694,15 @@ rating_option_vote.remote_ip_long + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/1.9.2.2/config.xml.dist b/etc/ce-to-ee/1.9.2.2/config.xml.dist index 9edd0a7f6..1e058de8b 100644 --- a/etc/ce-to-ee/1.9.2.2/config.xml.dist +++ b/etc/ce-to-ee/1.9.2.2/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.9.2.2/map.xml.dist b/etc/ce-to-ee/1.9.2.2/map.xml.dist index 6f76735d4..73523879d 100644 --- a/etc/ce-to-ee/1.9.2.2/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.2/map.xml.dist @@ -799,6 +799,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -883,6 +959,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1012,6 +1124,24 @@ newsletter_template.template_text_preprocessed + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month @@ -1024,6 +1154,15 @@ rating_option_vote.remote_ip_long + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1580,6 +1719,60 @@ visual_merchandiser_rule + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1658,6 +1851,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2399,6 +2628,66 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2411,6 +2700,15 @@ rating_option_vote.remote_ip_long + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/1.9.2.3/config.xml.dist b/etc/ce-to-ee/1.9.2.3/config.xml.dist index c38f7e31f..f39df60e9 100644 --- a/etc/ce-to-ee/1.9.2.3/config.xml.dist +++ b/etc/ce-to-ee/1.9.2.3/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.9.2.3/map.xml.dist b/etc/ce-to-ee/1.9.2.3/map.xml.dist index 6f76735d4..73523879d 100644 --- a/etc/ce-to-ee/1.9.2.3/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.3/map.xml.dist @@ -799,6 +799,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -883,6 +959,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1012,6 +1124,24 @@ newsletter_template.template_text_preprocessed + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month @@ -1024,6 +1154,15 @@ rating_option_vote.remote_ip_long + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1580,6 +1719,60 @@ visual_merchandiser_rule + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1658,6 +1851,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2399,6 +2628,66 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2411,6 +2700,15 @@ rating_option_vote.remote_ip_long + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/class-map.xml.dist b/etc/ce-to-ee/class-map.xml.dist index 275a23cf7..4415db14a 100644 --- a/etc/ce-to-ee/class-map.xml.dist +++ b/etc/ce-to-ee/class-map.xml.dist @@ -96,7 +96,7 @@ catalog/product_attribute_backend_media - Magento\Catalog\Model\Product\Attribute\Backend\Media + catalog/product_attribute_backend_msrp diff --git a/etc/ce-to-ee/map-customer.xml.dist b/etc/ce-to-ee/map-customer.xml.dist index c1c002587..a46e609ab 100644 --- a/etc/ce-to-ee/map-customer.xml.dist +++ b/etc/ce-to-ee/map-customer.xml.dist @@ -156,6 +156,15 @@ customer_address_entity.vat_request_success + + customer_entity.failures_num + + + customer_entity.first_failure + + + customer_entity.lock_expires + diff --git a/etc/config.xsd b/etc/config.xsd index e0fffbf48..737e0586a 100644 --- a/etc/config.xsd +++ b/etc/config.xsd @@ -99,6 +99,7 @@ + diff --git a/etc/ee-to-ee/1.11.0.0/config.xml.dist b/etc/ee-to-ee/1.11.0.0/config.xml.dist index 547ac1553..35d36e533 100644 --- a/etc/ee-to-ee/1.11.0.0/config.xml.dist +++ b/etc/ee-to-ee/1.11.0.0/config.xml.dist @@ -143,6 +143,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.11.0.1/config.xml.dist b/etc/ee-to-ee/1.11.0.1/config.xml.dist index a95074b53..3eec0e89b 100644 --- a/etc/ee-to-ee/1.11.0.1/config.xml.dist +++ b/etc/ee-to-ee/1.11.0.1/config.xml.dist @@ -143,6 +143,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.11.0.2/config.xml.dist b/etc/ee-to-ee/1.11.0.2/config.xml.dist index 82d0820f0..b78572f50 100644 --- a/etc/ee-to-ee/1.11.0.2/config.xml.dist +++ b/etc/ee-to-ee/1.11.0.2/config.xml.dist @@ -143,6 +143,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.11.1.0/config.xml.dist b/etc/ee-to-ee/1.11.1.0/config.xml.dist index 632ea7212..07ca42f74 100644 --- a/etc/ee-to-ee/1.11.1.0/config.xml.dist +++ b/etc/ee-to-ee/1.11.1.0/config.xml.dist @@ -143,6 +143,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.11.2.0/config.xml.dist b/etc/ee-to-ee/1.11.2.0/config.xml.dist index d7e5dd26c..2c9544b07 100644 --- a/etc/ee-to-ee/1.11.2.0/config.xml.dist +++ b/etc/ee-to-ee/1.11.2.0/config.xml.dist @@ -143,6 +143,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.12.0.0/config.xml.dist b/etc/ee-to-ee/1.12.0.0/config.xml.dist index b03e6cca3..aa3d3a62f 100644 --- a/etc/ee-to-ee/1.12.0.0/config.xml.dist +++ b/etc/ee-to-ee/1.12.0.0/config.xml.dist @@ -148,6 +148,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.12.0.1/config.xml.dist b/etc/ee-to-ee/1.12.0.1/config.xml.dist index 06fb7bcdb..d4476e6d8 100644 --- a/etc/ee-to-ee/1.12.0.1/config.xml.dist +++ b/etc/ee-to-ee/1.12.0.1/config.xml.dist @@ -148,6 +148,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.12.0.2/config.xml.dist b/etc/ee-to-ee/1.12.0.2/config.xml.dist index 1580d133a..0bf228ee4 100644 --- a/etc/ee-to-ee/1.12.0.2/config.xml.dist +++ b/etc/ee-to-ee/1.12.0.2/config.xml.dist @@ -148,6 +148,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.13.0.0/config.xml.dist b/etc/ee-to-ee/1.13.0.0/config.xml.dist index 14c8b3bbf..efd8b45f8 100644 --- a/etc/ee-to-ee/1.13.0.0/config.xml.dist +++ b/etc/ee-to-ee/1.13.0.0/config.xml.dist @@ -148,6 +148,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.13.0.1/config.xml.dist b/etc/ee-to-ee/1.13.0.1/config.xml.dist index c75a9b06f..0fba6ee68 100644 --- a/etc/ee-to-ee/1.13.0.1/config.xml.dist +++ b/etc/ee-to-ee/1.13.0.1/config.xml.dist @@ -148,6 +148,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.13.0.2/config.xml.dist b/etc/ee-to-ee/1.13.0.2/config.xml.dist index f4fed390c..b4e97e0b9 100644 --- a/etc/ee-to-ee/1.13.0.2/config.xml.dist +++ b/etc/ee-to-ee/1.13.0.2/config.xml.dist @@ -148,6 +148,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.13.1.0/config.xml.dist b/etc/ee-to-ee/1.13.1.0/config.xml.dist index b61b91fdf..9d524c4e3 100644 --- a/etc/ee-to-ee/1.13.1.0/config.xml.dist +++ b/etc/ee-to-ee/1.13.1.0/config.xml.dist @@ -148,6 +148,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.14.0.0/config.xml.dist b/etc/ee-to-ee/1.14.0.0/config.xml.dist index c3e93740d..bf67ebf52 100644 --- a/etc/ee-to-ee/1.14.0.0/config.xml.dist +++ b/etc/ee-to-ee/1.14.0.0/config.xml.dist @@ -148,6 +148,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.14.0.1/config.xml.dist b/etc/ee-to-ee/1.14.0.1/config.xml.dist index 27472daa7..6e41ba1ba 100644 --- a/etc/ee-to-ee/1.14.0.1/config.xml.dist +++ b/etc/ee-to-ee/1.14.0.1/config.xml.dist @@ -148,6 +148,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.14.1.0/config.xml.dist b/etc/ee-to-ee/1.14.1.0/config.xml.dist index 9e2beb19c..79a15862d 100644 --- a/etc/ee-to-ee/1.14.1.0/config.xml.dist +++ b/etc/ee-to-ee/1.14.1.0/config.xml.dist @@ -156,6 +156,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.14.2.0/config.xml.dist b/etc/ee-to-ee/1.14.2.0/config.xml.dist index 9c2900fea..65f129796 100644 --- a/etc/ee-to-ee/1.14.2.0/config.xml.dist +++ b/etc/ee-to-ee/1.14.2.0/config.xml.dist @@ -156,6 +156,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.14.2.1/config.xml.dist b/etc/ee-to-ee/1.14.2.1/config.xml.dist index 23fc053a1..c38d16be2 100644 --- a/etc/ee-to-ee/1.14.2.1/config.xml.dist +++ b/etc/ee-to-ee/1.14.2.1/config.xml.dist @@ -156,6 +156,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.14.2.2/config.xml.dist b/etc/ee-to-ee/1.14.2.2/config.xml.dist index 76a5073c3..70ee4ba21 100644 --- a/etc/ee-to-ee/1.14.2.2/config.xml.dist +++ b/etc/ee-to-ee/1.14.2.2/config.xml.dist @@ -156,6 +156,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.14.2.3/config.xml.dist b/etc/ee-to-ee/1.14.2.3/config.xml.dist index 3ac4280ba..cb7f85b24 100644 --- a/etc/ee-to-ee/1.14.2.3/config.xml.dist +++ b/etc/ee-to-ee/1.14.2.3/config.xml.dist @@ -156,6 +156,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/class-map.xml.dist b/etc/ee-to-ee/class-map.xml.dist index 5ef188b88..8c30406e0 100644 --- a/etc/ee-to-ee/class-map.xml.dist +++ b/etc/ee-to-ee/class-map.xml.dist @@ -96,7 +96,7 @@ catalog/product_attribute_backend_media - Magento\Catalog\Model\Product\Attribute\Backend\Media + catalog/product_attribute_backend_msrp diff --git a/etc/ee-to-ee/map-customer.xml.dist b/etc/ee-to-ee/map-customer.xml.dist index c1c002587..a46e609ab 100644 --- a/etc/ee-to-ee/map-customer.xml.dist +++ b/etc/ee-to-ee/map-customer.xml.dist @@ -156,6 +156,15 @@ customer_address_entity.vat_request_success + + customer_entity.failures_num + + + customer_entity.first_failure + + + customer_entity.lock_expires + diff --git a/src/Migration/Config.php b/src/Migration/Config.php index af6772a32..d3705d5cd 100644 --- a/src/Migration/Config.php +++ b/src/Migration/Config.php @@ -16,6 +16,12 @@ class Config const CONFIGURATION_SCHEMA = 'config.xsd'; + const EDITION_MIGRATE_CE_TO_CE = 'ce-to-ce'; + + const EDITION_MIGRATE_CE_TO_EE = 'ce-to-ee'; + + const EDITION_MIGRATE_EE_TO_EE = 'ee-to-ee'; + /** * @var \DOMXPath */ diff --git a/src/Migration/Handler/FieldCopy.php b/src/Migration/Handler/FieldCopy.php new file mode 100644 index 000000000..a7c12c0a6 --- /dev/null +++ b/src/Migration/Handler/FieldCopy.php @@ -0,0 +1,39 @@ +fieldCopy = $fieldCopy; + } + + /** + * {@inheritdoc} + */ + public function handle(Record $recordToHandle, Record $oppositeRecord) + { + $this->validate($recordToHandle); + $fieldCopyValue = $recordToHandle->getValue($this->fieldCopy); + if ($fieldCopyValue) { + $recordToHandle->setValue($this->field, $fieldCopyValue); + } + } +} diff --git a/src/Migration/Handler/Sequence.php b/src/Migration/Handler/Sequence.php new file mode 100644 index 000000000..54dcdc59c --- /dev/null +++ b/src/Migration/Handler/Sequence.php @@ -0,0 +1,55 @@ +table = $table; + $this->destination = $destination; + } + + /** + * {@inheritdoc} + */ + public function handle(Record $recordToHandle, Record $oppositeRecord) + { + if (!in_array($this->table, $this->sequenceTablesCleaned)) { + $this->destination->clearDocument($this->table); + $this->sequenceTablesCleaned[] = $this->table; + } + $this->validate($recordToHandle); + $id = $recordToHandle->getValue($this->field); + if ($id && $this->table) { + $this->destination->saveRecords($this->table, [['sequence_value' => $id]]); + } + } +} diff --git a/src/Migration/ResourceModel/Adapter/Mysql.php b/src/Migration/ResourceModel/Adapter/Mysql.php index b37dc1b90..bfb19561f 100644 --- a/src/Migration/ResourceModel/Adapter/Mysql.php +++ b/src/Migration/ResourceModel/Adapter/Mysql.php @@ -35,6 +35,11 @@ class Mysql implements \Migration\ResourceModel\AdapterInterface */ protected $triggers = []; + /** + * @var array + */ + protected $initSelectParts = []; + /** * @param \Magento\Framework\DB\Adapter\Pdo\MysqlFactory $adapterFactory * @param \Magento\Framework\DB\Ddl\TriggerFactory $triggerFactory @@ -45,10 +50,14 @@ public function __construct( \Magento\Framework\DB\Ddl\TriggerFactory $triggerFactory, array $config ) { - $configData['config'] = $config; + $configData['config'] = $config['database']; $this->resourceAdapter = $adapterFactory->create($configData); + $this->resourceAdapter->disallowDdlCache(); $this->setForeignKeyChecks(0); $this->triggerFactory = $triggerFactory; + $this->initSelectParts = (isset($config['init_select_parts']) && is_array($config['init_select_parts'])) + ? $config['init_select_parts'] + : []; } /** @@ -85,7 +94,7 @@ public function getRecordsCount($documentName, $distinctFields = []) $distinctFields = ($distinctFields && is_array($distinctFields)) ? 'DISTINCT ' . implode(',', $distinctFields) : '*'; - $select = $this->resourceAdapter->select(); + $select = $this->getSelect(); $select->from($documentName, 'COUNT(' . $distinctFields . ')'); $result = $this->resourceAdapter->fetchOne($select); return $result; @@ -96,7 +105,7 @@ public function getRecordsCount($documentName, $distinctFields = []) */ public function loadPage($documentName, $pageNumber, $pageSize, $identityField = null, $identityId = null) { - $select = $this->resourceAdapter->select(); + $select = $this->getSelect(); $select->from($documentName, '*'); if ($identityField && $identityId !== null) { $select->where("`$identityField` >= ?", ($identityId == 0 ? $identityId : $identityId + 1)); @@ -212,7 +221,7 @@ public function loadChangedRecords( $pageSize, $getProcessed = false ) { - $select = $this->resourceAdapter->select(); + $select = $this->getSelect(); $select->from($deltaLogName, []) ->join($documentName, "$documentName.$idKey = $deltaLogName.$idKey", '*') ->where("`operation` in ('INSERT', 'UPDATE')") @@ -229,7 +238,7 @@ public function loadChangedRecords( */ public function loadDeletedRecords($deltaLogName, $idKey, $pageNumber, $pageSize, $getProcessed = false) { - $select = $this->resourceAdapter->select(); + $select = $this->getSelect(); $select->from($deltaLogName, [$idKey]) ->where("`operation` = 'DELETE'") ->limit($pageSize, $pageNumber * $pageSize); @@ -258,7 +267,11 @@ public function loadDataFromSelect($select) */ public function getSelect() { - return $this->resourceAdapter->select(); + $select = $this->resourceAdapter->select(); + foreach ($this->initSelectParts as $partKey => $partValue) { + $select->setPart($partKey, $partValue); + } + return $select; } /** @@ -312,7 +325,7 @@ public function backupDocument($documentName) $tableCopy = $this->getTableDdlCopy($documentName, $backupTableName); if (!$this->resourceAdapter->isTableExists($backupTableName)) { $this->createTableByDdl($tableCopy); - $select = $this->resourceAdapter->select()->from($documentName); + $select = $this->getSelect()->from($documentName); $query = $this->resourceAdapter->insertFromSelect($select, $tableCopy->getName()); $this->resourceAdapter->query($query); } @@ -326,7 +339,7 @@ public function rollbackDocument($documentName) $backupTableName = self::BACKUP_DOCUMENT_PREFIX . $documentName; if ($this->resourceAdapter->isTableExists($backupTableName)) { $this->resourceAdapter->truncateTable($documentName); - $select = $this->resourceAdapter->select()->from($backupTableName); + $select = $this->getSelect()->from($backupTableName); $query = $this->resourceAdapter->insertFromSelect($select, $documentName); $this->resourceAdapter->query($query); $this->resourceAdapter->dropTable($backupTableName); diff --git a/src/Migration/ResourceModel/Destination.php b/src/Migration/ResourceModel/Destination.php index c7b90d102..4eed6c913 100644 --- a/src/Migration/ResourceModel/Destination.php +++ b/src/Migration/ResourceModel/Destination.php @@ -6,6 +6,8 @@ namespace Migration\ResourceModel; +use \Migration\Config; + /** * ResourceModel destination class */ @@ -54,12 +56,16 @@ protected function getResourceConfig() { $destination = $this->configReader->getDestination(); $destinationType = $destination['type']; - $config['host'] = $destination[$destinationType]['host']; - $config['dbname'] = $destination[$destinationType]['name']; - $config['username'] = $destination[$destinationType]['user']; - $config['password'] = !empty($destination[$destinationType]['password']) + $config['database']['host'] = $destination[$destinationType]['host']; + $config['database']['dbname'] = $destination[$destinationType]['name']; + $config['database']['username'] = $destination[$destinationType]['user']; + $config['database']['password'] = !empty($destination[$destinationType]['password']) ? $destination[$destinationType]['password'] : ''; + $editionMigrate = $this->configReader->getOption('edition_migrate'); + if (in_array($editionMigrate, [Config::EDITION_MIGRATE_CE_TO_EE, Config::EDITION_MIGRATE_EE_TO_EE])) { + $config['init_select_parts'] = ['disable_staging_preview' => true]; + } return $config; } diff --git a/src/Migration/ResourceModel/Source.php b/src/Migration/ResourceModel/Source.php index 13180e588..8a38dc660 100644 --- a/src/Migration/ResourceModel/Source.php +++ b/src/Migration/ResourceModel/Source.php @@ -6,6 +6,8 @@ namespace Migration\ResourceModel; +use \Migration\Config; + /** * ResourceModel source class */ @@ -30,12 +32,16 @@ protected function getResourceConfig() { $source = $this->configReader->getSource(); $sourceType = $source['type']; - $config['host'] = $source[$sourceType]['host']; - $config['dbname'] = $source[$sourceType]['name']; - $config['username'] = $source[$sourceType]['user']; - $config['password'] = !empty($source[$sourceType]['password']) + $config['database']['host'] = $source[$sourceType]['host']; + $config['database']['dbname'] = $source[$sourceType]['name']; + $config['database']['username'] = $source[$sourceType]['user']; + $config['database']['password'] = !empty($source[$sourceType]['password']) ? $source[$sourceType]['password'] : ''; + $editionMigrate = $this->configReader->getOption('edition_migrate'); + if (in_array($editionMigrate, [Config::EDITION_MIGRATE_CE_TO_EE, Config::EDITION_MIGRATE_EE_TO_EE])) { + $config['init_select_parts'] = ['disable_staging_preview' => true]; + } return $config; } diff --git a/src/Migration/Step/ConfigurablePrices/Helper.php b/src/Migration/Step/ConfigurablePrices/Helper.php index 3472d8baf..d8d902fa6 100644 --- a/src/Migration/Step/ConfigurablePrices/Helper.php +++ b/src/Migration/Step/ConfigurablePrices/Helper.php @@ -6,6 +6,7 @@ namespace Migration\Step\ConfigurablePrices; use Migration\ResourceModel\Destination; +use Migration\Config; /** * Class Helper @@ -22,13 +23,21 @@ class Helper */ protected $destinationRecordsCount = 0; + /** + * @var string + */ + protected $editionMigrate = ''; + /** * @param Destination $destination + * @param Config $config */ public function __construct( - Destination $destination + Destination $destination, + Config $config ) { $this->destination = $destination; + $this->editionMigrate = $config->getOption('edition_migrate'); } /** @@ -49,10 +58,13 @@ public function getSourceFields() */ public function getDestinationFields() { + $entityIdName = (empty($this->editionMigrate) || $this->editionMigrate == Config::EDITION_MIGRATE_CE_TO_CE) + ? 'entity_id' + : 'row_id'; return [ 'store_id' => 'catalog_product_entity_decimal', 'value' => 'catalog_product_entity_decimal', - 'entity_id' => 'catalog_product_entity_decimal', + $entityIdName => 'catalog_product_entity_decimal', 'attribute_id' => 'catalog_product_entity_decimal' ]; } diff --git a/src/Migration/Step/TierPrice/Helper.php b/src/Migration/Step/TierPrice/Helper.php index b1d0bfac9..ae6ff2ba6 100644 --- a/src/Migration/Step/TierPrice/Helper.php +++ b/src/Migration/Step/TierPrice/Helper.php @@ -3,16 +3,32 @@ * Copyright © 2015 Magento. All rights reserved. * See COPYING.txt for license details. */ + namespace Migration\Step\TierPrice; +use Migration\Config; + /** * Class Helper */ class Helper { - const DESTINATION_DOCUMENT_NAME = 'catalog_product_entity_tier_price'; + /** + * @var string + */ + protected $editionMigrate = ''; + + /** + * @param Config $config + */ + public function __construct( + Config $config + ) { + $this->editionMigrate = $config->getOption('edition_migrate'); + } + /** * @return string */ @@ -52,10 +68,13 @@ public function getSourceDocumentFields() */ public function getDestinationDocumentFields() { + $entityIdName = (empty($this->editionMigrate) || $this->editionMigrate == Config::EDITION_MIGRATE_CE_TO_CE) + ? 'entity_id' + : 'row_id'; return [ self::DESTINATION_DOCUMENT_NAME => [ 'value_id', - 'entity_id', + $entityIdName, 'all_groups', 'customer_group_id', 'qty', From f5c12b23d958455a6814fccc0a8df11216c8d49c Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Mon, 18 Apr 2016 11:50:53 +0300 Subject: [PATCH 05/71] MAGETWO-48595: Fix Integrity check errors ee-to-ee --- etc/ee-to-ee/1.11.0.0/map.xml.dist | 362 +++++++++++++++-- etc/ee-to-ee/1.11.0.1/map.xml.dist | 362 +++++++++++++++-- etc/ee-to-ee/1.11.0.2/map.xml.dist | 362 +++++++++++++++-- etc/ee-to-ee/1.11.1.0/map.xml.dist | 362 +++++++++++++++-- etc/ee-to-ee/1.11.2.0/map.xml.dist | 362 +++++++++++++++-- etc/ee-to-ee/1.12.0.0/map.xml.dist | 363 +++++++++++++++-- etc/ee-to-ee/1.12.0.1/map.xml.dist | 360 +++++++++++++++-- etc/ee-to-ee/1.12.0.2/map.xml.dist | 360 +++++++++++++++-- etc/ee-to-ee/1.13.0.0/map.xml.dist | 364 +++++++++++++++-- etc/ee-to-ee/1.13.0.1/map.xml.dist | 364 +++++++++++++++-- etc/ee-to-ee/1.13.0.2/map.xml.dist | 364 +++++++++++++++-- etc/ee-to-ee/1.13.1.0/map.xml.dist | 370 ++++++++++++++++-- etc/ee-to-ee/1.14.0.0/map.xml.dist | 364 +++++++++++++++-- etc/ee-to-ee/1.14.0.1/map.xml.dist | 364 +++++++++++++++-- etc/ee-to-ee/1.14.1.0/map.xml.dist | 364 +++++++++++++++-- etc/ee-to-ee/1.14.2.0/map.xml.dist | 362 +++++++++++++++-- etc/ee-to-ee/1.14.2.1/map.xml.dist | 362 +++++++++++++++-- etc/ee-to-ee/1.14.2.2/map.xml.dist | 362 +++++++++++++++-- etc/ee-to-ee/1.14.2.3/map.xml.dist | 362 +++++++++++++++-- src/Migration/Step/UrlRewrite/Helper.php | 88 +++++ .../Step/UrlRewrite/Version11300to2000.php | 15 + .../Step/UrlRewrite/Version11410to2000.php | 15 + 22 files changed, 6285 insertions(+), 728 deletions(-) create mode 100644 src/Migration/Step/UrlRewrite/Helper.php 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 index 2d625cbc2..bcef3517b 100644 --- a/etc/ee-to-ee/1.11.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.0/map.xml.dist @@ -656,6 +656,12 @@ enterprise_admin_passwords + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -880,14 +886,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1062,14 +1060,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1194,6 +1184,86 @@ enterprise_reminder_rule.active_to enterprise_reminder_rule.to_date + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1294,18 +1364,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1338,6 +1396,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1498,37 +1592,43 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount - catalogrule.customer_group_ids + catalogsearch_query.synonym_for - catalogrule.website_ids + catalogrule.sub_is_enable - salesrule.customer_group_ids + catalogrule.sub_simple_action - salesrule.website_ids + catalogrule.sub_discount_amount - sales_flat_quote_payment.cc_exp_month + catalogrule_product.sub_simple_action - weee_tax.state + catalogrule_product.sub_discount_amount - enterprise_reminder_rule.active_from + cms_page.published_revision_id - enterprise_reminder_rule.active_to + cms_page.under_version_control + + + sales_flat_quote_payment.cc_exp_month + + + weee_tax.state enterprise_catalogevent_event.date_start @@ -1536,6 +1636,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1942,6 +2057,60 @@ admin_passwords + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -2035,10 +2204,6 @@ - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -2047,6 +2212,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2317,6 +2518,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2335,6 +2596,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index bc2f4b248..3b10c604d 100644 --- a/etc/ee-to-ee/1.11.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.1/map.xml.dist @@ -656,6 +656,12 @@ core_website + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -880,14 +886,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1062,14 +1060,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1194,6 +1184,86 @@ enterprise_reminder_rule.active_to enterprise_reminder_rule.to_date + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1294,18 +1364,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1338,6 +1396,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1498,37 +1592,43 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount - catalogrule.customer_group_ids + catalogsearch_query.synonym_for - catalogrule.website_ids + catalogrule.sub_is_enable - salesrule.customer_group_ids + catalogrule.sub_simple_action - salesrule.website_ids + catalogrule.sub_discount_amount - sales_flat_quote_payment.cc_exp_month + catalogrule_product.sub_simple_action - weee_tax.state + catalogrule_product.sub_discount_amount - enterprise_reminder_rule.active_from + cms_page.published_revision_id - enterprise_reminder_rule.active_to + cms_page.under_version_control + + + sales_flat_quote_payment.cc_exp_month + + + weee_tax.state enterprise_catalogevent_event.date_start @@ -1536,6 +1636,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1942,6 +2057,60 @@ admin_passwords + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -2035,10 +2204,6 @@ - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -2047,6 +2212,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2317,6 +2518,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2335,6 +2596,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index bc2f4b248..3b10c604d 100644 --- a/etc/ee-to-ee/1.11.0.2/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.2/map.xml.dist @@ -656,6 +656,12 @@ core_website + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -880,14 +886,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1062,14 +1060,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1194,6 +1184,86 @@ enterprise_reminder_rule.active_to enterprise_reminder_rule.to_date + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1294,18 +1364,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1338,6 +1396,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1498,37 +1592,43 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount - catalogrule.customer_group_ids + catalogsearch_query.synonym_for - catalogrule.website_ids + catalogrule.sub_is_enable - salesrule.customer_group_ids + catalogrule.sub_simple_action - salesrule.website_ids + catalogrule.sub_discount_amount - sales_flat_quote_payment.cc_exp_month + catalogrule_product.sub_simple_action - weee_tax.state + catalogrule_product.sub_discount_amount - enterprise_reminder_rule.active_from + cms_page.published_revision_id - enterprise_reminder_rule.active_to + cms_page.under_version_control + + + sales_flat_quote_payment.cc_exp_month + + + weee_tax.state enterprise_catalogevent_event.date_start @@ -1536,6 +1636,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1942,6 +2057,60 @@ admin_passwords + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -2035,10 +2204,6 @@ - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -2047,6 +2212,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2317,6 +2518,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2335,6 +2596,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index ae9f68239..3d59a2439 100644 --- a/etc/ee-to-ee/1.11.1.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.1.0/map.xml.dist @@ -656,6 +656,12 @@ core_website + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -880,14 +886,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1062,14 +1060,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1194,6 +1184,86 @@ enterprise_reminder_rule.active_to enterprise_reminder_rule.to_date + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1294,18 +1364,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1338,6 +1396,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1498,37 +1592,43 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount - catalogrule.customer_group_ids + catalogsearch_query.synonym_for - catalogrule.website_ids + catalogrule.sub_is_enable - salesrule.customer_group_ids + catalogrule.sub_simple_action - salesrule.website_ids + catalogrule.sub_discount_amount - sales_flat_quote_payment.cc_exp_month + catalogrule_product.sub_simple_action - weee_tax.state + catalogrule_product.sub_discount_amount - enterprise_reminder_rule.active_from + cms_page.published_revision_id - enterprise_reminder_rule.active_to + cms_page.under_version_control + + + sales_flat_quote_payment.cc_exp_month + + + weee_tax.state enterprise_catalogevent_event.date_start @@ -1536,6 +1636,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1930,6 +2045,60 @@ admin_passwords + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -2023,10 +2192,6 @@ - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -2035,6 +2200,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2290,6 +2491,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2308,6 +2569,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index 3ec99a0ff..fa26f0d71 100644 --- a/etc/ee-to-ee/1.11.2.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.2.0/map.xml.dist @@ -656,6 +656,12 @@ core_website + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -880,14 +886,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1062,14 +1060,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1194,6 +1184,86 @@ enterprise_reminder_rule.active_to enterprise_reminder_rule.to_date + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1294,18 +1364,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1338,6 +1396,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1498,37 +1592,43 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount - catalogrule.customer_group_ids + catalogsearch_query.synonym_for - catalogrule.website_ids + catalogrule.sub_is_enable - salesrule.customer_group_ids + catalogrule.sub_simple_action - salesrule.website_ids + catalogrule.sub_discount_amount - sales_flat_quote_payment.cc_exp_month + catalogrule_product.sub_simple_action - weee_tax.state + catalogrule_product.sub_discount_amount - enterprise_reminder_rule.active_from + cms_page.published_revision_id - enterprise_reminder_rule.active_to + cms_page.under_version_control + + + sales_flat_quote_payment.cc_exp_month + + + weee_tax.state enterprise_catalogevent_event.date_start @@ -1536,6 +1636,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1930,6 +2045,60 @@ admin_passwords + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -2023,10 +2192,6 @@ - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -2035,6 +2200,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2287,6 +2488,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2305,6 +2566,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index f3cbddf32..d4315c30e 100644 --- a/etc/ee-to-ee/1.12.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.0/map.xml.dist @@ -662,6 +662,12 @@ catalog_product_entity_tier_price + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -886,14 +892,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1068,14 +1066,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1192,6 +1182,86 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1264,18 +1334,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1308,6 +1366,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1468,25 +1562,37 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount + + + catalogsearch_query.synonym_for - catalogrule.customer_group_ids + catalogrule.sub_is_enable - catalogrule.website_ids + catalogrule.sub_simple_action - salesrule.customer_group_ids + catalogrule.sub_discount_amount - salesrule.website_ids + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + cms_page.published_revision_id + + + cms_page.under_version_control sales_flat_quote_payment.cc_exp_month @@ -1500,6 +1606,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1876,6 +1997,60 @@ admin_passwords + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1969,10 +2144,6 @@ - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -1981,6 +2152,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2131,9 +2338,6 @@ cataloginventory_stock_item.use_config_deferred_stock_update - - quote_payment.cc_exp_month - quote.gw_base_price_incl_tax @@ -2170,6 +2374,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + weee_tax.state @@ -2179,6 +2443,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index 4eb203fad..03e00b09d 100644 --- a/etc/ee-to-ee/1.12.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.1/map.xml.dist @@ -662,6 +662,12 @@ catalog_product_entity_tier_price + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -886,14 +892,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1068,14 +1066,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1192,6 +1182,86 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1264,18 +1334,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1308,6 +1366,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1468,25 +1562,37 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount + + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount - catalogrule.customer_group_ids + catalogrule_product.sub_simple_action - catalogrule.website_ids + catalogrule_product.sub_discount_amount - salesrule.customer_group_ids + cms_page.published_revision_id - salesrule.website_ids + cms_page.under_version_control sales_flat_quote_payment.cc_exp_month @@ -1500,6 +1606,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1876,6 +1997,60 @@ admin_passwords + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1969,10 +2144,6 @@ - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -1981,6 +2152,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2167,6 +2374,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2179,6 +2446,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index 4eb203fad..03e00b09d 100644 --- a/etc/ee-to-ee/1.12.0.2/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.2/map.xml.dist @@ -662,6 +662,12 @@ catalog_product_entity_tier_price + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -886,14 +892,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1068,14 +1066,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1192,6 +1182,86 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1264,18 +1334,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1308,6 +1366,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1468,25 +1562,37 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount + + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount - catalogrule.customer_group_ids + catalogrule_product.sub_simple_action - catalogrule.website_ids + catalogrule_product.sub_discount_amount - salesrule.customer_group_ids + cms_page.published_revision_id - salesrule.website_ids + cms_page.under_version_control sales_flat_quote_payment.cc_exp_month @@ -1500,6 +1606,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1876,6 +1997,60 @@ admin_passwords + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1969,10 +2144,6 @@ - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -1981,6 +2152,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2167,6 +2374,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2179,6 +2446,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index 8b2012db1..aec60eee8 100644 --- a/etc/ee-to-ee/1.13.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.13.0.0/map.xml.dist @@ -662,6 +662,12 @@ catalog_product_entity_tier_price + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -886,14 +892,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1068,14 +1066,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1192,6 +1182,86 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1264,18 +1334,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1308,6 +1366,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1468,13 +1562,37 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount + + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + cms_page.published_revision_id + + + cms_page.under_version_control sales_flat_quote_payment.cc_exp_month @@ -1488,6 +1606,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1840,6 +1973,60 @@ admin_passwords + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1914,10 +2101,6 @@ sales_order_status_state.visible_on_front - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -1926,6 +2109,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2070,6 +2289,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2082,6 +2361,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index 8b2012db1..aec60eee8 100644 --- a/etc/ee-to-ee/1.13.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.13.0.1/map.xml.dist @@ -662,6 +662,12 @@ catalog_product_entity_tier_price + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -886,14 +892,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1068,14 +1066,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1192,6 +1182,86 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1264,18 +1334,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1308,6 +1366,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1468,13 +1562,37 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount + + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + cms_page.published_revision_id + + + cms_page.under_version_control sales_flat_quote_payment.cc_exp_month @@ -1488,6 +1606,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1840,6 +1973,60 @@ admin_passwords + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1914,10 +2101,6 @@ sales_order_status_state.visible_on_front - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -1926,6 +2109,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2070,6 +2289,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2082,6 +2361,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index 8b2012db1..aec60eee8 100644 --- a/etc/ee-to-ee/1.13.0.2/map.xml.dist +++ b/etc/ee-to-ee/1.13.0.2/map.xml.dist @@ -662,6 +662,12 @@ catalog_product_entity_tier_price + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -886,14 +892,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1068,14 +1066,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1192,6 +1182,86 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1264,18 +1334,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1308,6 +1366,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1468,13 +1562,37 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount + + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + cms_page.published_revision_id + + + cms_page.under_version_control sales_flat_quote_payment.cc_exp_month @@ -1488,6 +1606,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1840,6 +1973,60 @@ admin_passwords + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1914,10 +2101,6 @@ sales_order_status_state.visible_on_front - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -1926,6 +2109,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2070,6 +2289,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2082,6 +2361,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index a523ebc27..2aafc2f35 100644 --- a/etc/ee-to-ee/1.13.1.0/map.xml.dist +++ b/etc/ee-to-ee/1.13.1.0/map.xml.dist @@ -365,6 +365,12 @@ core_flag + + core_email_queue + + + core_email_queue_recipients + merchandiser_category_values @@ -662,6 +668,12 @@ catalog_product_entity_tier_price + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -886,14 +898,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1068,14 +1072,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1192,6 +1188,86 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1264,18 +1340,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1308,6 +1372,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1468,13 +1568,37 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount + + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + cms_page.published_revision_id + + + cms_page.under_version_control sales_flat_quote_payment.cc_exp_month @@ -1488,6 +1612,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1840,6 +1979,60 @@ admin_passwords + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1914,10 +2107,6 @@ sales_order_status_state.visible_on_front - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -1926,6 +2115,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2076,6 +2301,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2088,6 +2373,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index 024b8b6bb..3b1475564 100644 --- a/etc/ee-to-ee/1.14.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.14.0.0/map.xml.dist @@ -668,6 +668,12 @@ catalog_product_entity_tier_price + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -892,14 +898,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1074,14 +1072,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1198,6 +1188,86 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1270,18 +1340,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1314,6 +1372,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1474,13 +1568,37 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount + + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + cms_page.published_revision_id + + + cms_page.under_version_control sales_flat_quote_payment.cc_exp_month @@ -1494,6 +1612,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1846,6 +1979,60 @@ admin_passwords + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1920,10 +2107,6 @@ sales_order_status_state.visible_on_front - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -1932,6 +2115,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2073,6 +2292,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2085,6 +2364,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index 024b8b6bb..3b1475564 100644 --- a/etc/ee-to-ee/1.14.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.14.0.1/map.xml.dist @@ -668,6 +668,12 @@ catalog_product_entity_tier_price + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -892,14 +898,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1074,14 +1072,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1198,6 +1188,86 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1270,18 +1340,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1314,6 +1372,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1474,13 +1568,37 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount + + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + cms_page.published_revision_id + + + cms_page.under_version_control sales_flat_quote_payment.cc_exp_month @@ -1494,6 +1612,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1846,6 +1979,60 @@ admin_passwords + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1920,10 +2107,6 @@ sales_order_status_state.visible_on_front - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -1932,6 +2115,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2073,6 +2292,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2085,6 +2364,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index e0ea39c67..e80db964e 100644 --- a/etc/ee-to-ee/1.14.1.0/map.xml.dist +++ b/etc/ee-to-ee/1.14.1.0/map.xml.dist @@ -668,6 +668,12 @@ catalog_product_entity_tier_price + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -892,14 +898,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1082,14 +1080,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1206,6 +1196,86 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1278,18 +1348,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1322,6 +1380,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1482,13 +1576,37 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount + + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + cms_page.published_revision_id + + + cms_page.under_version_control sales_flat_quote_payment.cc_exp_month @@ -1502,6 +1620,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1848,6 +1981,60 @@ admin_passwords + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1922,10 +2109,6 @@ sales_order_status_state.visible_on_front - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -1934,6 +2117,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2075,6 +2294,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2087,6 +2366,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index 61da4dc6f..b96fecbf9 100644 --- a/etc/ee-to-ee/1.14.2.0/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.0/map.xml.dist @@ -668,6 +668,12 @@ catalog_product_entity_tier_price + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -892,14 +898,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1082,14 +1080,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1206,6 +1196,86 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1278,18 +1348,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1338,6 +1396,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1498,19 +1592,37 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount - enterprise_giftregistry_person.middlename + catalogsearch_query.synonym_for - sales_flat_quote.base_customer_balance_virtual_amount + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + cms_page.published_revision_id + + + cms_page.under_version_control sales_flat_quote_payment.cc_exp_month @@ -1539,6 +1651,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1891,6 +2018,60 @@ admin_passwords + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1965,10 +2146,6 @@ sales_order_status_state.visible_on_front - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -1977,6 +2154,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2118,6 +2331,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2142,6 +2415,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index 61da4dc6f..b96fecbf9 100644 --- a/etc/ee-to-ee/1.14.2.1/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.1/map.xml.dist @@ -668,6 +668,12 @@ catalog_product_entity_tier_price + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -892,14 +898,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1082,14 +1080,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1206,6 +1196,86 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1278,18 +1348,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1338,6 +1396,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1498,19 +1592,37 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount - enterprise_giftregistry_person.middlename + catalogsearch_query.synonym_for - sales_flat_quote.base_customer_balance_virtual_amount + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + cms_page.published_revision_id + + + cms_page.under_version_control sales_flat_quote_payment.cc_exp_month @@ -1539,6 +1651,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1891,6 +2018,60 @@ admin_passwords + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1965,10 +2146,6 @@ sales_order_status_state.visible_on_front - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -1977,6 +2154,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2118,6 +2331,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2142,6 +2415,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index 85f1c2e1e..b275d3df9 100644 --- a/etc/ee-to-ee/1.14.2.2/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.2/map.xml.dist @@ -674,6 +674,12 @@ permission_variable + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -898,14 +904,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1088,14 +1086,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1212,6 +1202,86 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1284,18 +1354,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1344,6 +1402,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1504,19 +1598,37 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount - enterprise_giftregistry_person.middlename + catalogsearch_query.synonym_for - sales_flat_quote.base_customer_balance_virtual_amount + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + cms_page.published_revision_id + + + cms_page.under_version_control sales_flat_quote_payment.cc_exp_month @@ -1545,6 +1657,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1897,6 +2024,60 @@ admin_passwords + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1971,10 +2152,6 @@ sales_order_status_state.visible_on_front - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -1983,6 +2160,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2124,6 +2337,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2148,6 +2421,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index 85f1c2e1e..b275d3df9 100644 --- a/etc/ee-to-ee/1.14.2.3/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.3/map.xml.dist @@ -674,6 +674,12 @@ permission_variable + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -898,14 +904,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1088,14 +1086,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1212,6 +1202,86 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1284,18 +1354,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1344,6 +1402,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1504,19 +1598,37 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount - enterprise_giftregistry_person.middlename + catalogsearch_query.synonym_for - sales_flat_quote.base_customer_balance_virtual_amount + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + cms_page.published_revision_id + + + cms_page.under_version_control sales_flat_quote_payment.cc_exp_month @@ -1545,6 +1657,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1897,6 +2024,60 @@ admin_passwords + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1971,10 +2152,6 @@ sales_order_status_state.visible_on_front - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -1983,6 +2160,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2124,6 +2337,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2148,6 +2421,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + diff --git a/src/Migration/Step/UrlRewrite/Helper.php b/src/Migration/Step/UrlRewrite/Helper.php new file mode 100644 index 000000000..0e1b7f082 --- /dev/null +++ b/src/Migration/Step/UrlRewrite/Helper.php @@ -0,0 +1,88 @@ + ['catalog_category_entity_varchar', 'catalog_product_entity_varchar'], + 'field_entity_id' => 'entity_id', + 'field_staging' => 'row_id', + ]; + + /** + * @param Config $config + */ + public function __construct( + \Migration\Config $config + ) { + $this->editionMigrate = $config->getOption('edition_migrate'); + } + + /** + * Fields processor + * + * @param $resourceType + * @param $tableName + * @param array $fields + * @param bool $inKeys + * @return array + */ + public function processFields($resourceType, $tableName, array $fields, $inKeys = false) + { + return $this->processFieldsOfStagingModule($resourceType, $tableName, $fields, $inKeys); + } + + /** + * Rename fields of staging module + * + * @param $resourceType + * @param $tableName + * @param array $fields + * @param bool $inKeys + * @return array + */ + private function processFieldsOfStagingModule($resourceType, $tableName, array $fields, $inKeys = false) + { + $fieldEntityId = $this->stagingConfig['field_entity_id']; + $fieldStaging = $this->stagingConfig['field_staging']; + $tablesStaging = $this->stagingConfig['tables']; + + if(empty($this->editionMigrate) + || $this->editionMigrate == Config::EDITION_MIGRATE_CE_TO_CE + || $resourceType == MapInterface::TYPE_SOURCE + || !in_array($tableName, $tablesStaging) + ) { + return $fields; + } + if ($inKeys && isset($fields[$fieldEntityId])) { + $fields[$fieldStaging] = $fields[$fieldEntityId]; + unset($fields[$fieldEntityId]); + } else { + $map = function($item) use ($fieldEntityId, $fieldStaging) { + return $item == $fieldEntityId ? $fieldStaging : $item; + }; + $fields = array_map($map, $fields); + } + return $fields; + } +} diff --git a/src/Migration/Step/UrlRewrite/Version11300to2000.php b/src/Migration/Step/UrlRewrite/Version11300to2000.php index 1de9f9e6e..0fe8b0d8c 100644 --- a/src/Migration/Step/UrlRewrite/Version11300to2000.php +++ b/src/Migration/Step/UrlRewrite/Version11300to2000.php @@ -103,6 +103,11 @@ class Version11300to2000 extends DatabaseStage implements StageInterface, Rollba */ protected $suffixData; + /** + * @var \Migration\Step\UrlRewrite\Helper + */ + protected $helper; + /** * @var array */ @@ -191,6 +196,7 @@ public function __construct( \Migration\ResourceModel\Destination $destination, \Migration\ResourceModel\Record\CollectionFactory $recordCollectionFactory, \Migration\ResourceModel\RecordFactory $recordFactory, + \Migration\Step\UrlRewrite\Helper $helper, $stage ) { $this->progress = $progress; @@ -201,6 +207,7 @@ public function __construct( $this->recordFactory = $recordFactory; $this->tableName = 'url_rewrite_m2' . md5('url_rewrite_m2'); $this->stage = $stage; + $this->helper = $helper; parent::__construct($config); } @@ -417,6 +424,12 @@ protected function copyEavData($sourceName, $destinationName, $type) $storeRow = $row; $storeRow['store_id'] = $storeId; $storeRow['value'] = $storeRow['value'] . '-' . $urlKey; + $storeRow = $this->helper->processFields( + MapInterface::TYPE_DEST, + $destinationName, + $storeRow, + true + ); $records->addRecord($this->recordFactory->create(['data' => $storeRow])); if (!isset($this->resolvedDuplicates[$destinationName])) { $this->resolvedDuplicates[$destinationName] = 0; @@ -424,6 +437,7 @@ protected function copyEavData($sourceName, $destinationName, $type) $this->resolvedDuplicates[$destinationName]++; } } + $row = $this->helper->processFields(MapInterface::TYPE_DEST, $destinationName, $row, true); $records->addRecord($this->recordFactory->create(['data' => $row])); } $this->destination->saveRecords($destinationName, $records, true); @@ -450,6 +464,7 @@ protected function integrity() $errors = true; continue; } + $documentFields = $this->helper->processFields($resourceName, $documentName, $documentFields); $structure = array_keys($document->getStructure()->getFields()); if (!(empty(array_diff($structure, $documentFields)) && empty(array_diff($documentFields, $structure))) diff --git a/src/Migration/Step/UrlRewrite/Version11410to2000.php b/src/Migration/Step/UrlRewrite/Version11410to2000.php index 59a3724a0..1c1d6c955 100644 --- a/src/Migration/Step/UrlRewrite/Version11410to2000.php +++ b/src/Migration/Step/UrlRewrite/Version11410to2000.php @@ -103,6 +103,11 @@ class Version11410to2000 extends DatabaseStage implements StageInterface, Rollba */ protected $suffixData; + /** + * @var \Migration\Step\UrlRewrite\Helper + */ + protected $helper; + /** * @var array */ @@ -196,6 +201,7 @@ public function __construct( \Migration\ResourceModel\Destination $destination, \Migration\ResourceModel\Record\CollectionFactory $recordCollectionFactory, \Migration\ResourceModel\RecordFactory $recordFactory, + \Migration\Step\UrlRewrite\Helper $helper, $stage ) { $this->progress = $progress; @@ -206,6 +212,7 @@ public function __construct( $this->recordFactory = $recordFactory; $this->tableName = 'url_rewrite_m2' . md5('url_rewrite_m2'); $this->stage = $stage; + $this->helper = $helper; parent::__construct($config); } @@ -422,6 +429,12 @@ protected function copyEavData($sourceName, $destinationName, $type) $storeRow = $row; $storeRow['store_id'] = $storeId; $storeRow['value'] = $storeRow['value'] . '-' . $urlKey; + $storeRow = $this->helper->processFields( + MapInterface::TYPE_DEST, + $destinationName, + $storeRow, + true + ); $records->addRecord($this->recordFactory->create(['data' => $storeRow])); if (!isset($this->resolvedDuplicates[$destinationName])) { $this->resolvedDuplicates[$destinationName] = 0; @@ -429,6 +442,7 @@ protected function copyEavData($sourceName, $destinationName, $type) $this->resolvedDuplicates[$destinationName]++; } } + $row = $this->helper->processFields(MapInterface::TYPE_DEST, $destinationName, $row, true); $records->addRecord($this->recordFactory->create(['data' => $row])); } $this->destination->saveRecords($destinationName, $records, true); @@ -455,6 +469,7 @@ protected function integrity() $errors = true; continue; } + $documentFields = $this->helper->processFields($resourceName, $documentName, $documentFields); $structure = array_keys($document->getStructure()->getFields()); if (!(empty(array_diff($structure, $documentFields)) && empty(array_diff($documentFields, $structure))) From 5caf02e0b354205c164b91ff25f47b53de0f9267 Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Mon, 18 Apr 2016 17:15:00 +0300 Subject: [PATCH 06/71] MAGETWO-51396: Create map files for 1.9.2.4 and 1.14.2.4 --- etc/ce-to-ce/1.9.2.4/config.xml.dist | 134 ++ etc/ce-to-ce/1.9.2.4/map.xml.dist | 1565 ++++++++++++++ etc/ce-to-ee/1.9.2.4/config.xml.dist | 134 ++ etc/ce-to-ee/1.9.2.4/map.xml.dist | 2714 +++++++++++++++++++++++++ etc/ee-to-ee/1.14.2.4/config.xml.dist | 162 ++ etc/ee-to-ee/1.14.2.4/map.xml.dist | 2441 ++++++++++++++++++++++ 6 files changed, 7150 insertions(+) create mode 100644 etc/ce-to-ce/1.9.2.4/config.xml.dist create mode 100644 etc/ce-to-ce/1.9.2.4/map.xml.dist create mode 100644 etc/ce-to-ee/1.9.2.4/config.xml.dist create mode 100644 etc/ce-to-ee/1.9.2.4/map.xml.dist create mode 100644 etc/ee-to-ee/1.14.2.4/config.xml.dist create mode 100644 etc/ee-to-ee/1.14.2.4/map.xml.dist diff --git a/etc/ce-to-ce/1.9.2.4/config.xml.dist b/etc/ce-to-ce/1.9.2.4/config.xml.dist new file mode 100644 index 000000000..fca92966f --- /dev/null +++ b/etc/ce-to-ce/1.9.2.4/config.xml.dist @@ -0,0 +1,134 @@ + + + + + + Migration\Step\Settings\Integrity + Migration\Step\Settings\Data + + + Migration\Step\Stores\Integrity + Migration\Step\Stores\Data + Migration\Step\Stores\Volume + + + + + Migration\Step\Eav\Integrity + Migration\Step\Eav\Data + Migration\Step\Eav\Volume + + + Migration\Step\Customer\Integrity + Migration\Step\Customer\Data + Migration\Step\Customer\Volume + + + Migration\Step\Map\Integrity + Migration\Step\Map\Data + Migration\Step\Map\Volume + + + Migration\Step\UrlRewrite\Version191to2000 + Migration\Step\UrlRewrite\Version191to2000 + Migration\Step\UrlRewrite\Version191to2000 + + + Migration\Step\Log\Integrity + Migration\Step\Log\Data + Migration\Step\Log\Volume + + + Migration\Step\Ratings\Integrity + Migration\Step\Ratings\Data + Migration\Step\Ratings\Volume + + + Migration\Step\ConfigurablePrices\Integrity + Migration\Step\ConfigurablePrices\Data + Migration\Step\ConfigurablePrices\Volume + + + Migration\Step\OrderGrids\Integrity + Migration\Step\OrderGrids\Data + Migration\Step\OrderGrids\Volume + + + Migration\Step\TierPrice\Integrity + Migration\Step\TierPrice\Data + Migration\Step\TierPrice\Volume + + + Migration\Step\SalesIncrement\Integrity + Migration\Step\SalesIncrement\Data + Migration\Step\SalesIncrement\Volume + + + + + Migration\Step\Customer\Delta + Migration\Step\Customer\Volume + + + Migration\Step\Map\Delta + Migration\Step\Map\Volume + + + Migration\Step\Log\Delta + Migration\Step\Log\Volume + + + Migration\Step\OrderGrids\Delta + Migration\Step\OrderGrids\Volume + + + Migration\Step\SalesIncrement\Delta + Migration\Step\SalesIncrement\Volume + + + + + + + + + + etc/ce-to-ce/1.9.2.4/map.xml.dist + etc/ce-to-ce/map-eav.xml.dist + etc/ce-to-ce/eav-document-groups.xml.dist + etc/ce-to-ce/eav-attribute-groups.xml.dist + etc/ce-to-ce/map-log.xml.dist + etc/ce-to-ce/log-document-groups.xml.dist + etc/ce-to-ce/settings.xml.dist + etc/ce-to-ce/map-customer.xml.dist + etc/ce-to-ce/customer-document-groups.xml.dist + etc/ce-to-ce/customer-attribute-groups.xml.dist + etc/ce-to-ce/deltalog.xml.dist + etc/ce-to-ce/order-grids-document-groups.xml.dist + etc/ce-to-ce/map-document-groups.xml.dist + etc/ce-to-ce/class-map.xml.dist + + 0 + + 0 + + + 0 + migration.log + %percent%% [%bar%] Remaining Time: %remaining% + 1 + ce-to-ce + + + diff --git a/etc/ce-to-ce/1.9.2.4/map.xml.dist b/etc/ce-to-ce/1.9.2.4/map.xml.dist new file mode 100644 index 000000000..a8b7a5b6c --- /dev/null +++ b/etc/ce-to-ce/1.9.2.4/map.xml.dist @@ -0,0 +1,1565 @@ + + + + + + + googleshopping_attributes + + + googleshopping_items + + + googleshopping_types + + + sales_flat_creditmemo_grid + + + sales_flat_invoice_grid + + + sales_flat_order_grid + + + sales_flat_shipment_grid + + + customer_entity + + + customer_entity_datetime + + + customer_entity_decimal + + + customer_entity_int + + + customer_entity_text + + + customer_entity_varchar + + + customer_address_entity + + + customer_address_entity_datetime + + + customer_address_entity_decimal + + + customer_address_entity_int + + + customer_address_entity_text + + + customer_address_entity_varchar + + + m2_cl_* + + + url_rewrite_m2* + + + admin_assert + + + api2_acl_attribute + + + api2_acl_role + + + api2_acl_rule + + + api2_acl_user + + + api_assert + + + api_role + + + api_rule + + + api_session + + + api_user + + + log_customer + + + log_quote + + + log_summary_type + + + log_summary + + + log_url + + + log_url_info + + + catalog_category_anc_categs_index_idx + + + catalog_category_anc_categs_index_tmp + + + catalog_category_anc_products_index_idx + + + catalog_category_anc_products_index_tmp + + + catalog_category_flat_cl + + + catalog_category_product_index + + + catalog_category_product_index_cl + + + catalog_category_product_index_enbl_idx + + + catalog_category_product_index_enbl_tmp + + + catalog_category_product_index_idx + + + catalog_category_product_index_tmp + + + catalog_product_enabled_index + + + catalog_product_flat_cl + + + cataloginventory_stock_status_idx + + + cataloginventory_stock_status_tmp + + + catalog_category_product_cat_cl + + + catalog_product_bundle_price_index + + + catalog_product_bundle_stock_index + + + catalog_product_index_group_price + + + catalog_product_index_price + + + catalog_product_index_price* + + + catalog_product_index_tier_price + + + catalog_product_index_website + + + catalogindex_aggregation + + + catalogindex_aggregation_tag + + + catalogindex_aggregation_to_tag + + + catalogindex_minimal_price + + + catalogindex_price + + + core_layout_update + + + core_layout_link + + + widget_instance_page_layout + + + googlecheckout_api_debug + + + ogone_api_debug + + + oscommerce_import + + + oscommerce_import_type + + + oscommerce_orders + + + oscommerce_orders_products + + + oscommerce_orders_status_history + + + oscommerce_orders_total + + + oscommerce_ref + + + paygate_authorizenet_debug + + + paypal_api_debug + + + paypaluk_api_debug + + + amazonpayments_api_debug + + + chronopay_api_debug + + + cybermut_api_debug + + + cybersource_api_debug + + + eway_api_debug + + + flo2cash_api_debug + + + ideal_api_debug + + + paybox_api_debug + + + protx_api_debug + + + googlecheckout_notification + + + index_event + + + index_process + + + index_process_event + + + cataloginventory_stock_status_cl + + + catalogsearch_fulltext + + + catalogsearch_fulltext_cl + + + core_cache_tag + + + core_cache_option + + + core_cache + + + core_flag + + + core_email_queue + + + core_email_queue_recipients + + + merchandiser_category_values + + + merchandiser_vmbuild + + + dataflow_batch + + + dataflow_batch_export + + + dataflow_batch_import + + + dataflow_import_data + + + dataflow_profile + + + dataflow_profile_history + + + dataflow_session + + + core_url_rewrite + + + catalog_product_entity_url_key + + + catalogindex_eav + + + catalog_eav_attribute + + + customer_eav_attribute + + + catalog_product_index_eav + + + catalog_product_index_eav_decimal + + + catalog_product_index_eav_decimal_idx + + + catalog_product_index_eav_decimal_tmp + + + catalog_product_index_eav_idx + + + catalog_product_index_eav_tmp + + + eav_attribute + + + eav_attribute_group + + + eav_attribute_set + + + eav_entity_attribute + + + eav_entity_type + + + catalog_category_entity_url_key + + + poll + + + poll_answer + + + poll_store + + + poll_vote + + + sales_recurring_profile + + + sales_recurring_profile_order + + + tag + + + tag_properties + + + tag_relation + + + tag_summary + + + weee_discount + + + catalogsearch_result + + + log_visitor + + + log_visitor_info + + + log_visitor_online + + + core_config_data + + + s_*b_*_* + + + catalog_product_flat_* + + + catalog_category_flat_* + + + catalog_category_flat_store_* + + + googleoptimizer_code + + + core_resource + + + cron_schedule + + + admin_user + + + admin_role + + + admin_rule + + + admin_role + + + admin_rule + + + catalogrule_affected_product + + + catalog_product_super_attribute_pricing + + + core_website + + + catalog_product_entity_group_price + + + catalog_product_entity_tier_price + + + permission_block + + + permission_variable + + + catalogsearch_query + search_query + + + core_variable + variable + + + core_variable_value + variable_value + + + core_email_template + email_template + + + core_store + store + + + core_store_group + store_group + + + core_translate + translation + + + core_session + session + + + coupon_aggregated + salesrule_coupon_aggregated + + + coupon_aggregated_order + salesrule_coupon_aggregated_order + + + coupon_aggregated_updated + salesrule_coupon_aggregated_updated + + + sales_flat_order + sales_order + + + sales_flat_creditmemo + sales_creditmemo + + + sales_flat_creditmemo_comment + sales_creditmemo_comment + + + sales_flat_creditmemo_item + sales_creditmemo_item + + + sales_flat_invoice + sales_invoice + + + sales_flat_invoice_comment + sales_invoice_comment + + + sales_flat_invoice_item + sales_invoice_item + + + sales_flat_order_address + sales_order_address + + + sales_flat_order_item + sales_order_item + + + sales_flat_order_payment + sales_order_payment + + + sales_flat_order_status_history + sales_order_status_history + + + sales_flat_quote + quote + + + sales_flat_quote_address + quote_address + + + sales_flat_quote_address_item + quote_address_item + + + sales_flat_quote_item + quote_item + + + sales_flat_quote_item_option + quote_item_option + + + sales_flat_quote_payment + quote_payment + + + sales_flat_quote_shipping_rate + quote_shipping_rate + + + sales_flat_shipment + sales_shipment + + + sales_flat_shipment_comment + sales_shipment_comment + + + sales_flat_shipment_item + sales_shipment_item + + + sales_flat_shipment_track + sales_shipment_track + + + core_directory_storage + media_storage_directory_storage + + + core_file_storage + media_storage_file_storage + + + sales_billing_agreement + paypal_billing_agreement + + + sales_billing_agreement_order + paypal_billing_agreement_order + + + + + cms_page.root_template + cms_page.page_layout + + + sales_flat_order.hidden_tax_amount + sales_order.discount_tax_compensation_amount + + + sales_flat_order.base_hidden_tax_amount + sales_order.base_discount_tax_compensation_amount + + + sales_flat_order.shipping_hidden_tax_amount + sales_order.shipping_discount_tax_compensation_amount + + + sales_flat_order.base_shipping_hidden_tax_amnt + sales_order.base_shipping_discount_tax_compensation_amnt + + + sales_flat_order.hidden_tax_invoiced + sales_order.discount_tax_compensation_invoiced + + + sales_flat_order.base_hidden_tax_invoiced + sales_order.base_discount_tax_compensation_invoiced + + + sales_flat_order.hidden_tax_refunded + sales_order.discount_tax_compensation_refunded + + + sales_flat_order.base_hidden_tax_refunded + sales_order.base_discount_tax_compensation_refunded + + + sales_flat_creditmemo.hidden_tax_amount + sales_creditmemo.discount_tax_compensation_amount + + + sales_flat_creditmemo.base_hidden_tax_amount + sales_creditmemo.base_discount_tax_compensation_amount + + + sales_flat_creditmemo.shipping_hidden_tax_amount + sales_creditmemo.shipping_discount_tax_compensation_amount + + + sales_flat_creditmemo.base_shipping_hidden_tax_amnt + sales_creditmemo.base_shipping_discount_tax_compensation_amnt + + + sales_flat_creditmemo_item.hidden_tax_amount + sales_creditmemo_item.discount_tax_compensation_amount + + + sales_flat_creditmemo_item.base_hidden_tax_amount + sales_creditmemo_item.base_discount_tax_compensation_amount + + + sales_flat_invoice.hidden_tax_amount + sales_invoice.discount_tax_compensation_amount + + + sales_flat_invoice.base_hidden_tax_amount + sales_invoice.base_discount_tax_compensation_amount + + + sales_flat_invoice.shipping_hidden_tax_amount + sales_invoice.shipping_discount_tax_compensation_amount + + + sales_flat_invoice.base_shipping_hidden_tax_amnt + sales_invoice.base_shipping_discount_tax_compensation_amnt + + + sales_flat_invoice_item.hidden_tax_amount + sales_invoice_item.discount_tax_compensation_amount + + + sales_flat_invoice_item.base_hidden_tax_amount + sales_invoice_item.base_discount_tax_compensation_amount + + + sales_flat_order_item.hidden_tax_amount + sales_order_item.discount_tax_compensation_amount + + + sales_flat_order_item.base_hidden_tax_amount + sales_order_item.base_discount_tax_compensation_amount + + + sales_flat_order_item.hidden_tax_invoiced + sales_order_item.discount_tax_compensation_invoiced + + + sales_flat_order_item.base_hidden_tax_invoiced + sales_order_item.base_discount_tax_compensation_invoiced + + + sales_flat_order_item.hidden_tax_refunded + sales_order_item.discount_tax_compensation_refunded + + + sales_flat_order_item.base_hidden_tax_refunded + sales_order_item.base_discount_tax_compensation_refunded + + + sales_flat_order_item.hidden_tax_canceled + sales_order_item.discount_tax_compensation_canceled + + + sales_flat_order_payment.cc_last4 + sales_order_payment.cc_last_4 + + + sales_flat_quote_payment.cc_last4 + quote_payment.cc_last_4 + + + sales_flat_quote_address.hidden_tax_amount + quote_address.discount_tax_compensation_amount + + + sales_flat_quote_address.base_hidden_tax_amount + quote_address.base_discount_tax_compensation_amount + + + sales_flat_quote_address.shipping_hidden_tax_amount + quote_address.shipping_discount_tax_compensation_amount + + + sales_flat_quote_address.base_shipping_hidden_tax_amnt + quote_address.base_shipping_discount_tax_compensation_amnt + + + sales_flat_quote_address_item.hidden_tax_amount + quote_address_item.discount_tax_compensation_amount + + + sales_flat_quote_address_item.base_hidden_tax_amount + quote_address_item.base_discount_tax_compensation_amount + + + sales_flat_quote_item.hidden_tax_amount + quote_item.discount_tax_compensation_amount + + + sales_flat_quote_item.base_hidden_tax_amount + quote_item.base_discount_tax_compensation_amount + + + catalog_category_entity_varchar.value + + + + + + + catalog_product_entity_varchar.value + + + + + + + cms_page.root_template + + + + + + cms_block.content + + + + cms_page.content + + + + newsletter_template.template_text + + + + core_email_template.template_text + + + + widget_instance.instance_type + + + + catalogrule.conditions_serialized + + + + catalogrule.actions_serialized + + + + salesrule.conditions_serialized + + + + salesrule.actions_serialized + + + + sales_flat_order_item.weee_tax_applied + + + + sales_flat_quote_item.weee_tax_applied + + + + sales_flat_creditmemo_item.weee_tax_applied + + + + sales_flat_invoice_item.weee_tax_applied + + + + catalog_product_entity_media_gallery.value_id + + + + rating_option_vote.remote_ip_long + + + + sendfriend_log.ip + + + + catalogsearch_query.synonym_for + + + + admin_rule.role_type + + + admin_rule.assert_id + + + core_website.is_staging + + + core_website.master_login + + + core_website.master_password + + + core_website.visibility + + + sales_order_tax.hidden + + + sales_flat_order.paypal_ipn_customer_notified + + + sales_flat_order_item.is_nominal + + + sales_flat_order_payment.paybox_request_number + + + weee_tax.entity_type_id + + + catalog_category_entity.entity_type_id + + + catalog_category_entity_datetime.entity_type_id + + + catalog_category_entity_decimal.entity_type_id + + + catalog_category_entity_int.entity_type_id + + + catalog_category_entity_text.entity_type_id + + + catalog_category_entity_varchar.entity_type_id + + + catalog_product_entity.entity_type_id + + + catalog_product_entity_datetime.entity_type_id + + + catalog_product_entity_decimal.entity_type_id + + + catalog_product_entity_gallery.entity_type_id + + + catalog_product_entity_media_gallery.entity_id + + + catalog_product_entity_int.entity_type_id + + + catalog_product_entity_text.entity_type_id + + + catalog_product_entity_varchar.entity_type_id + + + sales_flat_creditmemo.cybersource_token + + + sales_flat_invoice.cybersource_token + + + sales_flat_order_payment.ideal_transaction_checked + + + sales_flat_order_payment.cybersource_token + + + sales_flat_order_payment.ideal_issuer_title + + + sales_flat_order_payment.paybox_question_number + + + sales_flat_order_payment.ideal_issuer_id + + + sales_flat_order_payment.flo2cash_account_id + + + sales_flat_quote_payment.cybersource_token + + + sales_flat_quote_payment.ideal_issuer_id + + + sales_flat_quote_payment.ideal_issuer_list + + + sales_flat_quote_payment.paypal_payer_id + + + sales_flat_quote_payment.paypal_payer_status + + + sales_flat_quote_payment.paypal_correlation_id + + + cms_page.layout_update_xml + + + cms_page.custom_layout_update_xml + + + widget_instance.package_theme + + + newsletter_template.template_text_preprocessed + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + catalogsearch_query.synonym_for + + + sales_flat_quote_payment.cc_exp_month + + + weee_tax.state + + + sendfriend_log.ip + + + rating_option_vote.remote_ip_long + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + + + + + customer_entity + + + customer_entity_datetime + + + customer_entity_decimal + + + customer_entity_int + + + customer_entity_text + + + customer_entity_varchar + + + customer_address_entity + + + customer_address_entity_datetime + + + customer_address_entity_decimal + + + customer_address_entity_int + + + customer_address_entity_text + + + customer_address_entity_varchar + + + ui_bookmark + + + migration_backup_* + + + googleoptimizer_code + + + indexer_state + + + integration + + + mview_state + + + theme + + + theme_file + + + vde_theme_change + + + admin_system_messages + + + catalog_url_rewrite_product_category + + + customer_visitor + + + url_rewrite + + + layout_update + + + layout_link + + + catalog_product_flat_* + + + catalog_category_flat_* + + + catalogindex_eav + + + catalog_eav_attribute + + + catalogsearch_fulltext_index_default + + + customer_eav_attribute + + + customer_eav_attribute_website + + + catalog_product_index_eav + + + catalog_product_index_eav_decimal + + + catalog_product_index_eav_decimal_idx + + + catalog_product_index_eav_decimal_tmp + + + catalog_product_index_eav_idx + + + catalog_product_index_eav_tmp + + + catalog_category_product_index_tmp + + + eav_attribute + + + eav_attribute_group + + + eav_attribute_set + + + eav_entity_attribute + + + eav_entity_type + + + authorization_role + + + authorization_rule + + + setup_module + + + cache + + + cache_tag + + + customer_log + + + flag + + + log_customer + + + log_quote + + + log_summary_type + + + log_summary + + + log_url + + + log_url_info + + + quote_id_mask + + + session + + + sales_sequence_profile + + + sales_sequence_meta + + + sequence_invoice_* + + + sequence_creditmemo_* + + + sequence_order_* + + + sequence_shipment* + + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + + + eav_attribute_option_swatch + + + import_history + + + sales_creditmemo_grid + + + sales_invoice_grid + + + sales_order_grid + + + sales_shipment_grid + + + catalogsearch_fulltext_scope* + + + store_website + + + log_visitor_info + + + log_visitor_online + + + reporting_module_status + + + reporting_orders + + + reporting_system_updates + + + reporting_users + + + reporting_counts + + + admin_passwords + + + catalog_product_entity_media_gallery_value_to_entity + + + catalog_product_entity_media_gallery_value_video + + + catalog_product_entity_tier_price + + + customer_grid_flat + + + admin_user_session + + + password_reset_request_event + + + oauth_token_request_log + + + design_config_grid_flat + + + + + admin_user.interface_locale + + + + + + cataloginventory_stock.website_id + + + + cataloginventory_stock_item.website_id + + + + rating.is_active + + + + + + authorization_role.user_type + + + + + + sales_order_tax_item.amount + + + + + + sales_order_tax_item.base_amount + + + + + + sales_order_tax_item.real_amount + + + + + + sales_order_tax_item.real_base_amount + + + + + + sales_order_tax_item.taxable_item_type + + + + + + oauth_token.user_type + + + + + + widget_instance.theme_id + + + + + + sales_order_status_state.visible_on_front + + + + catalog_product_entity_media_gallery_value.entity_id + + + + catalog_product_entity_media_gallery_value.entity_id + + + catalog_product_entity_media_gallery.media_type + + + catalog_product_entity_media_gallery.disabled + + + catalog_product_entity_media_gallery_value.record_id + + + admin_user.interface_locale + + + admin_user.failures_num + + + admin_user.first_failure + + + admin_user.lock_expires + + + rating.is_active + + + sales_creditmemo.send_email + + + sales_creditmemo.customer_note + + + sales_creditmemo.customer_note_notify + + + sales_invoice.send_email + + + sales_invoice.customer_note + + + sales_invoice.customer_note_notify + + + sales_shipment.send_email + + + sales_shipment.customer_note + + + sales_shipment.customer_note_notify + + + sales_creditmemo_item.tax_ratio + + + sales_invoice_item.tax_ratio + + + authorization_role.user_type + + + cataloginventory_stock.website_id + + + cataloginventory_stock_item.website_id + + + oauth_nonce.consumer_id + + + oauth_token.user_type + + + sales_order_status_state.visible_on_front + + + widget_instance.theme_id + + + sales_order_tax_item.amount + + + sales_order_tax_item.base_amount + + + sales_order_tax_item.real_amount + + + sales_order_tax_item.real_base_amount + + + sales_order_tax_item.associated_item_id + + + sales_order_tax_item.taxable_item_type + + + sales_creditmemo_grid.updated_at + + + sales_invoice_grid.updated_at + + + sales_shipment_grid.updated_at + + + sales_order.send_email + + + checkout_agreement.mode + + + catalog_category_product.entity_id + + + quote_payment.cc_exp_month + + + weee_tax.state + + + sendfriend_log.ip + + + rating_option_vote.remote_ip_long + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + + diff --git a/etc/ce-to-ee/1.9.2.4/config.xml.dist b/etc/ce-to-ee/1.9.2.4/config.xml.dist new file mode 100644 index 000000000..e89543a8b --- /dev/null +++ b/etc/ce-to-ee/1.9.2.4/config.xml.dist @@ -0,0 +1,134 @@ + + + + + + Migration\Step\Settings\Integrity + Migration\Step\Settings\Data + + + Migration\Step\Stores\Integrity + Migration\Step\Stores\Data + Migration\Step\Stores\Volume + + + + + Migration\Step\Eav\Integrity + Migration\Step\Eav\Data + Migration\Step\Eav\Volume + + + Migration\Step\Customer\Integrity + Migration\Step\Customer\Data + Migration\Step\Customer\Volume + + + Migration\Step\Map\Integrity + Migration\Step\Map\Data + Migration\Step\Map\Volume + + + Migration\Step\UrlRewrite\Version191to2000 + Migration\Step\UrlRewrite\Version191to2000 + Migration\Step\UrlRewrite\Version191to2000 + + + Migration\Step\Log\Integrity + Migration\Step\Log\Data + Migration\Step\Log\Volume + + + Migration\Step\Ratings\Integrity + Migration\Step\Ratings\Data + Migration\Step\Ratings\Volume + + + Migration\Step\ConfigurablePrices\Integrity + Migration\Step\ConfigurablePrices\Data + Migration\Step\ConfigurablePrices\Volume + + + Migration\Step\OrderGrids\Integrity + Migration\Step\OrderGrids\Data + Migration\Step\OrderGrids\Volume + + + Migration\Step\TierPrice\Integrity + Migration\Step\TierPrice\Data + Migration\Step\TierPrice\Volume + + + Migration\Step\SalesIncrement\Integrity + Migration\Step\SalesIncrement\Data + Migration\Step\SalesIncrement\Volume + + + + + Migration\Step\Customer\Delta + Migration\Step\Customer\Volume + + + Migration\Step\Map\Delta + Migration\Step\Map\Volume + + + Migration\Step\Log\Delta + Migration\Step\Log\Volume + + + Migration\Step\OrderGrids\Delta + Migration\Step\OrderGrids\Volume + + + Migration\Step\SalesIncrement\Delta + Migration\Step\SalesIncrement\Volume + + + + + + + + + + etc/ce-to-ee/1.9.2.4/map.xml.dist + etc/ce-to-ee/map-eav.xml.dist + etc/ce-to-ee/eav-document-groups.xml.dist + etc/ce-to-ee/eav-attribute-groups.xml.dist + etc/ce-to-ee/map-log.xml.dist + etc/ce-to-ee/log-document-groups.xml.dist + etc/ce-to-ee/settings.xml.dist + etc/ce-to-ee/map-customer.xml.dist + etc/ce-to-ee/customer-document-groups.xml.dist + etc/ce-to-ee/customer-attribute-groups.xml.dist + etc/ce-to-ee/deltalog.xml.dist + etc/ce-to-ee/order-grids-document-groups.xml.dist + etc/ce-to-ee/map-document-groups.xml.dist + etc/ce-to-ee/class-map.xml.dist + + 0 + + 0 + + + 0 + migration.log + %percent%% [%bar%] Remaining Time: %remaining% + 1 + ce-to-ee + + + diff --git a/etc/ce-to-ee/1.9.2.4/map.xml.dist b/etc/ce-to-ee/1.9.2.4/map.xml.dist new file mode 100644 index 000000000..73523879d --- /dev/null +++ b/etc/ce-to-ee/1.9.2.4/map.xml.dist @@ -0,0 +1,2714 @@ + + + + + + + googleshopping_attributes + + + googleshopping_items + + + googleshopping_types + + + sales_flat_creditmemo_grid + + + sales_flat_invoice_grid + + + sales_flat_order_grid + + + sales_flat_shipment_grid + + + customer_entity + + + customer_entity_datetime + + + customer_entity_decimal + + + customer_entity_int + + + customer_entity_text + + + customer_entity_varchar + + + customer_address_entity + + + customer_address_entity_datetime + + + customer_address_entity_decimal + + + customer_address_entity_int + + + customer_address_entity_text + + + customer_address_entity_varchar + + + m2_cl_* + + + url_rewrite_m2* + + + admin_assert + + + api2_acl_attribute + + + api2_acl_role + + + api2_acl_rule + + + api2_acl_user + + + api_assert + + + api_role + + + api_rule + + + api_session + + + api_user + + + log_customer + + + log_quote + + + log_summary_type + + + log_summary + + + log_url + + + log_url_info + + + catalog_category_anc_categs_index_idx + + + catalog_category_anc_categs_index_tmp + + + catalog_category_anc_products_index_idx + + + catalog_category_anc_products_index_tmp + + + catalog_category_flat_cl + + + catalog_category_product_index + + + catalog_category_product_index_cl + + + catalog_category_product_index_enbl_idx + + + catalog_category_product_index_enbl_tmp + + + catalog_category_product_index_idx + + + catalog_category_product_index_tmp + + + catalog_product_enabled_index + + + catalog_product_flat_cl + + + cataloginventory_stock_status_idx + + + cataloginventory_stock_status_tmp + + + catalog_category_product_cat_cl + + + catalog_product_bundle_price_index + + + catalog_product_bundle_stock_index + + + catalog_product_index_group_price + + + catalog_product_index_price + + + catalog_product_index_price* + + + catalog_product_index_tier_price + + + catalog_product_index_website + + + catalogindex_aggregation + + + catalogindex_aggregation_tag + + + catalogindex_aggregation_to_tag + + + catalogindex_minimal_price + + + catalogindex_price + + + core_layout_update + + + core_layout_link + + + widget_instance_page_layout + + + googlecheckout_api_debug + + + ogone_api_debug + + + oscommerce_import + + + oscommerce_import_type + + + oscommerce_orders + + + oscommerce_orders_products + + + oscommerce_orders_status_history + + + oscommerce_orders_total + + + oscommerce_ref + + + paygate_authorizenet_debug + + + paypal_api_debug + + + paypaluk_api_debug + + + amazonpayments_api_debug + + + chronopay_api_debug + + + cybermut_api_debug + + + cybersource_api_debug + + + eway_api_debug + + + flo2cash_api_debug + + + ideal_api_debug + + + paybox_api_debug + + + protx_api_debug + + + googlecheckout_notification + + + index_event + + + index_process + + + index_process_event + + + cataloginventory_stock_status_cl + + + catalogsearch_fulltext + + + catalogsearch_fulltext_cl + + + core_cache_tag + + + core_cache_option + + + core_cache + + + core_flag + + + core_email_queue + + + core_email_queue_recipients + + + merchandiser_category_values + + + merchandiser_vmbuild + + + dataflow_batch + + + dataflow_batch_export + + + dataflow_batch_import + + + dataflow_import_data + + + dataflow_profile + + + dataflow_profile_history + + + dataflow_session + + + core_url_rewrite + + + catalog_product_entity_url_key + + + catalogindex_eav + + + catalog_eav_attribute + + + customer_eav_attribute + + + catalog_product_index_eav + + + catalog_product_index_eav_decimal + + + catalog_product_index_eav_decimal_idx + + + catalog_product_index_eav_decimal_tmp + + + catalog_product_index_eav_idx + + + catalog_product_index_eav_tmp + + + eav_attribute + + + eav_attribute_group + + + eav_attribute_set + + + eav_entity_attribute + + + eav_entity_type + + + catalog_category_entity_url_key + + + poll + + + poll_answer + + + poll_store + + + poll_vote + + + sales_recurring_profile + + + sales_recurring_profile_order + + + tag + + + tag_properties + + + tag_relation + + + tag_summary + + + weee_discount + + + catalogsearch_result + + + log_visitor + + + log_visitor_info + + + log_visitor_online + + + core_config_data + + + s_*b_*_* + + + catalog_product_flat_* + + + catalog_category_flat_* + + + catalog_category_flat_store_* + + + googleoptimizer_code + + + core_resource + + + cron_schedule + + + admin_user + + + admin_role + + + admin_rule + + + admin_role + + + admin_rule + + + catalogrule_affected_product + + + catalog_product_super_attribute_pricing + + + core_website + + + catalog_product_entity_group_price + + + catalog_product_entity_tier_price + + + permission_block + + + permission_variable + + + catalogsearch_query + search_query + + + core_variable + variable + + + core_variable_value + variable_value + + + core_email_template + email_template + + + core_store + store + + + core_store_group + store_group + + + core_translate + translation + + + core_session + session + + + coupon_aggregated + salesrule_coupon_aggregated + + + coupon_aggregated_order + salesrule_coupon_aggregated_order + + + coupon_aggregated_updated + salesrule_coupon_aggregated_updated + + + sales_flat_order + sales_order + + + sales_flat_creditmemo + sales_creditmemo + + + sales_flat_creditmemo_comment + sales_creditmemo_comment + + + sales_flat_creditmemo_item + sales_creditmemo_item + + + sales_flat_invoice + sales_invoice + + + sales_flat_invoice_comment + sales_invoice_comment + + + sales_flat_invoice_item + sales_invoice_item + + + sales_flat_order_address + sales_order_address + + + sales_flat_order_item + sales_order_item + + + sales_flat_order_payment + sales_order_payment + + + sales_flat_order_status_history + sales_order_status_history + + + sales_flat_quote + quote + + + sales_flat_quote_address + quote_address + + + sales_flat_quote_address_item + quote_address_item + + + sales_flat_quote_item + quote_item + + + sales_flat_quote_item_option + quote_item_option + + + sales_flat_quote_payment + quote_payment + + + sales_flat_quote_shipping_rate + quote_shipping_rate + + + sales_flat_shipment + sales_shipment + + + sales_flat_shipment_comment + sales_shipment_comment + + + sales_flat_shipment_item + sales_shipment_item + + + sales_flat_shipment_track + sales_shipment_track + + + core_directory_storage + media_storage_directory_storage + + + core_file_storage + media_storage_file_storage + + + sales_billing_agreement + paypal_billing_agreement + + + sales_billing_agreement_order + paypal_billing_agreement_order + + + + + cms_page.root_template + cms_page.page_layout + + + sales_flat_order.hidden_tax_amount + sales_order.discount_tax_compensation_amount + + + sales_flat_order.base_hidden_tax_amount + sales_order.base_discount_tax_compensation_amount + + + sales_flat_order.shipping_hidden_tax_amount + sales_order.shipping_discount_tax_compensation_amount + + + sales_flat_order.base_shipping_hidden_tax_amnt + sales_order.base_shipping_discount_tax_compensation_amnt + + + sales_flat_order.hidden_tax_invoiced + sales_order.discount_tax_compensation_invoiced + + + sales_flat_order.base_hidden_tax_invoiced + sales_order.base_discount_tax_compensation_invoiced + + + sales_flat_order.hidden_tax_refunded + sales_order.discount_tax_compensation_refunded + + + sales_flat_order.base_hidden_tax_refunded + sales_order.base_discount_tax_compensation_refunded + + + sales_flat_creditmemo.hidden_tax_amount + sales_creditmemo.discount_tax_compensation_amount + + + sales_flat_creditmemo.base_hidden_tax_amount + sales_creditmemo.base_discount_tax_compensation_amount + + + sales_flat_creditmemo.shipping_hidden_tax_amount + sales_creditmemo.shipping_discount_tax_compensation_amount + + + sales_flat_creditmemo.base_shipping_hidden_tax_amnt + sales_creditmemo.base_shipping_discount_tax_compensation_amnt + + + sales_flat_creditmemo_item.hidden_tax_amount + sales_creditmemo_item.discount_tax_compensation_amount + + + sales_flat_creditmemo_item.base_hidden_tax_amount + sales_creditmemo_item.base_discount_tax_compensation_amount + + + sales_flat_invoice.hidden_tax_amount + sales_invoice.discount_tax_compensation_amount + + + sales_flat_invoice.base_hidden_tax_amount + sales_invoice.base_discount_tax_compensation_amount + + + sales_flat_invoice.shipping_hidden_tax_amount + sales_invoice.shipping_discount_tax_compensation_amount + + + sales_flat_invoice.base_shipping_hidden_tax_amnt + sales_invoice.base_shipping_discount_tax_compensation_amnt + + + sales_flat_invoice_item.hidden_tax_amount + sales_invoice_item.discount_tax_compensation_amount + + + sales_flat_invoice_item.base_hidden_tax_amount + sales_invoice_item.base_discount_tax_compensation_amount + + + sales_flat_order_item.hidden_tax_amount + sales_order_item.discount_tax_compensation_amount + + + sales_flat_order_item.base_hidden_tax_amount + sales_order_item.base_discount_tax_compensation_amount + + + sales_flat_order_item.hidden_tax_invoiced + sales_order_item.discount_tax_compensation_invoiced + + + sales_flat_order_item.base_hidden_tax_invoiced + sales_order_item.base_discount_tax_compensation_invoiced + + + sales_flat_order_item.hidden_tax_refunded + sales_order_item.discount_tax_compensation_refunded + + + sales_flat_order_item.base_hidden_tax_refunded + sales_order_item.base_discount_tax_compensation_refunded + + + sales_flat_order_item.hidden_tax_canceled + sales_order_item.discount_tax_compensation_canceled + + + sales_flat_order_payment.cc_last4 + sales_order_payment.cc_last_4 + + + sales_flat_quote_payment.cc_last4 + quote_payment.cc_last_4 + + + sales_flat_quote_address.hidden_tax_amount + quote_address.discount_tax_compensation_amount + + + sales_flat_quote_address.base_hidden_tax_amount + quote_address.base_discount_tax_compensation_amount + + + sales_flat_quote_address.shipping_hidden_tax_amount + quote_address.shipping_discount_tax_compensation_amount + + + sales_flat_quote_address.base_shipping_hidden_tax_amnt + quote_address.base_shipping_discount_tax_compensation_amnt + + + sales_flat_quote_address_item.hidden_tax_amount + quote_address_item.discount_tax_compensation_amount + + + sales_flat_quote_address_item.base_hidden_tax_amount + quote_address_item.base_discount_tax_compensation_amount + + + sales_flat_quote_item.hidden_tax_amount + quote_item.discount_tax_compensation_amount + + + sales_flat_quote_item.base_hidden_tax_amount + quote_item.base_discount_tax_compensation_amount + + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + catalog_category_entity_varchar.value + + + + + + + catalog_product_entity_varchar.value + + + + + + + cms_page.root_template + + + + + + cms_block.content + + + + cms_page.content + + + + newsletter_template.template_text + + + + core_email_template.template_text + + + + widget_instance.instance_type + + + + catalogrule.conditions_serialized + + + + catalogrule.actions_serialized + + + + salesrule.conditions_serialized + + + + salesrule.actions_serialized + + + + sales_flat_order_item.weee_tax_applied + + + + sales_flat_quote_item.weee_tax_applied + + + + sales_flat_creditmemo_item.weee_tax_applied + + + + sales_flat_invoice_item.weee_tax_applied + + + + rating_option_vote.remote_ip_long + + + + sendfriend_log.ip + + + + catalog_product_entity_media_gallery.value_id + + + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + + + admin_rule.role_type + + + admin_rule.assert_id + + + core_website.is_staging + + + core_website.master_login + + + core_website.master_password + + + core_website.visibility + + + sales_order_tax.hidden + + + sales_flat_order.paypal_ipn_customer_notified + + + sales_flat_order_item.is_nominal + + + sales_flat_order_payment.paybox_request_number + + + weee_tax.entity_type_id + + + catalog_category_entity.entity_type_id + + + catalog_category_entity_datetime.entity_type_id + + + catalog_category_entity_decimal.entity_type_id + + + catalog_category_entity_int.entity_type_id + + + catalog_category_entity_text.entity_type_id + + + catalog_category_entity_varchar.entity_type_id + + + catalog_product_entity.entity_type_id + + + catalog_product_entity_datetime.entity_type_id + + + catalog_product_entity_decimal.entity_type_id + + + catalog_product_entity_gallery.entity_type_id + + + catalog_product_entity_media_gallery.entity_id + + + catalog_product_entity_int.entity_type_id + + + catalog_product_entity_text.entity_type_id + + + catalog_product_entity_varchar.entity_type_id + + + sales_flat_creditmemo.cybersource_token + + + sales_flat_invoice.cybersource_token + + + sales_flat_order_payment.ideal_transaction_checked + + + sales_flat_order_payment.cybersource_token + + + sales_flat_order_payment.ideal_issuer_title + + + sales_flat_order_payment.paybox_question_number + + + sales_flat_order_payment.ideal_issuer_id + + + sales_flat_order_payment.flo2cash_account_id + + + sales_flat_quote_payment.cybersource_token + + + sales_flat_quote_payment.ideal_issuer_id + + + sales_flat_quote_payment.ideal_issuer_list + + + sales_flat_quote_payment.paypal_payer_id + + + sales_flat_quote_payment.paypal_payer_status + + + sales_flat_quote_payment.paypal_correlation_id + + + cms_page.layout_update_xml + + + cms_page.custom_layout_update_xml + + + widget_instance.package_theme + + + newsletter_template.template_text_preprocessed + + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + sales_flat_quote_payment.cc_exp_month + + + weee_tax.state + + + sendfriend_log.ip + + + rating_option_vote.remote_ip_long + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + + + + + customer_entity + + + customer_entity_datetime + + + customer_entity_decimal + + + customer_entity_int + + + customer_entity_text + + + customer_entity_varchar + + + customer_address_entity + + + customer_address_entity_datetime + + + customer_address_entity_decimal + + + customer_address_entity_int + + + customer_address_entity_text + + + customer_address_entity_varchar + + + ui_bookmark + + + migration_backup_* + + + googleoptimizer_code + + + indexer_state + + + integration + + + mview_state + + + theme + + + theme_file + + + vde_theme_change + + + admin_system_messages + + + catalog_url_rewrite_product_category + + + customer_visitor + + + url_rewrite + + + layout_update + + + layout_link + + + catalog_product_flat_* + + + catalog_category_flat_* + + + catalogindex_eav + + + catalog_eav_attribute + + + catalogsearch_fulltext_index_default + + + customer_eav_attribute + + + customer_eav_attribute_website + + + catalog_product_index_eav + + + catalog_product_index_eav_decimal + + + catalog_product_index_eav_decimal_idx + + + catalog_product_index_eav_decimal_tmp + + + catalog_product_index_eav_idx + + + catalog_product_index_eav_tmp + + + catalog_category_product_index_tmp + + + eav_attribute + + + eav_attribute_group + + + eav_attribute_set + + + eav_entity_attribute + + + eav_entity_type + + + authorization_role + + + authorization_rule + + + setup_module + + + cache + + + cache_tag + + + customer_log + + + flag + + + log_customer + + + log_quote + + + log_summary_type + + + log_summary + + + log_url + + + log_url_info + + + quote_id_mask + + + session + + + sales_sequence_profile + + + sales_sequence_meta + + + sequence_invoice_* + + + sequence_creditmemo_* + + + sequence_order_* + + + sequence_shipment* + + + sequence_rma_item_* + + + catalogsearch_recommendations + + + enterprise_admin_passwords + + + magento_banner + + + magento_banner_catalogrule + + + magento_banner_content + + + magento_banner_customersegment + + + magento_banner_salesrule + + + magento_catalogevent_event + + + magento_catalogevent_event_image + + + magento_catalogpermissions + + + magento_catalogpermissions_index + + + magento_catalogpermissions_index_product + + + magento_catalogpermissions_index_product_tmp + + + magento_catalogpermissions_index_tmp + + + magento_customerbalance + + + magento_customerbalance_history + + + magento_customercustomattributes_sales_flat_order + + + magento_customercustomattributes_sales_flat_order_address + + + magento_customercustomattributes_sales_flat_quote + + + magento_customercustomattributes_sales_flat_quote_address + + + magento_customersegment_customer + + + magento_customersegment_event + + + magento_customersegment_segment + + + magento_customersegment_website + + + magento_giftcard_amount + + + magento_giftcardaccount + + + magento_giftcardaccount_history + + + magento_giftcardaccount_pool + + + magento_giftregistry_data + + + magento_giftregistry_entity + + + magento_giftregistry_item + + + magento_giftregistry_item_option + + + magento_giftregistry_label + + + magento_giftregistry_person + + + magento_giftregistry_type + + + magento_giftregistry_type_info + + + magento_giftwrapping + + + magento_giftwrapping_store_attributes + + + magento_giftwrapping_website + + + magento_invitation + + + magento_invitation_status_history + + + magento_invitation_track + + + magento_logging_event + + + magento_logging_event_changes + + + magento_reminder_rule + + + magento_reminder_rule_coupon + + + magento_reminder_rule_log + + + magento_reminder_rule_website + + + magento_reminder_template + + + magento_reward + + + magento_reward_history + + + magento_reward_rate + + + magento_reward_salesrule + + + magento_rma + + + magento_rma_grid + + + sales_creditmemo_grid + + + sales_invoice_grid + + + sales_order_grid + + + sales_shipment_grid + + + magento_rma_item_eav_attribute + + + magento_rma_item_eav_attribute_website + + + magento_rma_item_entity + + + magento_rma_item_entity_datetime + + + magento_rma_item_entity_decimal + + + magento_rma_item_entity_int + + + magento_rma_item_entity_text + + + magento_rma_item_entity_varchar + + + magento_rma_item_form_attribute + + + magento_rma_shipping_label + + + magento_rma_status_history + + + magento_sales_creditmemo_grid_archive + + + magento_sales_invoice_grid_archive + + + magento_sales_order_grid_archive + + + store_website + + + support_report + + + magento_sales_shipment_grid_archive + + + magento_scheduled_operations + + + magento_targetrule + + + magento_targetrule_customersegment + + + magento_targetrule_index + + + magento_targetrule_index_crosssell + + + magento_targetrule_index_crosssell_product + + + magento_targetrule_index_related + + + magento_targetrule_index_related_product + + + magento_targetrule_index_upsell + + + magento_targetrule_index_upsell_product + + + magento_targetrule_product + + + magento_versionscms_hierarchy_lock + + + magento_versionscms_hierarchy_metadata + + + magento_versionscms_hierarchy_node + + + magento_versionscms_increment + + + magento_versionscms_page_revision + + + magento_versionscms_page_version + + + paypal_billing_agreement + + + paypal_billing_agreement_order + + + eav_attribute_option_swatch + + + import_history + + + catalogsearch_fulltext_scope* + + + log_visitor_info + + + log_visitor_online + + + reporting_module_status + + + reporting_orders + + + reporting_system_updates + + + reporting_users + + + reporting_counts + + + queue + + + queue_message + + + queue_message_status + + + admin_passwords + + + support_backup + + + support_backup_item + + + catalog_product_entity_media_gallery_value_to_entity + + + catalog_product_entity_media_gallery_value_video + + + catalog_product_entity_tier_price + + + customer_grid_flat + + + visual_merchandiser_rule + + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + + + admin_user.interface_locale + + + + + + cataloginventory_stock.website_id + + + + cataloginventory_stock_item.website_id + + + + rating.is_active + + + + + + authorization_role.user_type + + + + + + sales_order_tax_item.amount + + + + + + sales_order_tax_item.base_amount + + + + + + sales_order_tax_item.real_amount + + + + + + sales_order_tax_item.real_base_amount + + + + + + sales_order_tax_item.taxable_item_type + + + + + + oauth_token.user_type + + + + + + widget_instance.theme_id + + + + + + sales_order_status_state.visible_on_front + + + + catalog_product_entity_media_gallery_value.entity_id + + + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + + + catalog_product_entity_media_gallery_value.entity_id + + + catalog_product_entity_media_gallery.media_type + + + catalog_product_entity_media_gallery.disabled + + + catalog_product_entity_media_gallery_value.record_id + + + admin_user.interface_locale + + + rating.is_active + + + sales_creditmemo.send_email + + + sales_creditmemo.customer_note + + + sales_creditmemo.customer_note_notify + + + sales_invoice.send_email + + + sales_invoice.customer_note + + + sales_invoice.customer_note_notify + + + sales_shipment.send_email + + + sales_shipment.customer_note + + + sales_shipment.customer_note_notify + + + sales_creditmemo_item.tax_ratio + + + sales_invoice_item.tax_ratio + + + authorization_role.user_type + + + cataloginventory_stock.website_id + + + cataloginventory_stock_item.website_id + + + oauth_nonce.consumer_id + + + oauth_token.user_type + + + sales_order_status_state.visible_on_front + + + widget_instance.theme_id + + + sales_order_tax_item.amount + + + sales_order_tax_item.base_amount + + + sales_order_tax_item.real_amount + + + sales_order_tax_item.real_base_amount + + + sales_order_tax_item.associated_item_id + + + sales_order_tax_item.taxable_item_type + + + sales_creditmemo_grid.updated_at + + + sales_invoice_grid.updated_at + + + sales_shipment_grid.updated_at + + + sales_order.send_email + + + admin_user.failures_num + + + admin_user.first_failure + + + admin_user.lock_expires + + + cms_page.published_revision_id + + + cms_page.website_root + + + cms_page.under_version_control + + + quote.customer_balance_amount_used + + + quote.base_customer_bal_amount_used + + + quote.use_customer_balance + + + quote.gift_cards + + + quote.gift_cards_amount + + + quote.base_gift_cards_amount + + + quote.gift_cards_amount_used + + + quote.base_gift_cards_amount_used + + + quote.gw_id + + + quote.gw_allow_gift_receipt + + + quote.gw_add_card + + + quote.gw_base_price + + + quote.gw_price + + + quote.gw_items_base_price + + + quote.gw_items_price + + + quote.gw_card_base_price + + + quote.gw_card_price + + + quote.gw_base_tax_amount + + + quote.gw_tax_amount + + + quote.gw_items_base_tax_amount + + + quote.gw_items_tax_amount + + + quote.gw_card_base_tax_amount + + + quote.gw_card_tax_amount + + + quote.use_reward_points + + + quote.reward_points_balance + + + quote.base_reward_currency_amount + + + quote.reward_currency_amount + + + quote_address.base_customer_balance_amount + + + quote_address.customer_balance_amount + + + quote_address.gift_cards_amount + + + quote_address.base_gift_cards_amount + + + quote_address.gift_cards + + + quote_address.used_gift_cards + + + quote_address.gw_id + + + quote_address.gw_allow_gift_receipt + + + quote_address.gw_add_card + + + quote_address.gw_base_price + + + quote_address.gw_price + + + quote_address.gw_items_base_price + + + quote_address.gw_items_price + + + quote_address.gw_card_base_price + + + quote_address.gw_card_price + + + quote_address.gw_base_tax_amount + + + quote_address.gw_tax_amount + + + quote_address.gw_items_base_tax_amount + + + quote_address.gw_items_tax_amount + + + quote_address.gw_card_base_tax_amount + + + quote_address.gw_card_tax_amount + + + quote_address.reward_points_balance + + + quote_address.base_reward_currency_amount + + + quote_address.reward_currency_amount + + + quote_address.giftregistry_item_id + + + quote_address_item.gw_id + + + quote_address_item.gw_base_price + + + quote_address_item.gw_price + + + quote_address_item.gw_base_tax_amount + + + quote_address_item.gw_tax_amount + + + quote_item.gw_id + + + quote_item.gw_base_price + + + quote_item.gw_price + + + quote_item.gw_base_tax_amount + + + quote_item.gw_tax_amount + + + quote_item.event_id + + + quote_item.giftregistry_item_id + + + sales_creditmemo.base_customer_balance_amount + + + sales_creditmemo.customer_balance_amount + + + sales_creditmemo.bs_customer_bal_total_refunded + + + sales_creditmemo.customer_bal_total_refunded + + + sales_creditmemo.base_gift_cards_amount + + + sales_creditmemo.gift_cards_amount + + + sales_creditmemo.gw_base_price + + + sales_creditmemo.gw_price + + + sales_creditmemo.gw_items_base_price + + + sales_creditmemo.gw_items_price + + + sales_creditmemo.gw_card_base_price + + + sales_creditmemo.gw_card_price + + + sales_creditmemo.gw_base_tax_amount + + + sales_creditmemo.gw_tax_amount + + + sales_creditmemo.gw_items_base_tax_amount + + + sales_creditmemo.gw_items_tax_amount + + + sales_creditmemo.gw_card_base_tax_amount + + + sales_creditmemo.gw_card_tax_amount + + + sales_creditmemo.base_reward_currency_amount + + + sales_creditmemo.reward_currency_amount + + + sales_creditmemo.reward_points_balance + + + sales_creditmemo.reward_points_balance_refund + + + sales_invoice.base_customer_balance_amount + + + sales_invoice.customer_balance_amount + + + sales_invoice.base_gift_cards_amount + + + sales_invoice.gift_cards_amount + + + sales_invoice.gw_base_price + + + sales_invoice.gw_price + + + sales_invoice.gw_items_base_price + + + sales_invoice.gw_items_price + + + sales_invoice.gw_card_base_price + + + sales_invoice.gw_card_price + + + sales_invoice.gw_base_tax_amount + + + sales_invoice.gw_tax_amount + + + sales_invoice.gw_items_base_tax_amount + + + sales_invoice.gw_items_tax_amount + + + sales_invoice.gw_card_base_tax_amount + + + sales_invoice.gw_card_tax_amount + + + sales_invoice.base_reward_currency_amount + + + sales_invoice.reward_currency_amount + + + sales_invoice.reward_points_balance + + + sales_order.base_customer_balance_amount + + + sales_order.customer_balance_amount + + + sales_order.base_customer_balance_invoiced + + + sales_order.customer_balance_invoiced + + + sales_order.base_customer_balance_refunded + + + sales_order.customer_balance_refunded + + + sales_order.bs_customer_bal_total_refunded + + + sales_order.customer_bal_total_refunded + + + sales_order.gift_cards + + + sales_order.base_gift_cards_amount + + + sales_order.gift_cards_amount + + + sales_order.base_gift_cards_invoiced + + + sales_order.gift_cards_invoiced + + + sales_order.base_gift_cards_refunded + + + sales_order.gift_cards_refunded + + + sales_order.gw_id + + + sales_order.gw_allow_gift_receipt + + + sales_order.gw_add_card + + + sales_order.gw_base_price + + + sales_order.gw_price + + + sales_order.gw_items_base_price + + + sales_order.gw_items_price + + + sales_order.gw_card_base_price + + + sales_order.gw_card_price + + + sales_order.gw_base_tax_amount + + + sales_order.gw_tax_amount + + + sales_order.gw_items_base_tax_amount + + + sales_order.gw_items_tax_amount + + + sales_order.gw_card_base_tax_amount + + + sales_order.gw_card_tax_amount + + + sales_order.gw_base_price_invoiced + + + sales_order.gw_price_invoiced + + + sales_order.gw_items_base_price_invoiced + + + sales_order.gw_items_price_invoiced + + + sales_order.gw_card_base_price_invoiced + + + sales_order.gw_card_price_invoiced + + + sales_order.gw_base_tax_amount_invoiced + + + sales_order.gw_tax_amount_invoiced + + + sales_order.gw_items_base_tax_invoiced + + + sales_order.gw_items_tax_invoiced + + + sales_order.gw_card_base_tax_invoiced + + + sales_order.gw_card_tax_invoiced + + + sales_order.gw_base_price_refunded + + + sales_order.gw_price_refunded + + + sales_order.gw_items_base_price_refunded + + + sales_order.gw_items_price_refunded + + + sales_order.gw_card_base_price_refunded + + + sales_order.gw_card_price_refunded + + + sales_order.gw_base_tax_amount_refunded + + + sales_order.gw_tax_amount_refunded + + + sales_order.gw_items_base_tax_refunded + + + sales_order.gw_items_tax_refunded + + + sales_order.gw_card_base_tax_refunded + + + sales_order.gw_card_tax_refunded + + + sales_order.reward_points_balance + + + sales_order.base_reward_currency_amount + + + sales_order.reward_currency_amount + + + sales_order.base_rwrd_crrncy_amt_invoiced + + + sales_order.rwrd_currency_amount_invoiced + + + sales_order.base_rwrd_crrncy_amnt_refnded + + + sales_order.rwrd_crrncy_amnt_refunded + + + sales_order.reward_points_balance_refund + + + sales_order_address.giftregistry_item_id + + + sales_order_item.qty_returned + + + sales_order_item.gw_id + + + sales_order_item.gw_base_price + + + sales_order_item.gw_price + + + sales_order_item.gw_base_tax_amount + + + sales_order_item.gw_tax_amount + + + sales_order_item.gw_base_price_invoiced + + + sales_order_item.gw_price_invoiced + + + sales_order_item.gw_base_tax_amount_invoiced + + + sales_order_item.gw_tax_amount_invoiced + + + sales_order_item.gw_base_price_refunded + + + sales_order_item.gw_price_refunded + + + sales_order_item.gw_base_tax_amount_refunded + + + sales_order_item.gw_tax_amount_refunded + + + sales_order_item.event_id + + + sales_order_item.giftregistry_item_id + + + wishlist.name + + + wishlist.visibility + + + checkout_agreement.mode + + + cataloginventory_stock_item.deferred_stock_update + + + cataloginventory_stock_item.use_config_deferred_stock_update + + + quote.gw_base_price_incl_tax + + + quote.gw_price_incl_tax + + + quote.gw_items_base_price_incl_tax + + + quote.gw_items_price_incl_tax + + + quote.gw_card_base_price_incl_tax + + + quote.gw_card_price_incl_tax + + + quote_address.gw_base_price_incl_tax + + + quote_address.gw_price_incl_tax + + + quote_address.gw_items_base_price_incl_tax + + + quote_address.gw_items_price_incl_tax + + + quote_address.gw_card_base_price_incl_tax + + + quote_address.gw_card_price_incl_tax + + + sales_order.gw_base_price_incl_tax + + + sales_order.gw_price_incl_tax + + + sales_order.gw_items_base_price_incl_tax + + + sales_order.gw_items_price_incl_tax + + + sales_order.gw_card_base_price_incl_tax + + + sales_order.gw_card_price_incl_tax + + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + + + quote_payment.cc_exp_month + + + weee_tax.state + + + sendfriend_log.ip + + + rating_option_vote.remote_ip_long + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + + diff --git a/etc/ee-to-ee/1.14.2.4/config.xml.dist b/etc/ee-to-ee/1.14.2.4/config.xml.dist new file mode 100644 index 000000000..dbe21314f --- /dev/null +++ b/etc/ee-to-ee/1.14.2.4/config.xml.dist @@ -0,0 +1,162 @@ + + + + + + Migration\Step\Settings\Integrity + Migration\Step\Settings\Data + + + Migration\Step\Stores\Integrity + Migration\Step\Stores\Data + Migration\Step\Stores\Volume + + + + + Migration\Step\Eav\Integrity + Migration\Step\Eav\Data + Migration\Step\Eav\Volume + + + Migration\Step\CustomCustomerAttributes\Integrity + Migration\Step\CustomCustomerAttributes\Data + Migration\Step\CustomCustomerAttributes\Volume + + + Migration\Step\Customer\Integrity + Migration\Step\Customer\Data + Migration\Step\Customer\Volume + + + Migration\Step\Map\Integrity + Migration\Step\Map\Data + Migration\Step\Map\Volume + + + Migration\Step\UrlRewrite\Version11410to2000 + Migration\Step\UrlRewrite\Version11410to2000 + Migration\Step\UrlRewrite\Version11410to2000 + + + Migration\Step\Log\Integrity + Migration\Step\Log\Data + Migration\Step\Log\Volume + + + Migration\Step\Ratings\Integrity + Migration\Step\Ratings\Data + Migration\Step\Ratings\Volume + + + Migration\Step\SalesOrder\Integrity + Migration\Step\SalesOrder\Data + Migration\Step\SalesOrder\Volume + + + Migration\Step\ConfigurablePrices\Integrity + Migration\Step\ConfigurablePrices\Data + Migration\Step\ConfigurablePrices\Volume + + + Migration\Step\OrderGridsEE\Integrity + Migration\Step\OrderGridsEE\Data + Migration\Step\OrderGridsEE\Volume + + + Migration\Step\TierPrice\Integrity + Migration\Step\TierPrice\Data + Migration\Step\TierPrice\Volume + + + Migration\Step\SalesIncrement\Integrity + Migration\Step\SalesIncrement\Data + Migration\Step\SalesIncrement\Volume + + + Migration\Step\VisualMerchandiser\Integrity + Migration\Step\VisualMerchandiser\Data + Migration\Step\VisualMerchandiser\Volume + + + + + Migration\Step\CustomCustomerAttributes\Delta + Migration\Step\CustomCustomerAttributes\Volume + + + Migration\Step\Customer\Delta + Migration\Step\Customer\Volume + + + Migration\Step\Map\Delta + + + Migration\Step\Log\Delta + Migration\Step\Log\Volume + + + Migration\Step\SalesOrder\Delta + Migration\Step\SalesOrder\Volume + + + Migration\Step\OrderGridsEE\Delta + Migration\Step\OrderGridsEE\Volume + + + Migration\Step\SalesIncrement\Delta + Migration\Step\SalesIncrement\Volume + + + + + + + + + + etc/ee-to-ee/1.14.2.4/map.xml.dist + etc/ee-to-ee/map-eav.xml.dist + etc/ee-to-ee/eav-document-groups.xml.dist + etc/ee-to-ee/eav-attribute-groups.xml.dist + etc/ee-to-ee/map-log.xml.dist + etc/ee-to-ee/log-document-groups.xml.dist + etc/ee-to-ee/settings.xml.dist + etc/ee-to-ee/map-customer.xml.dist + etc/ee-to-ee/customer-document-groups.xml.dist + etc/ee-to-ee/customer-attribute-groups.xml.dist + etc/ee-to-ee/map-sales.xml.dist + etc/ee-to-ee/deltalog.xml.dist + etc/ee-to-ee/customer-attr-map.xml.dist + etc/ee-to-ee/customer-attr-document-groups.xml.dist + etc/ee-to-ee/order-grids-document-groups.xml.dist + etc/ee-to-ee/class-map.xml.dist + etc/ee-to-ee/visual_merchandiser_map.xml.dist + etc/ee-to-ee/visual_merchandiser_document_groups.xml.dist + etc/ee-to-ee/visual_merchandiser_attribute_groups.xml.dist + etc/ee-to-ee/map-document-groups.xml.dist + + 0 + + 0 + + + 0 + migration.log + %percent%% [%bar%] Remaining Time: %remaining% + 1 + ee-to-ee + + + 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 new file mode 100644 index 000000000..b275d3df9 --- /dev/null +++ b/etc/ee-to-ee/1.14.2.4/map.xml.dist @@ -0,0 +1,2441 @@ + + + + + + + googleshopping_attributes + + + googleshopping_items + + + googleshopping_types + + + enterprise_sales_creditmemo_grid_archive + + + enterprise_sales_invoice_grid_archive + + + enterprise_sales_order_grid_archive + + + enterprise_sales_shipment_grid_archive + + + sales_flat_creditmemo_grid + + + sales_flat_invoice_grid + + + sales_flat_order_grid + + + sales_flat_shipment_grid + + + customer_entity + + + customer_entity_datetime + + + customer_entity_decimal + + + customer_entity_int + + + customer_entity_text + + + customer_entity_varchar + + + customer_address_entity + + + customer_address_entity_datetime + + + customer_address_entity_decimal + + + customer_address_entity_int + + + customer_address_entity_text + + + customer_address_entity_varchar + + + m2_cl_* + + + url_rewrite_m2* + + + admin_assert + + + api2_acl_attribute + + + api2_acl_role + + + api2_acl_rule + + + api2_acl_user + + + api_assert + + + api_role + + + api_rule + + + api_session + + + api_user + + + log_customer + + + log_quote + + + log_summary_type + + + log_summary + + + log_url + + + log_url_info + + + catalog_category_anc_categs_index_idx + + + catalog_category_anc_categs_index_tmp + + + catalog_category_anc_products_index_idx + + + catalog_category_anc_products_index_tmp + + + catalog_category_flat_cl + + + catalog_category_product_index + + + catalog_category_product_index_cl + + + catalog_category_product_index_enbl_idx + + + catalog_category_product_index_enbl_tmp + + + catalog_category_product_index_idx + + + catalog_category_product_index_tmp + + + catalog_product_enabled_index + + + catalog_product_flat_cl + + + cataloginventory_stock_status_idx + + + cataloginventory_stock_status_tmp + + + catalog_category_product_cat_cl + + + catalog_product_bundle_price_index + + + catalog_product_bundle_stock_index + + + catalog_product_index_group_price + + + catalog_product_index_price + + + catalog_product_index_price* + + + catalog_product_index_tier_price + + + catalog_product_index_website + + + catalogindex_aggregation + + + catalogindex_aggregation_tag + + + catalogindex_aggregation_to_tag + + + catalogindex_minimal_price + + + catalogindex_price + + + core_layout_update + + + core_layout_link + + + widget_instance_page_layout + + + enterprise_queue_queue + + + enterprise_queue_task + + + find_feed_import_codes + + + googlebase_attributes + + + googlebase_items + + + googlebase_types + + + googlecheckout_api_debug + + + ogone_api_debug + + + oscommerce_import + + + oscommerce_import_type + + + oscommerce_orders + + + oscommerce_orders_products + + + oscommerce_orders_status_history + + + oscommerce_orders_total + + + oscommerce_ref + + + paygate_authorizenet_debug + + + paypal_api_debug + + + paypaluk_api_debug + + + amazonpayments_api_debug + + + chronopay_api_debug + + + cybermut_api_debug + + + cybersource_api_debug + + + eway_api_debug + + + flo2cash_api_debug + + + ideal_api_debug + + + paybox_api_debug + + + paybox_question_number + + + protx_api_debug + + + social_facebook_actions + + + strikeiron_tax_rate + + + xmlconnect_application + + + xmlconnect_config_data + + + xmlconnect_history + + + xmlconnect_images + + + xmlconnect_notification_template + + + xmlconnect_queue + + + googlecheckout_notification + + + index_event + + + index_process + + + index_process_event + + + cataloginventory_stock_status_cl + + + catalogsearch_fulltext + + + catalogsearch_fulltext_cl + + + core_cache_tag + + + core_cache_option + + + core_cache + + + core_flag + + + core_email_queue + + + core_email_queue_recipients + + + merchandiser_category_values + + + merchandiser_vmbuild + + + dataflow_batch + + + dataflow_batch_export + + + dataflow_batch_import + + + dataflow_import_data + + + dataflow_profile + + + dataflow_profile_history + + + dataflow_session + + + core_url_rewrite + + + catalog_product_entity_url_key + + + catalogindex_eav + + + catalog_eav_attribute + + + customer_eav_attribute + + + catalog_product_index_eav + + + catalog_product_index_eav_decimal + + + catalog_product_index_eav_decimal_idx + + + catalog_product_index_eav_decimal_tmp + + + catalog_product_index_eav_idx + + + catalog_product_index_eav_tmp + + + eav_attribute + + + eav_attribute_group + + + eav_attribute_set + + + eav_entity_attribute + + + eav_entity_type + + + catalog_category_entity_url_key + + + poll + + + poll_answer + + + poll_store + + + poll_vote + + + sales_recurring_profile + + + sales_recurring_profile_order + + + tag + + + tag_properties + + + tag_relation + + + tag_summary + + + weee_discount + + + catalogsearch_result + + + log_visitor + + + log_visitor_info + + + log_visitor_online + + + core_config_data + + + s_*b_*_* + + + catalog_product_flat_* + + + catalog_category_flat_* + + + catalog_category_flat_store_* + + + googleoptimizer_code + + + core_resource + + + cron_schedule + + + admin_user + + + enterprise_admin_passwords + + + admin_role + + + admin_rule + + + sales_flat_order + + + admin_role + + + admin_rule + + + enterprise_url_rewrite + + + enterprise_url_rewrite_category_cl + + + enterprise_url_rewrite_product_cl + + + enterprise_url_rewrite_redirect + + + enterprise_url_rewrite_redirect_cl + + + enterprise_url_rewrite_redirect_rewrite + + + enterprise_catalog_category_rewrite + + + enterprise_catalog_product_rewrite + + + enterprise_catalogpermissions_index + + + enterprise_catalogpermissions_index_product + + + enterprise_rma_item_eav_attribute + + + enterprise_rma_item_eav_attribute_website + + + enterprise_customer_sales_flat_order + + + enterprise_customer_sales_flat_order_address + + + enterprise_customer_sales_flat_quote + + + enterprise_customer_sales_flat_quote_address + + + enterprise_targetrule_index + + + enterprise_targetrule_index_crosssell + + + enterprise_targetrule_index_crosssell_product + + + enterprise_targetrule_index_related + + + enterprise_targetrule_index_related_product + + + enterprise_targetrule_index_upsell + + + enterprise_targetrule_index_upsell_product + + + enterprise_staging + + + enterprise_staging_action + + + enterprise_staging_item + + + enterprise_staging_log + + + core_session + + + enterprise_staging_product_unlinked + + + enterprise_support_backup + + + enterprise_support_backup_item + + + enterprise_support_sysreport + + + enterprise_mview_event + + + enterprise_mview_metadata + + + enterprise_mview_metadata_event + + + enterprise_mview_metadata_group + + + enterprise_mview_subscriber + + + enterprise_index_multiplier + + + catalogrule_affected_product + + + catalog_product_super_attribute_pricing + + + core_website + + + catalog_product_entity_group_price + + + catalog_product_entity_tier_price + + + permission_block + + + permission_variable + + + enterprise_cms_page_revision + + + enterprise_cms_page_version + + + catalogsearch_query + search_query + + + core_variable + variable + + + core_variable_value + variable_value + + + core_email_template + email_template + + + core_store + store + + + core_store_group + store_group + + + core_translate + translation + + + core_session + session + + + coupon_aggregated + salesrule_coupon_aggregated + + + coupon_aggregated_order + salesrule_coupon_aggregated_order + + + coupon_aggregated_updated + salesrule_coupon_aggregated_updated + + + sales_flat_creditmemo + sales_creditmemo + + + sales_flat_creditmemo_comment + sales_creditmemo_comment + + + sales_flat_creditmemo_item + sales_creditmemo_item + + + sales_flat_invoice + sales_invoice + + + sales_flat_invoice_comment + sales_invoice_comment + + + sales_flat_invoice_item + sales_invoice_item + + + sales_flat_order_address + sales_order_address + + + sales_flat_order_item + sales_order_item + + + sales_flat_order_payment + sales_order_payment + + + sales_flat_order_status_history + sales_order_status_history + + + sales_flat_quote + quote + + + sales_flat_quote_address + quote_address + + + sales_flat_quote_address_item + quote_address_item + + + sales_flat_quote_item + quote_item + + + sales_flat_quote_item_option + quote_item_option + + + sales_flat_quote_payment + quote_payment + + + sales_flat_quote_shipping_rate + quote_shipping_rate + + + sales_flat_shipment + sales_shipment + + + sales_flat_shipment_comment + sales_shipment_comment + + + sales_flat_shipment_item + sales_shipment_item + + + sales_flat_shipment_track + sales_shipment_track + + + sales_billing_agreement + paypal_billing_agreement + + + sales_billing_agreement_order + paypal_billing_agreement_order + + + enterprise_rma + magento_rma + + + enterprise_rma_item_entity + magento_rma_item_entity + + + enterprise_rma_item_entity_datetime + magento_rma_item_entity_datetime + + + enterprise_rma_item_entity_decimal + magento_rma_item_entity_decimal + + + enterprise_rma_item_entity_int + magento_rma_item_entity_int + + + enterprise_rma_item_entity_text + magento_rma_item_entity_text + + + enterprise_rma_item_entity_varchar + magento_rma_item_entity_varchar + + + enterprise_rma_item_form_attribute + magento_rma_item_form_attribute + + + enterprise_rma_shipping_label + magento_rma_shipping_label + + + enterprise_rma_status_history + magento_rma_status_history + + + enterprise_banner + magento_banner + + + enterprise_banner_catalogrule + magento_banner_catalogrule + + + enterprise_banner_content + magento_banner_content + + + enterprise_banner_customersegment + magento_banner_customersegment + + + enterprise_banner_salesrule + magento_banner_salesrule + + + enterprise_catalogevent_event + magento_catalogevent_event + + + enterprise_catalogevent_event_image + magento_catalogevent_event_image + + + enterprise_catalogpermissions + magento_catalogpermissions + + + enterprise_cms_hierarchy_lock + magento_versionscms_hierarchy_lock + + + enterprise_cms_hierarchy_metadata + magento_versionscms_hierarchy_metadata + + + enterprise_cms_hierarchy_node + magento_versionscms_hierarchy_node + + + enterprise_cms_increment + magento_versionscms_increment + + + enterprise_customerbalance + magento_customerbalance + + + enterprise_customerbalance_history + magento_customerbalance_history + + + enterprise_customersegment_customer + magento_customersegment_customer + + + enterprise_customersegment_event + magento_customersegment_event + + + enterprise_customersegment_segment + magento_customersegment_segment + + + enterprise_customersegment_website + magento_customersegment_website + + + enterprise_giftcard_amount + magento_giftcard_amount + + + enterprise_giftcardaccount + magento_giftcardaccount + + + enterprise_giftcardaccount_history + magento_giftcardaccount_history + + + enterprise_giftcardaccount_pool + magento_giftcardaccount_pool + + + enterprise_giftregistry_data + magento_giftregistry_data + + + enterprise_giftregistry_entity + magento_giftregistry_entity + + + enterprise_giftregistry_item + magento_giftregistry_item + + + enterprise_giftregistry_item_option + magento_giftregistry_item_option + + + enterprise_giftregistry_label + magento_giftregistry_label + + + enterprise_giftregistry_person + magento_giftregistry_person + + + enterprise_giftregistry_type + magento_giftregistry_type + + + enterprise_giftregistry_type_info + magento_giftregistry_type_info + + + enterprise_giftwrapping + magento_giftwrapping + + + enterprise_giftwrapping_store_attributes + magento_giftwrapping_store_attributes + + + enterprise_giftwrapping_website + magento_giftwrapping_website + + + enterprise_invitation + magento_invitation + + + enterprise_invitation_status_history + magento_invitation_status_history + + + enterprise_invitation_track + magento_invitation_track + + + enterprise_logging_event + magento_logging_event + + + enterprise_logging_event_changes + magento_logging_event_changes + + + enterprise_reminder_rule + magento_reminder_rule + + + enterprise_reminder_rule_coupon + magento_reminder_rule_coupon + + + enterprise_reminder_rule_log + magento_reminder_rule_log + + + enterprise_reminder_rule_website + magento_reminder_rule_website + + + enterprise_reminder_template + magento_reminder_template + + + enterprise_reward + magento_reward + + + enterprise_reward_history + magento_reward_history + + + enterprise_reward_rate + magento_reward_rate + + + enterprise_reward_salesrule + magento_reward_salesrule + + + enterprise_scheduled_operations + magento_scheduled_operations + + + enterprise_targetrule + magento_targetrule + + + enterprise_targetrule_customersegment + magento_targetrule_customersegment + + + enterprise_targetrule_product + magento_targetrule_product + + + core_directory_storage + media_storage_directory_storage + + + core_file_storage + media_storage_file_storage + + + enterprise_rma_grid + magento_rma_grid + + + enterprise_support_backup + support_backup + + + enterprise_support_backup_item + support_backup_item + + + + + cms_page.root_template + cms_page.page_layout + + + sales_flat_creditmemo.hidden_tax_amount + sales_creditmemo.discount_tax_compensation_amount + + + sales_flat_creditmemo.base_hidden_tax_amount + sales_creditmemo.base_discount_tax_compensation_amount + + + sales_flat_creditmemo.shipping_hidden_tax_amount + sales_creditmemo.shipping_discount_tax_compensation_amount + + + sales_flat_creditmemo.base_shipping_hidden_tax_amnt + sales_creditmemo.base_shipping_discount_tax_compensation_amnt + + + sales_flat_creditmemo_item.hidden_tax_amount + sales_creditmemo_item.discount_tax_compensation_amount + + + sales_flat_creditmemo_item.base_hidden_tax_amount + sales_creditmemo_item.base_discount_tax_compensation_amount + + + sales_flat_invoice.hidden_tax_amount + sales_invoice.discount_tax_compensation_amount + + + sales_flat_invoice.base_hidden_tax_amount + sales_invoice.base_discount_tax_compensation_amount + + + sales_flat_invoice.shipping_hidden_tax_amount + sales_invoice.shipping_discount_tax_compensation_amount + + + sales_flat_invoice.base_shipping_hidden_tax_amnt + sales_invoice.base_shipping_discount_tax_compensation_amnt + + + sales_flat_invoice_item.hidden_tax_amount + sales_invoice_item.discount_tax_compensation_amount + + + sales_flat_invoice_item.base_hidden_tax_amount + sales_invoice_item.base_discount_tax_compensation_amount + + + sales_flat_order_item.hidden_tax_amount + sales_order_item.discount_tax_compensation_amount + + + sales_flat_order_item.base_hidden_tax_amount + sales_order_item.base_discount_tax_compensation_amount + + + sales_flat_order_item.hidden_tax_invoiced + sales_order_item.discount_tax_compensation_invoiced + + + sales_flat_order_item.base_hidden_tax_invoiced + sales_order_item.base_discount_tax_compensation_invoiced + + + sales_flat_order_item.hidden_tax_refunded + sales_order_item.discount_tax_compensation_refunded + + + sales_flat_order_item.base_hidden_tax_refunded + sales_order_item.base_discount_tax_compensation_refunded + + + sales_flat_order_item.hidden_tax_canceled + sales_order_item.discount_tax_compensation_canceled + + + sales_flat_order_payment.cc_last4 + sales_order_payment.cc_last_4 + + + sales_flat_quote_payment.cc_last4 + quote_payment.cc_last_4 + + + sales_flat_quote_address.hidden_tax_amount + quote_address.discount_tax_compensation_amount + + + sales_flat_quote_address.base_hidden_tax_amount + quote_address.base_discount_tax_compensation_amount + + + sales_flat_quote_address.shipping_hidden_tax_amount + quote_address.shipping_discount_tax_compensation_amount + + + sales_flat_quote_address.base_shipping_hidden_tax_amnt + quote_address.base_shipping_discount_tax_compensation_amnt + + + sales_flat_quote_address_item.hidden_tax_amount + quote_address_item.discount_tax_compensation_amount + + + sales_flat_quote_address_item.base_hidden_tax_amount + quote_address_item.base_discount_tax_compensation_amount + + + sales_flat_quote_item.hidden_tax_amount + quote_item.discount_tax_compensation_amount + + + sales_flat_quote_item.base_hidden_tax_amount + quote_item.base_discount_tax_compensation_amount + + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + + + catalog_category_entity_varchar.value + + + + + + + catalog_product_entity_varchar.value + + + + + + + cms_page.root_template + + + + + + cms_block.content + + + + cms_page.content + + + + newsletter_template.template_text + + + + core_email_template.template_text + + + + widget_instance.instance_type + + + + catalogrule.conditions_serialized + + + + catalogrule.actions_serialized + + + + salesrule.conditions_serialized + + + + salesrule.actions_serialized + + + + enterprise_targetrule.conditions_serialized + + + + enterprise_targetrule.actions_serialized + + + + enterprise_reminder_rule.conditions_serialized + + + + enterprise_reminder_rule.condition_sql + + + + enterprise_customersegment_segment.conditions_serialized + + + + enterprise_customersegment_segment.condition_sql + + + + sales_flat_order_item.weee_tax_applied + + + + sales_flat_quote_item.weee_tax_applied + + + + sales_flat_creditmemo_item.weee_tax_applied + + + + sales_flat_invoice_item.weee_tax_applied + + + + enterprise_logging_event.ip + + + + enterprise_logging_event.x_forwarded_ip + + + + rating_option_vote.remote_ip_long + + + + sendfriend_log.ip + + + + catalog_product_entity_media_gallery.value_id + + + + enterprise_giftregistry_type.meta_xml + + + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + + + admin_rule.role_type + + + admin_rule.assert_id + + + core_website.is_staging + + + core_website.master_login + + + core_website.master_password + + + core_website.visibility + + + sales_order_tax.hidden + + + sales_flat_order.reward_points_balance_refunded + + + sales_flat_order.reward_salesrule_points + + + sales_flat_order_item.is_nominal + + + sales_flat_order_payment.paybox_request_number + + + weee_tax.entity_type_id + + + catalog_category_entity.entity_type_id + + + catalog_category_entity_datetime.entity_type_id + + + catalog_category_entity_decimal.entity_type_id + + + catalog_category_entity_int.entity_type_id + + + catalog_category_entity_text.entity_type_id + + + catalog_category_entity_varchar.entity_type_id + + + catalog_product_entity.entity_type_id + + + catalog_product_entity_datetime.entity_type_id + + + catalog_product_entity_decimal.entity_type_id + + + catalog_product_entity_gallery.entity_type_id + + + catalog_product_entity_media_gallery.entity_id + + + catalog_product_entity_int.entity_type_id + + + catalog_product_entity_text.entity_type_id + + + catalog_product_entity_varchar.entity_type_id + + + sales_flat_creditmemo.cybersource_token + + + sales_flat_invoice.cybersource_token + + + sales_flat_order_payment.ideal_transaction_checked + + + sales_flat_order_payment.cybersource_token + + + sales_flat_order_payment.ideal_issuer_title + + + sales_flat_order_payment.paybox_question_number + + + sales_flat_order_payment.ideal_issuer_id + + + sales_flat_order_payment.flo2cash_account_id + + + sales_flat_quote_payment.cybersource_token + + + sales_flat_quote_payment.ideal_issuer_id + + + sales_flat_quote_payment.ideal_issuer_list + + + sales_flat_quote_payment.paypal_payer_id + + + sales_flat_quote_payment.paypal_payer_status + + + sales_flat_quote_payment.paypal_correlation_id + + + cms_page.layout_update_xml + + + cms_page.custom_layout_update_xml + + + widget_instance.package_theme + + + enterprise_rma_item_entity.entity_type_id + + + enterprise_rma_item_entity.attribute_set_id + + + enterprise_rma_item_entity_datetime.entity_type_id + + + enterprise_rma_item_entity_decimal.entity_type_id + + + enterprise_rma_item_entity_int.entity_type_id + + + enterprise_rma_item_entity_text.entity_type_id + + + enterprise_rma_item_entity_varchar.entity_type_id + + + enterprise_giftcard_amount.entity_type_id + + + enterprise_targetrule.use_customer_segment + + + enterprise_targetrule_product.store_id + + + newsletter_template.template_text_preprocessed + + + enterprise_giftregistry_person.middlename + + + sales_flat_quote.base_customer_balance_virtual_amount + + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + cms_page.published_revision_id + + + cms_page.under_version_control + + + sales_flat_quote_payment.cc_exp_month + + + weee_tax.state + + + enterprise_banner.is_ga_enabled + + + enterprise_logging_event.ip + + + enterprise_logging_event.x_forwarded_ip + + + rating_option_vote.remote_ip_long + + + sendfriend_log.ip + + + enterprise_catalogevent_event.date_start + + + enterprise_catalogevent_event.date_end + + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + + + + + + + ui_bookmark + + + migration_backup_* + + + googleoptimizer_code + + + indexer_state + + + integration + + + mview_state + + + theme + + + theme_file + + + vde_theme_change + + + admin_system_messages + + + catalog_url_rewrite_product_category + + + customer_visitor + + + url_rewrite + + + layout_update + + + layout_link + + + catalog_product_flat_* + + + catalog_category_flat_* + + + catalogindex_eav + + + catalog_eav_attribute + + + catalogsearch_fulltext_index_default + + + customer_eav_attribute + + + customer_eav_attribute_website + + + catalog_product_index_eav + + + catalog_product_index_eav_decimal + + + catalog_product_index_eav_decimal_idx + + + catalog_product_index_eav_decimal_tmp + + + catalog_product_index_eav_idx + + + catalog_product_index_eav_tmp + + + catalog_category_product_index_tmp + + + eav_attribute + + + eav_attribute_group + + + eav_attribute_set + + + eav_entity_attribute + + + eav_entity_type + + + authorization_role + + + authorization_rule + + + setup_module + + + sales_order + + + cache + + + cache_tag + + + customer_log + + + flag + + + log_customer + + + log_quote + + + log_summary_type + + + log_summary + + + log_url + + + log_url_info + + + quote_id_mask + + + session + + + sales_sequence_profile + + + sales_sequence_meta + + + sequence_invoice_* + + + sequence_creditmemo_* + + + sequence_order_* + + + sequence_shipment* + + + sequence_rma_item_* + + + magento_rma_item_eav_attribute + + + magento_rma_item_eav_attribute_website + + + magento_catalogpermissions_index + + + magento_catalogpermissions_index_product + + + magento_catalogpermissions_index_product_tmp + + + magento_catalogpermissions_index_tmp + + + magento_customercustomattributes_sales_flat_order + + + magento_customercustomattributes_sales_flat_order_address + + + magento_customercustomattributes_sales_flat_quote + + + magento_customercustomattributes_sales_flat_quote_address + + + magento_targetrule_index + + + magento_targetrule_index_crosssell + + + magento_targetrule_index_crosssell_product + + + magento_targetrule_index_related + + + magento_targetrule_index_related_product + + + magento_targetrule_index_upsell + + + magento_targetrule_index_upsell_product + + + quote_id_mask + + + eav_attribute_option_swatch + + + import_history + + + magento_sales_creditmemo_grid_archive + + + magento_sales_invoice_grid_archive + + + magento_sales_order_grid_archive + + + magento_sales_shipment_grid_archive + + + sales_creditmemo_grid + + + sales_invoice_grid + + + sales_order_grid + + + sales_shipment_grid + + + catalogsearch_fulltext_scope* + + + customer_entity + + + customer_entity_datetime + + + customer_entity_decimal + + + customer_entity_int + + + customer_entity_text + + + customer_entity_varchar + + + customer_address_entity + + + customer_address_entity_datetime + + + customer_address_entity_decimal + + + customer_address_entity_int + + + customer_address_entity_text + + + customer_address_entity_varchar + + + store_website + + + support_report + + + log_visitor_info + + + log_visitor_online + + + reporting_module_status + + + reporting_orders + + + reporting_system_updates + + + reporting_users + + + reporting_counts + + + queue + + + queue_message + + + queue_message_status + + + catalog_product_entity_media_gallery_value_to_entity + + + catalog_product_entity_media_gallery_value_video + + + catalog_product_entity_tier_price + + + customer_grid_flat + + + visual_merchandiser_rule + + + admin_passwords + + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + + + admin_user.interface_locale + + + + + + cataloginventory_stock.website_id + + + + cataloginventory_stock_item.website_id + + + + rating.is_active + + + + + + authorization_role.user_type + + + + + + sales_order_tax_item.amount + + + + + + sales_order_tax_item.base_amount + + + + + + sales_order_tax_item.real_amount + + + + + + sales_order_tax_item.real_base_amount + + + + + + sales_order_tax_item.taxable_item_type + + + + + + oauth_token.user_type + + + + + + widget_instance.theme_id + + + + + + sales_order_status_state.visible_on_front + + + + magento_banner_content.banner_content + + + + catalog_product_entity_media_gallery_value.entity_id + + + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + + + catalog_product_entity_media_gallery_value.entity_id + + + catalog_product_entity_media_gallery.media_type + + + catalog_product_entity_media_gallery.disabled + + + catalog_product_entity_media_gallery_value.record_id + + + admin_user.interface_locale + + + rating.is_active + + + sales_creditmemo.send_email + + + sales_creditmemo.customer_note + + + sales_creditmemo.customer_note_notify + + + sales_invoice.send_email + + + sales_invoice.customer_note + + + sales_invoice.customer_note_notify + + + sales_shipment.send_email + + + sales_shipment.customer_note + + + sales_shipment.customer_note_notify + + + sales_creditmemo_item.tax_ratio + + + sales_invoice_item.tax_ratio + + + authorization_role.user_type + + + cataloginventory_stock.website_id + + + cataloginventory_stock_item.website_id + + + oauth_nonce.consumer_id + + + oauth_token.user_type + + + sales_order_status_state.visible_on_front + + + widget_instance.theme_id + + + sales_order_tax_item.amount + + + sales_order_tax_item.base_amount + + + sales_order_tax_item.real_amount + + + sales_order_tax_item.real_base_amount + + + sales_order_tax_item.associated_item_id + + + sales_order_tax_item.taxable_item_type + + + magento_banner.is_ga_enabled + + + magento_banner.ga_creative + + + checkout_agreement.mode + + + cataloginventory_stock_item.deferred_stock_update + + + cataloginventory_stock_item.use_config_deferred_stock_update + + + quote.gw_base_price_incl_tax + + + quote.gw_price_incl_tax + + + quote.gw_items_base_price_incl_tax + + + quote.gw_items_price_incl_tax + + + quote.gw_card_base_price_incl_tax + + + quote.gw_card_price_incl_tax + + + quote_address.gw_base_price_incl_tax + + + quote_address.gw_price_incl_tax + + + quote_address.gw_items_base_price_incl_tax + + + quote_address.gw_items_price_incl_tax + + + quote_address.gw_card_base_price_incl_tax + + + quote_address.gw_card_price_incl_tax + + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + + + quote_payment.cc_exp_month + + + weee_tax.state + + + magento_logging_event.ip + + + magento_logging_event.x_forwarded_ip + + + rating_option_vote.remote_ip_long + + + sendfriend_log.ip + + + magento_catalogevent_event.date_start + + + magento_catalogevent_event.date_end + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + + + + From b183e2267e1550b7e2f25831fbd536ecfd6a35c5 Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Fri, 22 Apr 2016 15:44:59 +0300 Subject: [PATCH 07/71] MAGETWO-48593: Adapt Data Migration Tool to Magento 2.1 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b043abe18..e77c74385 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "version": "2.0.2", "require": { "symfony/console": "~2.3", - "magento/framework": "~100.0.0", + "magento/framework": "~100.1.0", "monolog/monolog": "~1.16.0" }, "autoload": { From 713297c0eb3806cba862f6b7f13db376f65f2b0f Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Sun, 27 Dec 2015 14:52:34 +0200 Subject: [PATCH 08/71] MAGETWO-47116: Integrity and volume check errors on the latest mainline --- etc/ce-to-ce/1.6.0.0/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/1.6.1.0/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/1.6.2.0/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/1.7.0.0/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/1.7.0.1/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/1.7.0.2/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/1.8.0.0/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/1.8.1.0/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/1.9.0.0/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/1.9.0.1/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/1.9.1.0/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/1.9.1.1/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/1.9.2.0/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/1.9.2.1/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/1.9.2.2/map.xml.dist | 15 +++++++++++++++ etc/ce-to-ce/class-map.xml.dist | 2 +- 16 files changed, 226 insertions(+), 1 deletion(-) 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 index 73372c6db..926c8a78d 100644 --- a/etc/ce-to-ce/1.6.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.0.0/map.xml.dist @@ -1270,6 +1270,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1652,6 +1664,9 @@ weee_tax.state + + catalog_category_product.entity_id + 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 index 4cb494e47..83a9f092d 100644 --- a/etc/ce-to-ce/1.6.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.1.0/map.xml.dist @@ -1258,6 +1258,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1655,6 +1667,9 @@ weee_tax.state + + catalog_category_product.entity_id + 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 index bcb330118..c613191b6 100644 --- a/etc/ce-to-ce/1.6.2.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.2.0/map.xml.dist @@ -1258,6 +1258,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1652,6 +1664,9 @@ weee_tax.state + + catalog_category_product.entity_id + 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 index 2fcd1bce7..7c2053909 100644 --- a/etc/ce-to-ce/1.7.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.0/map.xml.dist @@ -1227,6 +1227,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1504,6 +1516,9 @@ weee_tax.state + + catalog_category_product.entity_id + 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 index 2fcd1bce7..7c2053909 100644 --- a/etc/ce-to-ce/1.7.0.1/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.1/map.xml.dist @@ -1227,6 +1227,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1504,6 +1516,9 @@ weee_tax.state + + catalog_category_product.entity_id + 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 index 2fcd1bce7..7c2053909 100644 --- a/etc/ce-to-ce/1.7.0.2/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.2/map.xml.dist @@ -1227,6 +1227,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1504,6 +1516,9 @@ weee_tax.state + + catalog_category_product.entity_id + 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 index 8ba4be5db..de6d97f53 100644 --- a/etc/ce-to-ce/1.8.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.8.0.0/map.xml.dist @@ -1227,6 +1227,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1482,6 +1494,9 @@ weee_tax.state + + catalog_category_product.entity_id + 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 index bf57eeb66..6871200d9 100644 --- a/etc/ce-to-ce/1.8.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.8.1.0/map.xml.dist @@ -1224,6 +1224,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1479,6 +1491,9 @@ weee_tax.state + + catalog_category_product.entity_id + 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 index 4e6791bc7..982022231 100644 --- a/etc/ce-to-ce/1.9.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.0.0/map.xml.dist @@ -1227,6 +1227,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1488,6 +1500,9 @@ weee_tax.state + + catalog_category_product.entity_id + 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 index 4e6791bc7..982022231 100644 --- a/etc/ce-to-ce/1.9.0.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.0.1/map.xml.dist @@ -1227,6 +1227,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1488,6 +1500,9 @@ weee_tax.state + + catalog_category_product.entity_id + 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 index c97c963dc..76e6f280d 100644 --- a/etc/ce-to-ce/1.9.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.1.0/map.xml.dist @@ -1209,6 +1209,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1470,6 +1482,9 @@ weee_tax.state + + catalog_category_product.entity_id + 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 index c97c963dc..76e6f280d 100644 --- a/etc/ce-to-ce/1.9.1.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.1.1/map.xml.dist @@ -1209,6 +1209,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1470,6 +1482,9 @@ weee_tax.state + + catalog_category_product.entity_id + 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 index 4f1026c0c..161a41adc 100644 --- a/etc/ce-to-ce/1.9.2.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.0/map.xml.dist @@ -1223,6 +1223,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1490,6 +1502,9 @@ rating_option_vote.remote_ip_long + + catalog_category_product.entity_id + 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 index 4f1026c0c..161a41adc 100644 --- a/etc/ce-to-ce/1.9.2.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.1/map.xml.dist @@ -1223,6 +1223,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1490,6 +1502,9 @@ rating_option_vote.remote_ip_long + + catalog_category_product.entity_id + diff --git a/etc/ce-to-ce/1.9.2.2/map.xml.dist b/etc/ce-to-ce/1.9.2.2/map.xml.dist index c62484fb9..0ed187f8e 100644 --- a/etc/ce-to-ce/1.9.2.2/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.2/map.xml.dist @@ -1229,6 +1229,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1496,6 +1508,9 @@ rating_option_vote.remote_ip_long + + catalog_category_product.entity_id + diff --git a/etc/ce-to-ce/class-map.xml.dist b/etc/ce-to-ce/class-map.xml.dist index 9b0ca00bf..ba77d09dd 100644 --- a/etc/ce-to-ce/class-map.xml.dist +++ b/etc/ce-to-ce/class-map.xml.dist @@ -96,7 +96,7 @@ catalog/product_attribute_backend_media - Magento\Catalog\Model\Product\Attribute\Backend\Media + catalog/product_attribute_backend_msrp From bac91b076a0a35f5377b2fc7176012e771857ce5 Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Sun, 31 Jan 2016 17:18:30 +0200 Subject: [PATCH 09/71] MAGETWO-48594: Integrity check errors ce-to-ce 31/01/16 --- etc/ce-to-ce/1.6.0.0/map.xml.dist | 26 ++++++++++++++- etc/ce-to-ce/1.6.1.0/map.xml.dist | 41 ++++++++++++++++++++++- etc/ce-to-ce/1.6.2.0/map.xml.dist | 41 ++++++++++++++++++++++- etc/ce-to-ce/1.7.0.0/map.xml.dist | 41 ++++++++++++++++++++++- etc/ce-to-ce/1.7.0.1/map.xml.dist | 41 ++++++++++++++++++++++- etc/ce-to-ce/1.7.0.2/map.xml.dist | 41 ++++++++++++++++++++++- etc/ce-to-ce/1.8.0.0/map.xml.dist | 41 ++++++++++++++++++++++- etc/ce-to-ce/1.8.1.0/map.xml.dist | 41 ++++++++++++++++++++++- etc/ce-to-ce/1.9.0.0/map.xml.dist | 41 ++++++++++++++++++++++- etc/ce-to-ce/1.9.0.1/map.xml.dist | 41 ++++++++++++++++++++++- etc/ce-to-ce/1.9.1.0/map.xml.dist | 41 ++++++++++++++++++++++- etc/ce-to-ce/1.9.1.1/map.xml.dist | 41 ++++++++++++++++++++++- etc/ce-to-ce/1.9.2.0/map.xml.dist | 41 ++++++++++++++++++++++- etc/ce-to-ce/1.9.2.1/map.xml.dist | 41 ++++++++++++++++++++++- etc/ce-to-ce/1.9.2.2/map.xml.dist | 41 ++++++++++++++++++++++- etc/ce-to-ce/1.9.2.3/map.xml.dist | 54 +++++++++++++++++++++++++++++++ 16 files changed, 639 insertions(+), 15 deletions(-) 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 index 926c8a78d..b6d65f3e5 100644 --- a/etc/ce-to-ce/1.6.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.0.0/map.xml.dist @@ -1065,6 +1065,15 @@ weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1393,6 +1402,12 @@ oauth_token_request_log + + admin_user_session + + + password_reset_request_event + @@ -1658,6 +1673,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1665,7 +1683,13 @@ weee_tax.state - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url 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 index 83a9f092d..f7f008c9d 100644 --- a/etc/ce-to-ce/1.6.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.1.0/map.xml.dist @@ -1047,12 +1047,36 @@ salesrule.website_ids + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1369,6 +1393,12 @@ oauth_token_request_log + + admin_user_session + + + password_reset_request_event + @@ -1661,6 +1691,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1668,7 +1701,13 @@ weee_tax.state - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url 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 index c613191b6..73b1bbf5d 100644 --- a/etc/ce-to-ce/1.6.2.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.2.0/map.xml.dist @@ -1047,12 +1047,36 @@ salesrule.website_ids + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1369,6 +1393,12 @@ oauth_token_request_log + + admin_user_session + + + password_reset_request_event + @@ -1658,6 +1688,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1665,7 +1698,13 @@ weee_tax.state - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url 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 index 7c2053909..9d5b14ce1 100644 --- a/etc/ce-to-ce/1.7.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.0/map.xml.dist @@ -1016,12 +1016,36 @@ newsletter_template.template_text_preprocessed + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1296,6 +1320,12 @@ oauth_token_request_log + + admin_user_session + + + password_reset_request_event + @@ -1510,6 +1540,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1517,7 +1550,13 @@ weee_tax.state - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url 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 index 7c2053909..9d5b14ce1 100644 --- a/etc/ce-to-ce/1.7.0.1/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.1/map.xml.dist @@ -1016,12 +1016,36 @@ newsletter_template.template_text_preprocessed + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1296,6 +1320,12 @@ oauth_token_request_log + + admin_user_session + + + password_reset_request_event + @@ -1510,6 +1540,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1517,7 +1550,13 @@ weee_tax.state - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url 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 index 7c2053909..9d5b14ce1 100644 --- a/etc/ce-to-ce/1.7.0.2/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.2/map.xml.dist @@ -1016,12 +1016,36 @@ newsletter_template.template_text_preprocessed + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1296,6 +1320,12 @@ oauth_token_request_log + + admin_user_session + + + password_reset_request_event + @@ -1510,6 +1540,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1517,7 +1550,13 @@ weee_tax.state - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url 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 index de6d97f53..2ebfde791 100644 --- a/etc/ce-to-ce/1.8.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.8.0.0/map.xml.dist @@ -1016,12 +1016,36 @@ newsletter_template.template_text_preprocessed + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1296,6 +1320,12 @@ oauth_token_request_log + + admin_user_session + + + password_reset_request_event + @@ -1488,6 +1518,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1495,7 +1528,13 @@ weee_tax.state - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url 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 index 6871200d9..52caa9fc9 100644 --- a/etc/ce-to-ce/1.8.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.8.1.0/map.xml.dist @@ -1013,12 +1013,36 @@ newsletter_template.template_text_preprocessed + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1293,6 +1317,12 @@ oauth_token_request_log + + admin_user_session + + + password_reset_request_event + @@ -1485,6 +1515,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1492,7 +1525,13 @@ weee_tax.state - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url 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 index 982022231..abe272778 100644 --- a/etc/ce-to-ce/1.9.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.0.0/map.xml.dist @@ -1016,12 +1016,36 @@ newsletter_template.template_text_preprocessed + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1302,6 +1326,12 @@ oauth_token_request_log + + admin_user_session + + + password_reset_request_event + @@ -1494,6 +1524,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1501,7 +1534,13 @@ weee_tax.state - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url 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 index 982022231..abe272778 100644 --- a/etc/ce-to-ce/1.9.0.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.0.1/map.xml.dist @@ -1016,12 +1016,36 @@ newsletter_template.template_text_preprocessed + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1302,6 +1326,12 @@ oauth_token_request_log + + admin_user_session + + + password_reset_request_event + @@ -1494,6 +1524,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1501,7 +1534,13 @@ weee_tax.state - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url 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 index 76e6f280d..6b0eadec8 100644 --- a/etc/ce-to-ce/1.9.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.1.0/map.xml.dist @@ -998,12 +998,36 @@ newsletter_template.template_text_preprocessed + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1284,6 +1308,12 @@ oauth_token_request_log + + admin_user_session + + + password_reset_request_event + @@ -1476,6 +1506,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1483,7 +1516,13 @@ weee_tax.state - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url 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 index 76e6f280d..6b0eadec8 100644 --- a/etc/ce-to-ce/1.9.1.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.1.1/map.xml.dist @@ -998,12 +998,36 @@ newsletter_template.template_text_preprocessed + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1284,6 +1308,12 @@ oauth_token_request_log + + admin_user_session + + + password_reset_request_event + @@ -1476,6 +1506,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1483,7 +1516,13 @@ weee_tax.state - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url 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 index 161a41adc..9f59d150e 100644 --- a/etc/ce-to-ce/1.9.2.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.0/map.xml.dist @@ -1006,6 +1006,21 @@ newsletter_template.template_text_preprocessed + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month @@ -1018,6 +1033,15 @@ rating_option_vote.remote_ip_long + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1298,6 +1322,12 @@ oauth_token_request_log + + admin_user_session + + + password_reset_request_event + @@ -1490,6 +1520,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1503,7 +1536,13 @@ rating_option_vote.remote_ip_long - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url 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 index 161a41adc..9f59d150e 100644 --- a/etc/ce-to-ce/1.9.2.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.1/map.xml.dist @@ -1006,6 +1006,21 @@ newsletter_template.template_text_preprocessed + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month @@ -1018,6 +1033,15 @@ rating_option_vote.remote_ip_long + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1298,6 +1322,12 @@ oauth_token_request_log + + admin_user_session + + + password_reset_request_event + @@ -1490,6 +1520,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1503,7 +1536,13 @@ rating_option_vote.remote_ip_long - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url diff --git a/etc/ce-to-ce/1.9.2.2/map.xml.dist b/etc/ce-to-ce/1.9.2.2/map.xml.dist index 0ed187f8e..9563af1d7 100644 --- a/etc/ce-to-ce/1.9.2.2/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.2/map.xml.dist @@ -1012,6 +1012,21 @@ newsletter_template.template_text_preprocessed + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month @@ -1024,6 +1039,15 @@ rating_option_vote.remote_ip_long + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1304,6 +1328,12 @@ oauth_token_request_log + + admin_user_session + + + password_reset_request_event + @@ -1496,6 +1526,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1509,7 +1542,13 @@ rating_option_vote.remote_ip_long - catalog_category_product.entity_id + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url diff --git a/etc/ce-to-ce/1.9.2.3/map.xml.dist b/etc/ce-to-ce/1.9.2.3/map.xml.dist index c62484fb9..9563af1d7 100644 --- a/etc/ce-to-ce/1.9.2.3/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.3/map.xml.dist @@ -1012,6 +1012,21 @@ newsletter_template.template_text_preprocessed + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month @@ -1024,6 +1039,15 @@ rating_option_vote.remote_ip_long + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1229,6 +1253,18 @@ sequence_shipment* + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + eav_attribute_option_swatch @@ -1292,6 +1328,12 @@ oauth_token_request_log + + admin_user_session + + + password_reset_request_event + @@ -1484,6 +1526,9 @@ checkout_agreement.mode + + catalog_category_product.entity_id + quote_payment.cc_exp_month @@ -1496,6 +1541,15 @@ rating_option_vote.remote_ip_long + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + From d0e4ad26a604bb6bda29cadfb6d638ba1b5b40c7 Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Mon, 4 Apr 2016 13:30:23 +0300 Subject: [PATCH 10/71] MAGETWO-51341: Fix Integrity check errors ce-to-ce --- etc/ce-to-ce/1.6.0.0/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.6.1.0/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.6.2.0/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.7.0.0/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.7.0.1/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.7.0.2/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.8.0.0/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.8.1.0/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.9.0.0/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.9.0.1/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.9.1.0/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.9.1.1/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.9.2.0/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.9.2.1/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.9.2.2/map.xml.dist | 13 ++++++ etc/ce-to-ce/1.9.2.3/map.xml.dist | 13 ++++++ etc/ce-to-ce/map-customer.xml.dist | 9 ++++ src/Migration/Handler/Synonym.php | 72 ++++++++++++++++++++++++++++++ src/Migration/Step/Eav/Volume.php | 6 ++- 19 files changed, 294 insertions(+), 1 deletion(-) create mode 100644 src/Migration/Handler/Synonym.php 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 index b6d65f3e5..fb3fe1daf 100644 --- a/etc/ce-to-ce/1.6.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.0.0/map.xml.dist @@ -918,6 +918,10 @@ catalog_product_entity_media_gallery.value_id + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1059,6 +1063,9 @@ salesrule.website_ids + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1408,6 +1415,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + 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 index f7f008c9d..a6f0a2808 100644 --- a/etc/ce-to-ce/1.6.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.1.0/map.xml.dist @@ -906,6 +906,10 @@ catalog_product_entity_media_gallery.value_id + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1062,6 +1066,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1399,6 +1406,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + 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 index 73b1bbf5d..e4fbd00ed 100644 --- a/etc/ce-to-ce/1.6.2.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.2.0/map.xml.dist @@ -906,6 +906,10 @@ catalog_product_entity_media_gallery.value_id + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1062,6 +1066,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1399,6 +1406,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + 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 index 9d5b14ce1..3f3ee5616 100644 --- a/etc/ce-to-ce/1.7.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.0/map.xml.dist @@ -887,6 +887,10 @@ catalog_product_entity_media_gallery.value_id + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1031,6 +1035,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1326,6 +1333,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + 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 index 9d5b14ce1..3f3ee5616 100644 --- a/etc/ce-to-ce/1.7.0.1/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.1/map.xml.dist @@ -887,6 +887,10 @@ catalog_product_entity_media_gallery.value_id + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1031,6 +1035,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1326,6 +1333,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + 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 index 9d5b14ce1..3f3ee5616 100644 --- a/etc/ce-to-ce/1.7.0.2/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.2/map.xml.dist @@ -887,6 +887,10 @@ catalog_product_entity_media_gallery.value_id + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1031,6 +1035,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1326,6 +1333,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + 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 index 2ebfde791..4db3d4e96 100644 --- a/etc/ce-to-ce/1.8.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.8.0.0/map.xml.dist @@ -887,6 +887,10 @@ catalog_product_entity_media_gallery.value_id + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1031,6 +1035,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1326,6 +1333,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + 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 index 52caa9fc9..694ed4617 100644 --- a/etc/ce-to-ce/1.8.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.8.1.0/map.xml.dist @@ -884,6 +884,10 @@ catalog_product_entity_media_gallery.value_id + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1028,6 +1032,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1323,6 +1330,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + 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 index abe272778..eac772ec1 100644 --- a/etc/ce-to-ce/1.9.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.0.0/map.xml.dist @@ -887,6 +887,10 @@ catalog_product_entity_media_gallery.value_id + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1031,6 +1035,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1332,6 +1339,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + 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 index abe272778..eac772ec1 100644 --- a/etc/ce-to-ce/1.9.0.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.0.1/map.xml.dist @@ -887,6 +887,10 @@ catalog_product_entity_media_gallery.value_id + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1031,6 +1035,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1332,6 +1339,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + 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 index 6b0eadec8..661e4351a 100644 --- a/etc/ce-to-ce/1.9.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.1.0/map.xml.dist @@ -869,6 +869,10 @@ catalog_product_entity_media_gallery.value_id + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1013,6 +1017,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1314,6 +1321,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + 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 index 6b0eadec8..661e4351a 100644 --- a/etc/ce-to-ce/1.9.1.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.1.1/map.xml.dist @@ -869,6 +869,10 @@ catalog_product_entity_media_gallery.value_id + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1013,6 +1017,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1314,6 +1321,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + 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 index 9f59d150e..69143ee7c 100644 --- a/etc/ce-to-ce/1.9.2.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.0/map.xml.dist @@ -877,6 +877,10 @@ sendfriend_log.ip + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1021,6 +1025,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1328,6 +1335,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + 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 index 9f59d150e..69143ee7c 100644 --- a/etc/ce-to-ce/1.9.2.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.1/map.xml.dist @@ -877,6 +877,10 @@ sendfriend_log.ip + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1021,6 +1025,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1328,6 +1335,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + diff --git a/etc/ce-to-ce/1.9.2.2/map.xml.dist b/etc/ce-to-ce/1.9.2.2/map.xml.dist index 9563af1d7..c97812554 100644 --- a/etc/ce-to-ce/1.9.2.2/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.2/map.xml.dist @@ -883,6 +883,10 @@ sendfriend_log.ip + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1027,6 +1031,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1334,6 +1341,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + diff --git a/etc/ce-to-ce/1.9.2.3/map.xml.dist b/etc/ce-to-ce/1.9.2.3/map.xml.dist index 9563af1d7..c97812554 100644 --- a/etc/ce-to-ce/1.9.2.3/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.3/map.xml.dist @@ -883,6 +883,10 @@ sendfriend_log.ip + + catalogsearch_query.synonym_for + + admin_rule.role_type @@ -1027,6 +1031,9 @@ catalogrule_product.sub_discount_amount + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1334,6 +1341,12 @@ password_reset_request_event + + oauth_token_request_log + + + design_config_grid_flat + diff --git a/etc/ce-to-ce/map-customer.xml.dist b/etc/ce-to-ce/map-customer.xml.dist index 75f28cc99..2d2177e17 100644 --- a/etc/ce-to-ce/map-customer.xml.dist +++ b/etc/ce-to-ce/map-customer.xml.dist @@ -156,6 +156,15 @@ customer_address_entity.vat_request_success + + customer_entity.failures_num + + + customer_entity.first_failure + + + customer_entity.lock_expires + diff --git a/src/Migration/Handler/Synonym.php b/src/Migration/Handler/Synonym.php new file mode 100644 index 000000000..fc2a9b581 --- /dev/null +++ b/src/Migration/Handler/Synonym.php @@ -0,0 +1,72 @@ +source = $source; + $this->destination = $destination; + } + + /** + * {@inheritdoc} + */ + public function handle(Record $recordToHandle, Record $oppositeRecord) + { + $this->validate($recordToHandle); + $synonyms = $recordToHandle->getValue($this->field); + $storeId = $recordToHandle->getValue('store_id'); + if (empty($synonyms)) { + return; + } + $synonyms .= sprintf('"%s",', $recordToHandle->getValue('query_text')); + $websiteId = $this->getWebsiteId($storeId); + $record = ['synonyms' => $synonyms, 'store_id' => $storeId, 'website_id' => $websiteId]; + $this->destination->saveRecords($this->synonymsTable, [$record]); + } + + /** + * @param $storeId + * @return array + */ + protected function getWebsiteId($storeId) + { + if (empty($this->storeWebsite[$storeId])) { + /** @var Mysql $adapter */ + $adapter = $this->source->getAdapter(); + $query = $adapter->getSelect()->from($this->source->addDocumentPrefix('core_store'), ['website_id']) + ->where('store_id = ?', $storeId); + $this->storeWebsite[$storeId] = $query->getAdapter()->fetchOne($query); + } + return $this->storeWebsite[$storeId]; + } +} diff --git a/src/Migration/Step/Eav/Volume.php b/src/Migration/Step/Eav/Volume.php index e889a7c8f..015ef0892 100644 --- a/src/Migration/Step/Eav/Volume.php +++ b/src/Migration/Step/Eav/Volume.php @@ -128,7 +128,11 @@ protected function validateCatalogEavAttributes() { foreach ($this->helper->getDestinationRecords('catalog_eav_attribute') as $attribute) { foreach (['frontend_input_renderer'] as $field) { - if ($attribute[$field] !== null && !class_exists($attribute[$field])) { + if ($attribute[$field] !== null + // @Todo: remove this after MAGETWO-51403 completion + && $attribute[$field] != 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\BaseImage' + && !class_exists($attribute[$field] + )) { $this->errors[] = 'Incorrect value: '. $attribute[$field] . ' in: catalog_eav_attribute.' . $field . ' for attribute_id=' . $attribute['attribute_id']; From 64e432642178b4815c5964751e24cba3089ffeb8 Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Tue, 12 Apr 2016 16:28:59 +0300 Subject: [PATCH 11/71] MAGETWO-48596: Fix Integrity check errors ce-to-ee --- etc/ce-to-ce/1.6.0.0/config.xml.dist | 1 + etc/ce-to-ce/1.6.1.0/config.xml.dist | 1 + etc/ce-to-ce/1.6.2.0/config.xml.dist | 1 + etc/ce-to-ce/1.7.0.0/config.xml.dist | 1 + etc/ce-to-ce/1.7.0.1/config.xml.dist | 1 + etc/ce-to-ce/1.7.0.2/config.xml.dist | 1 + etc/ce-to-ce/1.8.0.0/config.xml.dist | 1 + etc/ce-to-ce/1.8.1.0/config.xml.dist | 1 + etc/ce-to-ce/1.9.0.0/config.xml.dist | 1 + etc/ce-to-ce/1.9.0.1/config.xml.dist | 1 + etc/ce-to-ce/1.9.1.0/config.xml.dist | 1 + etc/ce-to-ce/1.9.1.1/config.xml.dist | 1 + etc/ce-to-ce/1.9.2.0/config.xml.dist | 1 + etc/ce-to-ce/1.9.2.2/config.xml.dist | 1 + etc/ce-to-ce/1.9.2.3/config.xml.dist | 1 + etc/ce-to-ee/1.6.0.0/config.xml.dist | 1 + etc/ce-to-ee/1.6.0.0/map.xml.dist | 265 ++++++++++++++++ etc/ce-to-ee/1.6.1.0/config.xml.dist | 1 + etc/ce-to-ee/1.6.1.0/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/1.6.2.0/config.xml.dist | 1 + etc/ce-to-ee/1.6.2.0/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/1.7.0.0/config.xml.dist | 1 + etc/ce-to-ee/1.7.0.0/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/1.7.0.1/config.xml.dist | 1 + etc/ce-to-ee/1.7.0.1/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/1.7.0.2/config.xml.dist | 1 + etc/ce-to-ee/1.7.0.2/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/1.8.0.0/config.xml.dist | 1 + etc/ce-to-ee/1.8.0.0/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/1.8.1.0/config.xml.dist | 1 + etc/ce-to-ee/1.8.1.0/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/1.9.0.0/config.xml.dist | 1 + etc/ce-to-ee/1.9.0.0/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/1.9.0.1/config.xml.dist | 1 + etc/ce-to-ee/1.9.0.1/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/1.9.1.0/config.xml.dist | 1 + etc/ce-to-ee/1.9.1.0/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/1.9.1.1/config.xml.dist | 1 + etc/ce-to-ee/1.9.1.1/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/1.9.2.0/config.xml.dist | 1 + etc/ce-to-ee/1.9.2.0/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/1.9.2.1/config.xml.dist | 1 + etc/ce-to-ee/1.9.2.1/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/1.9.2.2/config.xml.dist | 1 + etc/ce-to-ee/1.9.2.2/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/1.9.2.3/config.xml.dist | 1 + etc/ce-to-ee/1.9.2.3/map.xml.dist | 298 ++++++++++++++++++ etc/ce-to-ee/class-map.xml.dist | 2 +- etc/ce-to-ee/map-customer.xml.dist | 9 + etc/config.xsd | 1 + etc/ee-to-ee/1.11.0.0/config.xml.dist | 1 + etc/ee-to-ee/1.11.0.1/config.xml.dist | 1 + etc/ee-to-ee/1.11.0.2/config.xml.dist | 1 + etc/ee-to-ee/1.11.1.0/config.xml.dist | 1 + etc/ee-to-ee/1.11.2.0/config.xml.dist | 1 + etc/ee-to-ee/1.12.0.0/config.xml.dist | 1 + etc/ee-to-ee/1.12.0.1/config.xml.dist | 1 + etc/ee-to-ee/1.12.0.2/config.xml.dist | 1 + etc/ee-to-ee/1.13.0.0/config.xml.dist | 1 + etc/ee-to-ee/1.13.0.1/config.xml.dist | 1 + etc/ee-to-ee/1.13.0.2/config.xml.dist | 1 + etc/ee-to-ee/1.13.1.0/config.xml.dist | 1 + etc/ee-to-ee/1.14.0.0/config.xml.dist | 1 + etc/ee-to-ee/1.14.0.1/config.xml.dist | 1 + etc/ee-to-ee/1.14.1.0/config.xml.dist | 1 + etc/ee-to-ee/1.14.2.0/config.xml.dist | 1 + etc/ee-to-ee/1.14.2.1/config.xml.dist | 1 + etc/ee-to-ee/1.14.2.2/config.xml.dist | 1 + etc/ee-to-ee/1.14.2.3/config.xml.dist | 1 + etc/ee-to-ee/class-map.xml.dist | 2 +- etc/ee-to-ee/map-customer.xml.dist | 9 + src/Migration/Config.php | 6 + src/Migration/Handler/FieldCopy.php | 39 +++ src/Migration/Handler/Sequence.php | 55 ++++ src/Migration/ResourceModel/Adapter/Mysql.php | 29 +- src/Migration/ResourceModel/Destination.php | 14 +- src/Migration/ResourceModel/Source.php | 14 +- .../Step/ConfigurablePrices/Helper.php | 16 +- src/Migration/Step/TierPrice/Helper.php | 23 +- 79 files changed, 4982 insertions(+), 22 deletions(-) create mode 100644 src/Migration/Handler/FieldCopy.php create mode 100644 src/Migration/Handler/Sequence.php 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 index 1d9b21957..15c4b93c7 100644 --- a/etc/ce-to-ce/1.6.0.0/config.xml.dist +++ b/etc/ce-to-ce/1.6.0.0/config.xml.dist @@ -123,6 +123,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce 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 index 810cc51e5..2b73ce1a4 100644 --- a/etc/ce-to-ce/1.6.1.0/config.xml.dist +++ b/etc/ce-to-ce/1.6.1.0/config.xml.dist @@ -123,6 +123,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce 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 index b693ee005..1ef9fb329 100644 --- a/etc/ce-to-ce/1.6.2.0/config.xml.dist +++ b/etc/ce-to-ce/1.6.2.0/config.xml.dist @@ -123,6 +123,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce 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 index 649d3c217..661f7096d 100644 --- a/etc/ce-to-ce/1.7.0.0/config.xml.dist +++ b/etc/ce-to-ce/1.7.0.0/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce 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 index 3dc4c145f..50639da6c 100644 --- a/etc/ce-to-ce/1.7.0.1/config.xml.dist +++ b/etc/ce-to-ce/1.7.0.1/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce 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 index dd958f50d..e2ec41d59 100644 --- a/etc/ce-to-ce/1.7.0.2/config.xml.dist +++ b/etc/ce-to-ce/1.7.0.2/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce 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 index f1d846100..4e6bc11d6 100644 --- a/etc/ce-to-ce/1.8.0.0/config.xml.dist +++ b/etc/ce-to-ce/1.8.0.0/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce 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 index d35b45ed9..ca68b40f3 100644 --- a/etc/ce-to-ce/1.8.1.0/config.xml.dist +++ b/etc/ce-to-ce/1.8.1.0/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce 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 index 8176cfad9..8cfef5591 100644 --- a/etc/ce-to-ce/1.9.0.0/config.xml.dist +++ b/etc/ce-to-ce/1.9.0.0/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce 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 index d873f9205..0d3089737 100644 --- a/etc/ce-to-ce/1.9.0.1/config.xml.dist +++ b/etc/ce-to-ce/1.9.0.1/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce 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 index 37d70229d..e2f7e5c44 100644 --- a/etc/ce-to-ce/1.9.1.0/config.xml.dist +++ b/etc/ce-to-ce/1.9.1.0/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce 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 index f1610a748..e2ffe4a8a 100644 --- a/etc/ce-to-ce/1.9.1.1/config.xml.dist +++ b/etc/ce-to-ce/1.9.1.1/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce 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 index 427547f52..cb067fda8 100644 --- a/etc/ce-to-ce/1.9.2.0/config.xml.dist +++ b/etc/ce-to-ce/1.9.2.0/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce 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 index 640eda540..0358152e7 100644 --- a/etc/ce-to-ce/1.9.2.2/config.xml.dist +++ b/etc/ce-to-ce/1.9.2.2/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce diff --git a/etc/ce-to-ce/1.9.2.3/config.xml.dist b/etc/ce-to-ce/1.9.2.3/config.xml.dist index 27d86f927..055a8c90c 100644 --- a/etc/ce-to-ce/1.9.2.3/config.xml.dist +++ b/etc/ce-to-ce/1.9.2.3/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce diff --git a/etc/ce-to-ee/1.6.0.0/config.xml.dist b/etc/ce-to-ee/1.6.0.0/config.xml.dist index 6e4be2411..9d547d0e5 100644 --- a/etc/ce-to-ee/1.6.0.0/config.xml.dist +++ b/etc/ce-to-ee/1.6.0.0/config.xml.dist @@ -123,6 +123,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.6.0.0/map.xml.dist b/etc/ce-to-ee/1.6.0.0/map.xml.dist index f8f13e181..dfe955158 100644 --- a/etc/ce-to-ee/1.6.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.6.0.0/map.xml.dist @@ -826,6 +826,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -930,6 +1006,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1071,6 +1183,9 @@ salesrule.website_ids + + catalogsearch_query.synonym_for + sales_flat_quote_payment.cc_exp_month @@ -1684,6 +1799,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1751,6 +1920,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2609,6 +2814,66 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.6.1.0/config.xml.dist b/etc/ce-to-ee/1.6.1.0/config.xml.dist index d172de453..c47b3af2d 100644 --- a/etc/ce-to-ee/1.6.1.0/config.xml.dist +++ b/etc/ce-to-ee/1.6.1.0/config.xml.dist @@ -123,6 +123,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.6.1.0/map.xml.dist b/etc/ce-to-ee/1.6.1.0/map.xml.dist index 3e322781b..609f311d1 100644 --- a/etc/ce-to-ee/1.6.1.0/map.xml.dist +++ b/etc/ce-to-ee/1.6.1.0/map.xml.dist @@ -814,6 +814,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -918,6 +994,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1059,12 +1171,39 @@ salesrule.website_ids + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1660,6 +1799,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1751,6 +1944,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2612,12 +2841,81 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/1.6.2.0/config.xml.dist b/etc/ce-to-ee/1.6.2.0/config.xml.dist index 49be08189..fbc715bba 100644 --- a/etc/ce-to-ee/1.6.2.0/config.xml.dist +++ b/etc/ce-to-ee/1.6.2.0/config.xml.dist @@ -123,6 +123,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.6.2.0/map.xml.dist b/etc/ce-to-ee/1.6.2.0/map.xml.dist index 0db50f394..ec7d678f0 100644 --- a/etc/ce-to-ee/1.6.2.0/map.xml.dist +++ b/etc/ce-to-ee/1.6.2.0/map.xml.dist @@ -814,6 +814,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -918,6 +994,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1059,12 +1171,39 @@ salesrule.website_ids + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1660,6 +1799,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1751,6 +1944,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2609,12 +2838,81 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/1.7.0.0/config.xml.dist b/etc/ce-to-ee/1.7.0.0/config.xml.dist index f0686e2e4..e01ddb8d9 100644 --- a/etc/ce-to-ee/1.7.0.0/config.xml.dist +++ b/etc/ce-to-ee/1.7.0.0/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.7.0.0/map.xml.dist b/etc/ce-to-ee/1.7.0.0/map.xml.dist index e20b5f12a..5d21d6e70 100644 --- a/etc/ce-to-ee/1.7.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.7.0.0/map.xml.dist @@ -811,6 +811,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -887,6 +963,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1016,12 +1128,39 @@ newsletter_template.template_text_preprocessed + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1575,6 +1714,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1660,6 +1853,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2416,12 +2645,81 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/1.7.0.1/config.xml.dist b/etc/ce-to-ee/1.7.0.1/config.xml.dist index 9b69e617d..09d485d9a 100644 --- a/etc/ce-to-ee/1.7.0.1/config.xml.dist +++ b/etc/ce-to-ee/1.7.0.1/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.7.0.1/map.xml.dist b/etc/ce-to-ee/1.7.0.1/map.xml.dist index e20b5f12a..5d21d6e70 100644 --- a/etc/ce-to-ee/1.7.0.1/map.xml.dist +++ b/etc/ce-to-ee/1.7.0.1/map.xml.dist @@ -811,6 +811,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -887,6 +963,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1016,12 +1128,39 @@ newsletter_template.template_text_preprocessed + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1575,6 +1714,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1660,6 +1853,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2416,12 +2645,81 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/1.7.0.2/config.xml.dist b/etc/ce-to-ee/1.7.0.2/config.xml.dist index 19121ce0a..b72a9b116 100644 --- a/etc/ce-to-ee/1.7.0.2/config.xml.dist +++ b/etc/ce-to-ee/1.7.0.2/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.7.0.2/map.xml.dist b/etc/ce-to-ee/1.7.0.2/map.xml.dist index e20b5f12a..5d21d6e70 100644 --- a/etc/ce-to-ee/1.7.0.2/map.xml.dist +++ b/etc/ce-to-ee/1.7.0.2/map.xml.dist @@ -811,6 +811,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -887,6 +963,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1016,12 +1128,39 @@ newsletter_template.template_text_preprocessed + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1575,6 +1714,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1660,6 +1853,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2416,12 +2645,81 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/1.8.0.0/config.xml.dist b/etc/ce-to-ee/1.8.0.0/config.xml.dist index f07a28e21..3ee8f8a27 100644 --- a/etc/ce-to-ee/1.8.0.0/config.xml.dist +++ b/etc/ce-to-ee/1.8.0.0/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.8.0.0/map.xml.dist b/etc/ce-to-ee/1.8.0.0/map.xml.dist index e526070c3..4508c14bf 100644 --- a/etc/ce-to-ee/1.8.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.8.0.0/map.xml.dist @@ -811,6 +811,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -887,6 +963,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1016,12 +1128,39 @@ newsletter_template.template_text_preprocessed + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1575,6 +1714,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1653,6 +1846,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2394,12 +2623,81 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/1.8.1.0/config.xml.dist b/etc/ce-to-ee/1.8.1.0/config.xml.dist index 06f3e197f..fe43cf6c6 100644 --- a/etc/ce-to-ee/1.8.1.0/config.xml.dist +++ b/etc/ce-to-ee/1.8.1.0/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.8.1.0/map.xml.dist b/etc/ce-to-ee/1.8.1.0/map.xml.dist index 8e10ea4c6..f2633d4c9 100644 --- a/etc/ce-to-ee/1.8.1.0/map.xml.dist +++ b/etc/ce-to-ee/1.8.1.0/map.xml.dist @@ -808,6 +808,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -884,6 +960,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1013,12 +1125,39 @@ newsletter_template.template_text_preprocessed + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1572,6 +1711,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1650,6 +1843,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2391,12 +2620,81 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/1.9.0.0/config.xml.dist b/etc/ce-to-ee/1.9.0.0/config.xml.dist index fad3bee9a..0c083f130 100644 --- a/etc/ce-to-ee/1.9.0.0/config.xml.dist +++ b/etc/ce-to-ee/1.9.0.0/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.9.0.0/map.xml.dist b/etc/ce-to-ee/1.9.0.0/map.xml.dist index 0762533f0..1aa303a57 100644 --- a/etc/ce-to-ee/1.9.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.9.0.0/map.xml.dist @@ -811,6 +811,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -887,6 +963,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1016,12 +1128,39 @@ newsletter_template.template_text_preprocessed + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1575,6 +1714,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1653,6 +1846,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2394,12 +2623,81 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/1.9.0.1/config.xml.dist b/etc/ce-to-ee/1.9.0.1/config.xml.dist index 53dcb6182..c7149e3e5 100644 --- a/etc/ce-to-ee/1.9.0.1/config.xml.dist +++ b/etc/ce-to-ee/1.9.0.1/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.9.0.1/map.xml.dist b/etc/ce-to-ee/1.9.0.1/map.xml.dist index e526070c3..4508c14bf 100644 --- a/etc/ce-to-ee/1.9.0.1/map.xml.dist +++ b/etc/ce-to-ee/1.9.0.1/map.xml.dist @@ -811,6 +811,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -887,6 +963,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1016,12 +1128,39 @@ newsletter_template.template_text_preprocessed + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1575,6 +1714,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1653,6 +1846,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2394,12 +2623,81 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/1.9.1.0/config.xml.dist b/etc/ce-to-ee/1.9.1.0/config.xml.dist index 0de3d4b0f..c57dd16b8 100644 --- a/etc/ce-to-ee/1.9.1.0/config.xml.dist +++ b/etc/ce-to-ee/1.9.1.0/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.9.1.0/map.xml.dist b/etc/ce-to-ee/1.9.1.0/map.xml.dist index cd87f7314..c31bbf61b 100644 --- a/etc/ce-to-ee/1.9.1.0/map.xml.dist +++ b/etc/ce-to-ee/1.9.1.0/map.xml.dist @@ -793,6 +793,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -869,6 +945,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -998,12 +1110,39 @@ newsletter_template.template_text_preprocessed + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1557,6 +1696,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1635,6 +1828,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2376,12 +2605,81 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/1.9.1.1/config.xml.dist b/etc/ce-to-ee/1.9.1.1/config.xml.dist index 717d9e853..77e1c5984 100644 --- a/etc/ce-to-ee/1.9.1.1/config.xml.dist +++ b/etc/ce-to-ee/1.9.1.1/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.9.1.1/map.xml.dist b/etc/ce-to-ee/1.9.1.1/map.xml.dist index cd87f7314..c31bbf61b 100644 --- a/etc/ce-to-ee/1.9.1.1/map.xml.dist +++ b/etc/ce-to-ee/1.9.1.1/map.xml.dist @@ -793,6 +793,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -869,6 +945,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -998,12 +1110,39 @@ newsletter_template.template_text_preprocessed + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1557,6 +1696,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1635,6 +1828,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2376,12 +2605,81 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month weee_tax.state + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/1.9.2.0/config.xml.dist b/etc/ce-to-ee/1.9.2.0/config.xml.dist index dcc5ad00b..a1996c1ba 100644 --- a/etc/ce-to-ee/1.9.2.0/config.xml.dist +++ b/etc/ce-to-ee/1.9.2.0/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.9.2.0/map.xml.dist b/etc/ce-to-ee/1.9.2.0/map.xml.dist index 7bfab59af..cacc69163 100644 --- a/etc/ce-to-ee/1.9.2.0/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.0/map.xml.dist @@ -793,6 +793,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -877,6 +953,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1006,6 +1118,24 @@ newsletter_template.template_text_preprocessed + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month @@ -1018,6 +1148,15 @@ rating_option_vote.remote_ip_long + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1577,6 +1716,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1655,6 +1848,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2396,6 +2625,66 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2408,6 +2697,15 @@ rating_option_vote.remote_ip_long + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/1.9.2.1/config.xml.dist b/etc/ce-to-ee/1.9.2.1/config.xml.dist index ab59426f9..474a1698d 100644 --- a/etc/ce-to-ee/1.9.2.1/config.xml.dist +++ b/etc/ce-to-ee/1.9.2.1/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.9.2.1/map.xml.dist b/etc/ce-to-ee/1.9.2.1/map.xml.dist index 7bfab59af..cacc69163 100644 --- a/etc/ce-to-ee/1.9.2.1/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.1/map.xml.dist @@ -793,6 +793,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -877,6 +953,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1006,6 +1118,24 @@ newsletter_template.template_text_preprocessed + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month @@ -1018,6 +1148,15 @@ rating_option_vote.remote_ip_long + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1577,6 +1716,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1655,6 +1848,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2396,6 +2625,66 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2408,6 +2697,15 @@ rating_option_vote.remote_ip_long + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/1.9.2.2/config.xml.dist b/etc/ce-to-ee/1.9.2.2/config.xml.dist index c206b86d6..7dab57557 100644 --- a/etc/ce-to-ee/1.9.2.2/config.xml.dist +++ b/etc/ce-to-ee/1.9.2.2/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.9.2.2/map.xml.dist b/etc/ce-to-ee/1.9.2.2/map.xml.dist index b4566c3c3..162ab32e5 100644 --- a/etc/ce-to-ee/1.9.2.2/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.2/map.xml.dist @@ -799,6 +799,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -883,6 +959,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1012,6 +1124,24 @@ newsletter_template.template_text_preprocessed + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month @@ -1024,6 +1154,15 @@ rating_option_vote.remote_ip_long + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1583,6 +1722,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1661,6 +1854,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2402,6 +2631,66 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2414,6 +2703,15 @@ rating_option_vote.remote_ip_long + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/1.9.2.3/config.xml.dist b/etc/ce-to-ee/1.9.2.3/config.xml.dist index cafb54e46..1d22ef870 100644 --- a/etc/ce-to-ee/1.9.2.3/config.xml.dist +++ b/etc/ce-to-ee/1.9.2.3/config.xml.dist @@ -128,6 +128,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ee diff --git a/etc/ce-to-ee/1.9.2.3/map.xml.dist b/etc/ce-to-ee/1.9.2.3/map.xml.dist index b4566c3c3..162ab32e5 100644 --- a/etc/ce-to-ee/1.9.2.3/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.3/map.xml.dist @@ -799,6 +799,82 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + catalog_category_entity_varchar.value @@ -883,6 +959,42 @@ catalog_product_entity_media_gallery.value_id + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1012,6 +1124,24 @@ newsletter_template.template_text_preprocessed + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + sales_flat_quote_payment.cc_exp_month @@ -1024,6 +1154,15 @@ rating_option_vote.remote_ip_long + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + @@ -1583,6 +1722,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1661,6 +1854,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2402,6 +2631,66 @@ sales_order.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2414,6 +2703,15 @@ rating_option_vote.remote_ip_long + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + diff --git a/etc/ce-to-ee/class-map.xml.dist b/etc/ce-to-ee/class-map.xml.dist index 50679201d..9628dbb95 100644 --- a/etc/ce-to-ee/class-map.xml.dist +++ b/etc/ce-to-ee/class-map.xml.dist @@ -96,7 +96,7 @@ catalog/product_attribute_backend_media - Magento\Catalog\Model\Product\Attribute\Backend\Media + catalog/product_attribute_backend_msrp diff --git a/etc/ce-to-ee/map-customer.xml.dist b/etc/ce-to-ee/map-customer.xml.dist index 75f28cc99..2d2177e17 100644 --- a/etc/ce-to-ee/map-customer.xml.dist +++ b/etc/ce-to-ee/map-customer.xml.dist @@ -156,6 +156,15 @@ customer_address_entity.vat_request_success + + customer_entity.failures_num + + + customer_entity.first_failure + + + customer_entity.lock_expires + diff --git a/etc/config.xsd b/etc/config.xsd index 4c2254890..6b2032148 100644 --- a/etc/config.xsd +++ b/etc/config.xsd @@ -99,6 +99,7 @@ + diff --git a/etc/ee-to-ee/1.11.0.0/config.xml.dist b/etc/ee-to-ee/1.11.0.0/config.xml.dist index 9afb431c4..a01dfc118 100644 --- a/etc/ee-to-ee/1.11.0.0/config.xml.dist +++ b/etc/ee-to-ee/1.11.0.0/config.xml.dist @@ -143,6 +143,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.11.0.1/config.xml.dist b/etc/ee-to-ee/1.11.0.1/config.xml.dist index b49331534..ccd04e19e 100644 --- a/etc/ee-to-ee/1.11.0.1/config.xml.dist +++ b/etc/ee-to-ee/1.11.0.1/config.xml.dist @@ -143,6 +143,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.11.0.2/config.xml.dist b/etc/ee-to-ee/1.11.0.2/config.xml.dist index 4c22b4163..093c4801d 100644 --- a/etc/ee-to-ee/1.11.0.2/config.xml.dist +++ b/etc/ee-to-ee/1.11.0.2/config.xml.dist @@ -143,6 +143,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.11.1.0/config.xml.dist b/etc/ee-to-ee/1.11.1.0/config.xml.dist index 2d8f81415..24c655864 100644 --- a/etc/ee-to-ee/1.11.1.0/config.xml.dist +++ b/etc/ee-to-ee/1.11.1.0/config.xml.dist @@ -143,6 +143,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.11.2.0/config.xml.dist b/etc/ee-to-ee/1.11.2.0/config.xml.dist index 90f5c19ee..4120d126d 100644 --- a/etc/ee-to-ee/1.11.2.0/config.xml.dist +++ b/etc/ee-to-ee/1.11.2.0/config.xml.dist @@ -143,6 +143,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.12.0.0/config.xml.dist b/etc/ee-to-ee/1.12.0.0/config.xml.dist index e7c1e8eb7..da56b23bc 100644 --- a/etc/ee-to-ee/1.12.0.0/config.xml.dist +++ b/etc/ee-to-ee/1.12.0.0/config.xml.dist @@ -148,6 +148,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.12.0.1/config.xml.dist b/etc/ee-to-ee/1.12.0.1/config.xml.dist index 783ea7200..3d5614dc2 100644 --- a/etc/ee-to-ee/1.12.0.1/config.xml.dist +++ b/etc/ee-to-ee/1.12.0.1/config.xml.dist @@ -148,6 +148,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.12.0.2/config.xml.dist b/etc/ee-to-ee/1.12.0.2/config.xml.dist index 0b058112d..bef152838 100644 --- a/etc/ee-to-ee/1.12.0.2/config.xml.dist +++ b/etc/ee-to-ee/1.12.0.2/config.xml.dist @@ -148,6 +148,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.13.0.0/config.xml.dist b/etc/ee-to-ee/1.13.0.0/config.xml.dist index 78295b73d..89ce4d419 100644 --- a/etc/ee-to-ee/1.13.0.0/config.xml.dist +++ b/etc/ee-to-ee/1.13.0.0/config.xml.dist @@ -148,6 +148,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.13.0.1/config.xml.dist b/etc/ee-to-ee/1.13.0.1/config.xml.dist index 9891153c6..84150a9a1 100644 --- a/etc/ee-to-ee/1.13.0.1/config.xml.dist +++ b/etc/ee-to-ee/1.13.0.1/config.xml.dist @@ -148,6 +148,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.13.0.2/config.xml.dist b/etc/ee-to-ee/1.13.0.2/config.xml.dist index 19db5ef31..578d637f8 100644 --- a/etc/ee-to-ee/1.13.0.2/config.xml.dist +++ b/etc/ee-to-ee/1.13.0.2/config.xml.dist @@ -148,6 +148,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.13.1.0/config.xml.dist b/etc/ee-to-ee/1.13.1.0/config.xml.dist index b917f0def..e61c5f3af 100644 --- a/etc/ee-to-ee/1.13.1.0/config.xml.dist +++ b/etc/ee-to-ee/1.13.1.0/config.xml.dist @@ -148,6 +148,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.14.0.0/config.xml.dist b/etc/ee-to-ee/1.14.0.0/config.xml.dist index 1a0336ea1..5cac2085c 100644 --- a/etc/ee-to-ee/1.14.0.0/config.xml.dist +++ b/etc/ee-to-ee/1.14.0.0/config.xml.dist @@ -148,6 +148,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.14.0.1/config.xml.dist b/etc/ee-to-ee/1.14.0.1/config.xml.dist index 0594528b0..14d3f7030 100644 --- a/etc/ee-to-ee/1.14.0.1/config.xml.dist +++ b/etc/ee-to-ee/1.14.0.1/config.xml.dist @@ -148,6 +148,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.14.1.0/config.xml.dist b/etc/ee-to-ee/1.14.1.0/config.xml.dist index ac502ec8b..fe13a7b79 100644 --- a/etc/ee-to-ee/1.14.1.0/config.xml.dist +++ b/etc/ee-to-ee/1.14.1.0/config.xml.dist @@ -156,6 +156,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.14.2.0/config.xml.dist b/etc/ee-to-ee/1.14.2.0/config.xml.dist index e9a863965..a463a76b5 100644 --- a/etc/ee-to-ee/1.14.2.0/config.xml.dist +++ b/etc/ee-to-ee/1.14.2.0/config.xml.dist @@ -156,6 +156,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.14.2.1/config.xml.dist b/etc/ee-to-ee/1.14.2.1/config.xml.dist index 2bf61b951..85f0f2785 100644 --- a/etc/ee-to-ee/1.14.2.1/config.xml.dist +++ b/etc/ee-to-ee/1.14.2.1/config.xml.dist @@ -156,6 +156,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.14.2.2/config.xml.dist b/etc/ee-to-ee/1.14.2.2/config.xml.dist index e6028adfe..3832f0c7c 100644 --- a/etc/ee-to-ee/1.14.2.2/config.xml.dist +++ b/etc/ee-to-ee/1.14.2.2/config.xml.dist @@ -156,6 +156,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/1.14.2.3/config.xml.dist b/etc/ee-to-ee/1.14.2.3/config.xml.dist index 4d50512ab..56b4648fc 100644 --- a/etc/ee-to-ee/1.14.2.3/config.xml.dist +++ b/etc/ee-to-ee/1.14.2.3/config.xml.dist @@ -156,6 +156,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ee-to-ee diff --git a/etc/ee-to-ee/class-map.xml.dist b/etc/ee-to-ee/class-map.xml.dist index 632844aa5..ea650b19f 100644 --- a/etc/ee-to-ee/class-map.xml.dist +++ b/etc/ee-to-ee/class-map.xml.dist @@ -96,7 +96,7 @@ catalog/product_attribute_backend_media - Magento\Catalog\Model\Product\Attribute\Backend\Media + catalog/product_attribute_backend_msrp diff --git a/etc/ee-to-ee/map-customer.xml.dist b/etc/ee-to-ee/map-customer.xml.dist index 75f28cc99..2d2177e17 100644 --- a/etc/ee-to-ee/map-customer.xml.dist +++ b/etc/ee-to-ee/map-customer.xml.dist @@ -156,6 +156,15 @@ customer_address_entity.vat_request_success + + customer_entity.failures_num + + + customer_entity.first_failure + + + customer_entity.lock_expires + diff --git a/src/Migration/Config.php b/src/Migration/Config.php index e8883dd44..7c440dd5c 100644 --- a/src/Migration/Config.php +++ b/src/Migration/Config.php @@ -16,6 +16,12 @@ class Config const CONFIGURATION_SCHEMA = 'config.xsd'; + const EDITION_MIGRATE_CE_TO_CE = 'ce-to-ce'; + + const EDITION_MIGRATE_CE_TO_EE = 'ce-to-ee'; + + const EDITION_MIGRATE_EE_TO_EE = 'ee-to-ee'; + /** * @var \DOMXPath */ diff --git a/src/Migration/Handler/FieldCopy.php b/src/Migration/Handler/FieldCopy.php new file mode 100644 index 000000000..a7c12c0a6 --- /dev/null +++ b/src/Migration/Handler/FieldCopy.php @@ -0,0 +1,39 @@ +fieldCopy = $fieldCopy; + } + + /** + * {@inheritdoc} + */ + public function handle(Record $recordToHandle, Record $oppositeRecord) + { + $this->validate($recordToHandle); + $fieldCopyValue = $recordToHandle->getValue($this->fieldCopy); + if ($fieldCopyValue) { + $recordToHandle->setValue($this->field, $fieldCopyValue); + } + } +} diff --git a/src/Migration/Handler/Sequence.php b/src/Migration/Handler/Sequence.php new file mode 100644 index 000000000..54dcdc59c --- /dev/null +++ b/src/Migration/Handler/Sequence.php @@ -0,0 +1,55 @@ +table = $table; + $this->destination = $destination; + } + + /** + * {@inheritdoc} + */ + public function handle(Record $recordToHandle, Record $oppositeRecord) + { + if (!in_array($this->table, $this->sequenceTablesCleaned)) { + $this->destination->clearDocument($this->table); + $this->sequenceTablesCleaned[] = $this->table; + } + $this->validate($recordToHandle); + $id = $recordToHandle->getValue($this->field); + if ($id && $this->table) { + $this->destination->saveRecords($this->table, [['sequence_value' => $id]]); + } + } +} diff --git a/src/Migration/ResourceModel/Adapter/Mysql.php b/src/Migration/ResourceModel/Adapter/Mysql.php index c67609329..f11b5e6b9 100644 --- a/src/Migration/ResourceModel/Adapter/Mysql.php +++ b/src/Migration/ResourceModel/Adapter/Mysql.php @@ -35,6 +35,11 @@ class Mysql implements \Migration\ResourceModel\AdapterInterface */ protected $triggers = []; + /** + * @var array + */ + protected $initSelectParts = []; + /** * @param \Magento\Framework\DB\Adapter\Pdo\MysqlFactory $adapterFactory * @param \Magento\Framework\DB\Ddl\TriggerFactory $triggerFactory @@ -45,10 +50,14 @@ public function __construct( \Magento\Framework\DB\Ddl\TriggerFactory $triggerFactory, array $config ) { - $configData['config'] = $config; + $configData['config'] = $config['database']; $this->resourceAdapter = $adapterFactory->create($configData); + $this->resourceAdapter->disallowDdlCache(); $this->setForeignKeyChecks(0); $this->triggerFactory = $triggerFactory; + $this->initSelectParts = (isset($config['init_select_parts']) && is_array($config['init_select_parts'])) + ? $config['init_select_parts'] + : []; } /** @@ -85,7 +94,7 @@ public function getRecordsCount($documentName, $distinctFields = []) $distinctFields = ($distinctFields && is_array($distinctFields)) ? 'DISTINCT ' . implode(',', $distinctFields) : '*'; - $select = $this->resourceAdapter->select(); + $select = $this->getSelect(); $select->from($documentName, 'COUNT(' . $distinctFields . ')'); $result = $this->resourceAdapter->fetchOne($select); return $result; @@ -96,7 +105,7 @@ public function getRecordsCount($documentName, $distinctFields = []) */ public function loadPage($documentName, $pageNumber, $pageSize, $identityField = null, $identityId = null) { - $select = $this->resourceAdapter->select(); + $select = $this->getSelect(); $select->from($documentName, '*'); if ($identityField && $identityId !== null) { $select->where("`$identityField` >= ?", ($identityId == 0 ? $identityId : $identityId + 1)); @@ -212,7 +221,7 @@ public function loadChangedRecords( $pageSize, $getProcessed = false ) { - $select = $this->resourceAdapter->select(); + $select = $this->getSelect(); $select->from($deltaLogName, []) ->join($documentName, "$documentName.$idKey = $deltaLogName.$idKey", '*') ->where("`operation` in ('INSERT', 'UPDATE')") @@ -229,7 +238,7 @@ public function loadChangedRecords( */ public function loadDeletedRecords($deltaLogName, $idKey, $pageNumber, $pageSize, $getProcessed = false) { - $select = $this->resourceAdapter->select(); + $select = $this->getSelect(); $select->from($deltaLogName, [$idKey]) ->where("`operation` = 'DELETE'") ->limit($pageSize, $pageNumber * $pageSize); @@ -258,7 +267,11 @@ public function loadDataFromSelect($select) */ public function getSelect() { - return $this->resourceAdapter->select(); + $select = $this->resourceAdapter->select(); + foreach ($this->initSelectParts as $partKey => $partValue) { + $select->setPart($partKey, $partValue); + } + return $select; } /** @@ -312,7 +325,7 @@ public function backupDocument($documentName) $tableCopy = $this->getTableDdlCopy($documentName, $backupTableName); if (!$this->resourceAdapter->isTableExists($backupTableName)) { $this->createTableByDdl($tableCopy); - $select = $this->resourceAdapter->select()->from($documentName); + $select = $this->getSelect()->from($documentName); $query = $this->resourceAdapter->insertFromSelect($select, $tableCopy->getName()); $this->resourceAdapter->query($query); } @@ -326,7 +339,7 @@ public function rollbackDocument($documentName) $backupTableName = self::BACKUP_DOCUMENT_PREFIX . $documentName; if ($this->resourceAdapter->isTableExists($backupTableName)) { $this->resourceAdapter->truncateTable($documentName); - $select = $this->resourceAdapter->select()->from($backupTableName); + $select = $this->getSelect()->from($backupTableName); $query = $this->resourceAdapter->insertFromSelect($select, $documentName); $this->resourceAdapter->query($query); $this->resourceAdapter->dropTable($backupTableName); diff --git a/src/Migration/ResourceModel/Destination.php b/src/Migration/ResourceModel/Destination.php index 81b3b636c..c5442e78f 100644 --- a/src/Migration/ResourceModel/Destination.php +++ b/src/Migration/ResourceModel/Destination.php @@ -6,6 +6,8 @@ namespace Migration\ResourceModel; +use \Migration\Config; + /** * ResourceModel destination class */ @@ -54,12 +56,16 @@ protected function getResourceConfig() { $destination = $this->configReader->getDestination(); $destinationType = $destination['type']; - $config['host'] = $destination[$destinationType]['host']; - $config['dbname'] = $destination[$destinationType]['name']; - $config['username'] = $destination[$destinationType]['user']; - $config['password'] = !empty($destination[$destinationType]['password']) + $config['database']['host'] = $destination[$destinationType]['host']; + $config['database']['dbname'] = $destination[$destinationType]['name']; + $config['database']['username'] = $destination[$destinationType]['user']; + $config['database']['password'] = !empty($destination[$destinationType]['password']) ? $destination[$destinationType]['password'] : ''; + $editionMigrate = $this->configReader->getOption('edition_migrate'); + if (in_array($editionMigrate, [Config::EDITION_MIGRATE_CE_TO_EE, Config::EDITION_MIGRATE_EE_TO_EE])) { + $config['init_select_parts'] = ['disable_staging_preview' => true]; + } return $config; } diff --git a/src/Migration/ResourceModel/Source.php b/src/Migration/ResourceModel/Source.php index 8d3257799..a3e64aac1 100644 --- a/src/Migration/ResourceModel/Source.php +++ b/src/Migration/ResourceModel/Source.php @@ -6,6 +6,8 @@ namespace Migration\ResourceModel; +use \Migration\Config; + /** * ResourceModel source class */ @@ -30,12 +32,16 @@ protected function getResourceConfig() { $source = $this->configReader->getSource(); $sourceType = $source['type']; - $config['host'] = $source[$sourceType]['host']; - $config['dbname'] = $source[$sourceType]['name']; - $config['username'] = $source[$sourceType]['user']; - $config['password'] = !empty($source[$sourceType]['password']) + $config['database']['host'] = $source[$sourceType]['host']; + $config['database']['dbname'] = $source[$sourceType]['name']; + $config['database']['username'] = $source[$sourceType]['user']; + $config['database']['password'] = !empty($source[$sourceType]['password']) ? $source[$sourceType]['password'] : ''; + $editionMigrate = $this->configReader->getOption('edition_migrate'); + if (in_array($editionMigrate, [Config::EDITION_MIGRATE_CE_TO_EE, Config::EDITION_MIGRATE_EE_TO_EE])) { + $config['init_select_parts'] = ['disable_staging_preview' => true]; + } return $config; } diff --git a/src/Migration/Step/ConfigurablePrices/Helper.php b/src/Migration/Step/ConfigurablePrices/Helper.php index fa81db545..5515f8edf 100644 --- a/src/Migration/Step/ConfigurablePrices/Helper.php +++ b/src/Migration/Step/ConfigurablePrices/Helper.php @@ -6,6 +6,7 @@ namespace Migration\Step\ConfigurablePrices; use Migration\ResourceModel\Destination; +use Migration\Config; /** * Class Helper @@ -22,13 +23,21 @@ class Helper */ protected $destinationRecordsCount = 0; + /** + * @var string + */ + protected $editionMigrate = ''; + /** * @param Destination $destination + * @param Config $config */ public function __construct( - Destination $destination + Destination $destination, + Config $config ) { $this->destination = $destination; + $this->editionMigrate = $config->getOption('edition_migrate'); } /** @@ -49,10 +58,13 @@ public function getSourceFields() */ public function getDestinationFields() { + $entityIdName = (empty($this->editionMigrate) || $this->editionMigrate == Config::EDITION_MIGRATE_CE_TO_CE) + ? 'entity_id' + : 'row_id'; return [ 'store_id' => 'catalog_product_entity_decimal', 'value' => 'catalog_product_entity_decimal', - 'entity_id' => 'catalog_product_entity_decimal', + $entityIdName => 'catalog_product_entity_decimal', 'attribute_id' => 'catalog_product_entity_decimal' ]; } diff --git a/src/Migration/Step/TierPrice/Helper.php b/src/Migration/Step/TierPrice/Helper.php index 302779fb3..758a5b6df 100644 --- a/src/Migration/Step/TierPrice/Helper.php +++ b/src/Migration/Step/TierPrice/Helper.php @@ -3,16 +3,32 @@ * Copyright © 2016 Magento. All rights reserved. * See COPYING.txt for license details. */ + namespace Migration\Step\TierPrice; +use Migration\Config; + /** * Class Helper */ class Helper { - const DESTINATION_DOCUMENT_NAME = 'catalog_product_entity_tier_price'; + /** + * @var string + */ + protected $editionMigrate = ''; + + /** + * @param Config $config + */ + public function __construct( + Config $config + ) { + $this->editionMigrate = $config->getOption('edition_migrate'); + } + /** * @return string */ @@ -52,10 +68,13 @@ public function getSourceDocumentFields() */ public function getDestinationDocumentFields() { + $entityIdName = (empty($this->editionMigrate) || $this->editionMigrate == Config::EDITION_MIGRATE_CE_TO_CE) + ? 'entity_id' + : 'row_id'; return [ self::DESTINATION_DOCUMENT_NAME => [ 'value_id', - 'entity_id', + $entityIdName, 'all_groups', 'customer_group_id', 'qty', From ab58ae81dffd864f14280acd15d2f20d428f6ace Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Mon, 18 Apr 2016 11:50:53 +0300 Subject: [PATCH 12/71] MAGETWO-48595: Fix Integrity check errors ee-to-ee --- etc/ee-to-ee/1.11.0.0/map.xml.dist | 362 +++++++++++++++-- etc/ee-to-ee/1.11.0.1/map.xml.dist | 362 +++++++++++++++-- etc/ee-to-ee/1.11.0.2/map.xml.dist | 362 +++++++++++++++-- etc/ee-to-ee/1.11.1.0/map.xml.dist | 362 +++++++++++++++-- etc/ee-to-ee/1.11.2.0/map.xml.dist | 362 +++++++++++++++-- etc/ee-to-ee/1.12.0.0/map.xml.dist | 363 +++++++++++++++-- etc/ee-to-ee/1.12.0.1/map.xml.dist | 360 +++++++++++++++-- etc/ee-to-ee/1.12.0.2/map.xml.dist | 360 +++++++++++++++-- etc/ee-to-ee/1.13.0.0/map.xml.dist | 364 +++++++++++++++-- etc/ee-to-ee/1.13.0.1/map.xml.dist | 364 +++++++++++++++-- etc/ee-to-ee/1.13.0.2/map.xml.dist | 364 +++++++++++++++-- etc/ee-to-ee/1.13.1.0/map.xml.dist | 370 ++++++++++++++++-- etc/ee-to-ee/1.14.0.0/map.xml.dist | 364 +++++++++++++++-- etc/ee-to-ee/1.14.0.1/map.xml.dist | 364 +++++++++++++++-- etc/ee-to-ee/1.14.1.0/map.xml.dist | 364 +++++++++++++++-- etc/ee-to-ee/1.14.2.0/map.xml.dist | 362 +++++++++++++++-- etc/ee-to-ee/1.14.2.1/map.xml.dist | 362 +++++++++++++++-- etc/ee-to-ee/1.14.2.2/map.xml.dist | 362 +++++++++++++++-- etc/ee-to-ee/1.14.2.3/map.xml.dist | 362 +++++++++++++++-- src/Migration/Step/UrlRewrite/Helper.php | 88 +++++ .../Step/UrlRewrite/Version11300to2000.php | 15 + .../Step/UrlRewrite/Version11410to2000.php | 15 + 22 files changed, 6285 insertions(+), 728 deletions(-) create mode 100644 src/Migration/Step/UrlRewrite/Helper.php 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 index 45a1c05c8..0e22de087 100644 --- a/etc/ee-to-ee/1.11.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.0/map.xml.dist @@ -656,6 +656,12 @@ enterprise_admin_passwords + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -880,14 +886,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1062,14 +1060,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1194,6 +1184,86 @@ enterprise_reminder_rule.active_to enterprise_reminder_rule.to_date + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1294,18 +1364,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1338,6 +1396,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1498,37 +1592,43 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount - catalogrule.customer_group_ids + catalogsearch_query.synonym_for - catalogrule.website_ids + catalogrule.sub_is_enable - salesrule.customer_group_ids + catalogrule.sub_simple_action - salesrule.website_ids + catalogrule.sub_discount_amount - sales_flat_quote_payment.cc_exp_month + catalogrule_product.sub_simple_action - weee_tax.state + catalogrule_product.sub_discount_amount - enterprise_reminder_rule.active_from + cms_page.published_revision_id - enterprise_reminder_rule.active_to + cms_page.under_version_control + + + sales_flat_quote_payment.cc_exp_month + + + weee_tax.state enterprise_catalogevent_event.date_start @@ -1536,6 +1636,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1945,6 +2060,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -2038,10 +2207,6 @@ - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -2050,6 +2215,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2320,6 +2521,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2338,6 +2599,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index 3f608463d..1471789f6 100644 --- a/etc/ee-to-ee/1.11.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.1/map.xml.dist @@ -656,6 +656,12 @@ core_website + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -880,14 +886,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1062,14 +1060,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1194,6 +1184,86 @@ enterprise_reminder_rule.active_to enterprise_reminder_rule.to_date + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1294,18 +1364,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1338,6 +1396,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1498,37 +1592,43 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount - catalogrule.customer_group_ids + catalogsearch_query.synonym_for - catalogrule.website_ids + catalogrule.sub_is_enable - salesrule.customer_group_ids + catalogrule.sub_simple_action - salesrule.website_ids + catalogrule.sub_discount_amount - sales_flat_quote_payment.cc_exp_month + catalogrule_product.sub_simple_action - weee_tax.state + catalogrule_product.sub_discount_amount - enterprise_reminder_rule.active_from + cms_page.published_revision_id - enterprise_reminder_rule.active_to + cms_page.under_version_control + + + sales_flat_quote_payment.cc_exp_month + + + weee_tax.state enterprise_catalogevent_event.date_start @@ -1536,6 +1636,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1945,6 +2060,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -2038,10 +2207,6 @@ - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -2050,6 +2215,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2320,6 +2521,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2338,6 +2599,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index 3f608463d..1471789f6 100644 --- a/etc/ee-to-ee/1.11.0.2/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.2/map.xml.dist @@ -656,6 +656,12 @@ core_website + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -880,14 +886,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1062,14 +1060,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1194,6 +1184,86 @@ enterprise_reminder_rule.active_to enterprise_reminder_rule.to_date + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1294,18 +1364,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1338,6 +1396,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1498,37 +1592,43 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount - catalogrule.customer_group_ids + catalogsearch_query.synonym_for - catalogrule.website_ids + catalogrule.sub_is_enable - salesrule.customer_group_ids + catalogrule.sub_simple_action - salesrule.website_ids + catalogrule.sub_discount_amount - sales_flat_quote_payment.cc_exp_month + catalogrule_product.sub_simple_action - weee_tax.state + catalogrule_product.sub_discount_amount - enterprise_reminder_rule.active_from + cms_page.published_revision_id - enterprise_reminder_rule.active_to + cms_page.under_version_control + + + sales_flat_quote_payment.cc_exp_month + + + weee_tax.state enterprise_catalogevent_event.date_start @@ -1536,6 +1636,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1945,6 +2060,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -2038,10 +2207,6 @@ - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -2050,6 +2215,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2320,6 +2521,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2338,6 +2599,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index d54f89454..2ac1a96fd 100644 --- a/etc/ee-to-ee/1.11.1.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.1.0/map.xml.dist @@ -656,6 +656,12 @@ core_website + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -880,14 +886,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1062,14 +1060,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1194,6 +1184,86 @@ enterprise_reminder_rule.active_to enterprise_reminder_rule.to_date + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1294,18 +1364,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1338,6 +1396,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1498,37 +1592,43 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount - catalogrule.customer_group_ids + catalogsearch_query.synonym_for - catalogrule.website_ids + catalogrule.sub_is_enable - salesrule.customer_group_ids + catalogrule.sub_simple_action - salesrule.website_ids + catalogrule.sub_discount_amount - sales_flat_quote_payment.cc_exp_month + catalogrule_product.sub_simple_action - weee_tax.state + catalogrule_product.sub_discount_amount - enterprise_reminder_rule.active_from + cms_page.published_revision_id - enterprise_reminder_rule.active_to + cms_page.under_version_control + + + sales_flat_quote_payment.cc_exp_month + + + weee_tax.state enterprise_catalogevent_event.date_start @@ -1536,6 +1636,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1933,6 +2048,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -2026,10 +2195,6 @@ - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -2038,6 +2203,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2293,6 +2494,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2311,6 +2572,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index b73a0c28c..ff5137987 100644 --- a/etc/ee-to-ee/1.11.2.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.2.0/map.xml.dist @@ -656,6 +656,12 @@ core_website + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -880,14 +886,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1062,14 +1060,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1194,6 +1184,86 @@ enterprise_reminder_rule.active_to enterprise_reminder_rule.to_date + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1294,18 +1364,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1338,6 +1396,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1498,37 +1592,43 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount - catalogrule.customer_group_ids + catalogsearch_query.synonym_for - catalogrule.website_ids + catalogrule.sub_is_enable - salesrule.customer_group_ids + catalogrule.sub_simple_action - salesrule.website_ids + catalogrule.sub_discount_amount - sales_flat_quote_payment.cc_exp_month + catalogrule_product.sub_simple_action - weee_tax.state + catalogrule_product.sub_discount_amount - enterprise_reminder_rule.active_from + cms_page.published_revision_id - enterprise_reminder_rule.active_to + cms_page.under_version_control + + + sales_flat_quote_payment.cc_exp_month + + + weee_tax.state enterprise_catalogevent_event.date_start @@ -1536,6 +1636,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1933,6 +2048,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -2026,10 +2195,6 @@ - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -2038,6 +2203,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2290,6 +2491,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2308,6 +2569,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index 90b9a914f..6eb238757 100644 --- a/etc/ee-to-ee/1.12.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.0/map.xml.dist @@ -662,6 +662,12 @@ catalog_product_entity_tier_price + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -886,14 +892,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1068,14 +1066,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1192,6 +1182,86 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1264,18 +1334,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1308,6 +1366,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1468,25 +1562,37 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount + + + catalogsearch_query.synonym_for - catalogrule.customer_group_ids + catalogrule.sub_is_enable - catalogrule.website_ids + catalogrule.sub_simple_action - salesrule.customer_group_ids + catalogrule.sub_discount_amount - salesrule.website_ids + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + cms_page.published_revision_id + + + cms_page.under_version_control sales_flat_quote_payment.cc_exp_month @@ -1500,6 +1606,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1879,6 +2000,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1972,10 +2147,6 @@ - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -1984,6 +2155,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2134,9 +2341,6 @@ cataloginventory_stock_item.use_config_deferred_stock_update - - quote_payment.cc_exp_month - quote.gw_base_price_incl_tax @@ -2173,6 +2377,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + weee_tax.state @@ -2182,6 +2446,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index 1cdc58dc1..c0da5e3dc 100644 --- a/etc/ee-to-ee/1.12.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.1/map.xml.dist @@ -662,6 +662,12 @@ catalog_product_entity_tier_price + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -886,14 +892,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1068,14 +1066,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1192,6 +1182,86 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1264,18 +1334,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1308,6 +1366,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1468,25 +1562,37 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount + + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount - catalogrule.customer_group_ids + catalogrule_product.sub_simple_action - catalogrule.website_ids + catalogrule_product.sub_discount_amount - salesrule.customer_group_ids + cms_page.published_revision_id - salesrule.website_ids + cms_page.under_version_control sales_flat_quote_payment.cc_exp_month @@ -1500,6 +1606,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1879,6 +2000,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1972,10 +2147,6 @@ - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -1984,6 +2155,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2170,6 +2377,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2182,6 +2449,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index 1cdc58dc1..c0da5e3dc 100644 --- a/etc/ee-to-ee/1.12.0.2/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.2/map.xml.dist @@ -662,6 +662,12 @@ catalog_product_entity_tier_price + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -886,14 +892,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1068,14 +1066,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1192,6 +1182,86 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1264,18 +1334,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1308,6 +1366,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1468,25 +1562,37 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount + + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount - catalogrule.customer_group_ids + catalogrule_product.sub_simple_action - catalogrule.website_ids + catalogrule_product.sub_discount_amount - salesrule.customer_group_ids + cms_page.published_revision_id - salesrule.website_ids + cms_page.under_version_control sales_flat_quote_payment.cc_exp_month @@ -1500,6 +1606,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1879,6 +2000,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1972,10 +2147,6 @@ - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -1984,6 +2155,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2170,6 +2377,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2182,6 +2449,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index f9623a858..f42b85265 100644 --- a/etc/ee-to-ee/1.13.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.13.0.0/map.xml.dist @@ -662,6 +662,12 @@ catalog_product_entity_tier_price + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -886,14 +892,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1068,14 +1066,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1192,6 +1182,86 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1264,18 +1334,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1308,6 +1366,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1468,13 +1562,37 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount + + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + cms_page.published_revision_id + + + cms_page.under_version_control sales_flat_quote_payment.cc_exp_month @@ -1488,6 +1606,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1843,6 +1976,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1917,10 +2104,6 @@ sales_order_status_state.visible_on_front - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -1929,6 +2112,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2073,6 +2292,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2085,6 +2364,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index f9623a858..f42b85265 100644 --- a/etc/ee-to-ee/1.13.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.13.0.1/map.xml.dist @@ -662,6 +662,12 @@ catalog_product_entity_tier_price + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -886,14 +892,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1068,14 +1066,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1192,6 +1182,86 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1264,18 +1334,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1308,6 +1366,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1468,13 +1562,37 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount + + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + cms_page.published_revision_id + + + cms_page.under_version_control sales_flat_quote_payment.cc_exp_month @@ -1488,6 +1606,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1843,6 +1976,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1917,10 +2104,6 @@ sales_order_status_state.visible_on_front - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -1929,6 +2112,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2073,6 +2292,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2085,6 +2364,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index f9623a858..f42b85265 100644 --- a/etc/ee-to-ee/1.13.0.2/map.xml.dist +++ b/etc/ee-to-ee/1.13.0.2/map.xml.dist @@ -662,6 +662,12 @@ catalog_product_entity_tier_price + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -886,14 +892,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1068,14 +1066,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1192,6 +1182,86 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1264,18 +1334,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1308,6 +1366,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1468,13 +1562,37 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount + + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + cms_page.published_revision_id + + + cms_page.under_version_control sales_flat_quote_payment.cc_exp_month @@ -1488,6 +1606,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1843,6 +1976,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1917,10 +2104,6 @@ sales_order_status_state.visible_on_front - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -1929,6 +2112,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2073,6 +2292,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2085,6 +2364,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index 12203debb..810a53b50 100644 --- a/etc/ee-to-ee/1.13.1.0/map.xml.dist +++ b/etc/ee-to-ee/1.13.1.0/map.xml.dist @@ -365,6 +365,12 @@ core_flag + + core_email_queue + + + core_email_queue_recipients + merchandiser_category_values @@ -662,6 +668,12 @@ catalog_product_entity_tier_price + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -886,14 +898,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1068,14 +1072,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1192,6 +1188,86 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1264,18 +1340,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1308,6 +1372,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1468,13 +1568,37 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount + + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + cms_page.published_revision_id + + + cms_page.under_version_control sales_flat_quote_payment.cc_exp_month @@ -1488,6 +1612,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1843,6 +1982,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1917,10 +2110,6 @@ sales_order_status_state.visible_on_front - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -1929,6 +2118,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2079,6 +2304,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2091,6 +2376,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index e646fcc83..e3220f3f3 100644 --- a/etc/ee-to-ee/1.14.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.14.0.0/map.xml.dist @@ -668,6 +668,12 @@ catalog_product_entity_tier_price + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -892,14 +898,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1074,14 +1072,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1198,6 +1188,86 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1270,18 +1340,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1314,6 +1372,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1474,13 +1568,37 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount + + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + cms_page.published_revision_id + + + cms_page.under_version_control sales_flat_quote_payment.cc_exp_month @@ -1494,6 +1612,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1849,6 +1982,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1923,10 +2110,6 @@ sales_order_status_state.visible_on_front - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -1935,6 +2118,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2076,6 +2295,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2088,6 +2367,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index e646fcc83..e3220f3f3 100644 --- a/etc/ee-to-ee/1.14.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.14.0.1/map.xml.dist @@ -668,6 +668,12 @@ catalog_product_entity_tier_price + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -892,14 +898,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1074,14 +1072,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1198,6 +1188,86 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1270,18 +1340,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1314,6 +1372,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1474,13 +1568,37 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount + + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + cms_page.published_revision_id + + + cms_page.under_version_control sales_flat_quote_payment.cc_exp_month @@ -1494,6 +1612,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1849,6 +1982,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1923,10 +2110,6 @@ sales_order_status_state.visible_on_front - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -1935,6 +2118,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2076,6 +2295,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2088,6 +2367,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index 6ca716f33..17ed0dee9 100644 --- a/etc/ee-to-ee/1.14.1.0/map.xml.dist +++ b/etc/ee-to-ee/1.14.1.0/map.xml.dist @@ -668,6 +668,12 @@ catalog_product_entity_tier_price + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -892,14 +898,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1082,14 +1080,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1206,6 +1196,86 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1278,18 +1348,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1322,6 +1380,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1482,13 +1576,37 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount + + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + cms_page.published_revision_id + + + cms_page.under_version_control sales_flat_quote_payment.cc_exp_month @@ -1502,6 +1620,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1851,6 +1984,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1925,10 +2112,6 @@ sales_order_status_state.visible_on_front - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -1937,6 +2120,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2078,6 +2297,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2090,6 +2369,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index 1ac72b6bf..e11bb16ad 100644 --- a/etc/ee-to-ee/1.14.2.0/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.0/map.xml.dist @@ -668,6 +668,12 @@ catalog_product_entity_tier_price + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -892,14 +898,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1082,14 +1080,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1206,6 +1196,86 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1278,18 +1348,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1338,6 +1396,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1498,19 +1592,37 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount - enterprise_giftregistry_person.middlename + catalogsearch_query.synonym_for - sales_flat_quote.base_customer_balance_virtual_amount + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + cms_page.published_revision_id + + + cms_page.under_version_control sales_flat_quote_payment.cc_exp_month @@ -1539,6 +1651,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1894,6 +2021,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1968,10 +2149,6 @@ sales_order_status_state.visible_on_front - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -1980,6 +2157,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2121,6 +2334,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2145,6 +2418,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index 1ac72b6bf..e11bb16ad 100644 --- a/etc/ee-to-ee/1.14.2.1/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.1/map.xml.dist @@ -668,6 +668,12 @@ catalog_product_entity_tier_price + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -892,14 +898,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1082,14 +1080,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1206,6 +1196,86 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1278,18 +1348,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1338,6 +1396,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1498,19 +1592,37 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount - enterprise_giftregistry_person.middlename + catalogsearch_query.synonym_for - sales_flat_quote.base_customer_balance_virtual_amount + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + cms_page.published_revision_id + + + cms_page.under_version_control sales_flat_quote_payment.cc_exp_month @@ -1539,6 +1651,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1894,6 +2021,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1968,10 +2149,6 @@ sales_order_status_state.visible_on_front - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -1980,6 +2157,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2121,6 +2334,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2145,6 +2418,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index 46dc181e8..5c01ce52f 100644 --- a/etc/ee-to-ee/1.14.2.2/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.2/map.xml.dist @@ -674,6 +674,12 @@ permission_variable + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -898,14 +904,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1088,14 +1086,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1212,6 +1202,86 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1284,18 +1354,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1344,6 +1402,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1504,19 +1598,37 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount - enterprise_giftregistry_person.middlename + catalogsearch_query.synonym_for - sales_flat_quote.base_customer_balance_virtual_amount + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + cms_page.published_revision_id + + + cms_page.under_version_control sales_flat_quote_payment.cc_exp_month @@ -1545,6 +1657,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1900,6 +2027,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1974,10 +2155,6 @@ sales_order_status_state.visible_on_front - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -1986,6 +2163,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2127,6 +2340,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2151,6 +2424,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + 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 index 46dc181e8..5c01ce52f 100644 --- a/etc/ee-to-ee/1.14.2.3/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.3/map.xml.dist @@ -674,6 +674,12 @@ permission_variable + + enterprise_cms_page_revision + + + enterprise_cms_page_version + catalogsearch_query search_query @@ -898,14 +904,6 @@ enterprise_cms_increment magento_versionscms_increment - - enterprise_cms_page_revision - magento_versionscms_page_revision - - - enterprise_cms_page_version - magento_versionscms_page_version - enterprise_customerbalance magento_customerbalance @@ -1088,14 +1086,6 @@ cms_page.root_template cms_page.page_layout - - enterprise_cms_page_revision.root_template - magento_versionscms_page_revision.page_layout - - - enterprise_cms_page_revision.custom_root_template - magento_versionscms_page_revision.custom_page_layout - sales_flat_creditmemo.hidden_tax_amount sales_creditmemo.discount_tax_compensation_amount @@ -1212,6 +1202,86 @@ sales_flat_quote_item.base_hidden_tax_amount quote_item.base_discount_tax_compensation_amount + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + catalog_category_entity_varchar.value @@ -1284,18 +1354,6 @@ enterprise_reminder_rule.condition_sql - - enterprise_cms_page_revision.root_template - - - - - - enterprise_cms_page_revision.custom_root_template - - - - enterprise_customersegment_segment.conditions_serialized @@ -1344,6 +1402,42 @@ enterprise_giftregistry_type.meta_xml + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + admin_rule.role_type @@ -1504,19 +1598,37 @@ enterprise_targetrule_product.store_id - enterprise_cms_page_revision.layout_update_xml + newsletter_template.template_text_preprocessed - enterprise_cms_page_revision.custom_layout_update_xml + enterprise_giftregistry_person.middlename - newsletter_template.template_text_preprocessed + sales_flat_quote.base_customer_balance_virtual_amount - enterprise_giftregistry_person.middlename + catalogsearch_query.synonym_for - sales_flat_quote.base_customer_balance_virtual_amount + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + cms_page.published_revision_id + + + cms_page.under_version_control sales_flat_quote_payment.cc_exp_month @@ -1545,6 +1657,21 @@ enterprise_catalogevent_event.date_end + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + @@ -1900,6 +2027,60 @@ oauth_token_request_log + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + @@ -1974,10 +2155,6 @@ sales_order_status_state.visible_on_front - - magento_versionscms_page_revision.content - - magento_banner_content.banner_content @@ -1986,6 +2163,42 @@ catalog_product_entity_media_gallery_value.entity_id + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + catalog_product_entity_media_gallery_value.entity_id @@ -2127,6 +2340,66 @@ quote_address.gw_card_price_incl_tax + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + quote_payment.cc_exp_month @@ -2151,6 +2424,21 @@ magento_catalogevent_event.date_end + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + diff --git a/src/Migration/Step/UrlRewrite/Helper.php b/src/Migration/Step/UrlRewrite/Helper.php new file mode 100644 index 000000000..0e1b7f082 --- /dev/null +++ b/src/Migration/Step/UrlRewrite/Helper.php @@ -0,0 +1,88 @@ + ['catalog_category_entity_varchar', 'catalog_product_entity_varchar'], + 'field_entity_id' => 'entity_id', + 'field_staging' => 'row_id', + ]; + + /** + * @param Config $config + */ + public function __construct( + \Migration\Config $config + ) { + $this->editionMigrate = $config->getOption('edition_migrate'); + } + + /** + * Fields processor + * + * @param $resourceType + * @param $tableName + * @param array $fields + * @param bool $inKeys + * @return array + */ + public function processFields($resourceType, $tableName, array $fields, $inKeys = false) + { + return $this->processFieldsOfStagingModule($resourceType, $tableName, $fields, $inKeys); + } + + /** + * Rename fields of staging module + * + * @param $resourceType + * @param $tableName + * @param array $fields + * @param bool $inKeys + * @return array + */ + private function processFieldsOfStagingModule($resourceType, $tableName, array $fields, $inKeys = false) + { + $fieldEntityId = $this->stagingConfig['field_entity_id']; + $fieldStaging = $this->stagingConfig['field_staging']; + $tablesStaging = $this->stagingConfig['tables']; + + if(empty($this->editionMigrate) + || $this->editionMigrate == Config::EDITION_MIGRATE_CE_TO_CE + || $resourceType == MapInterface::TYPE_SOURCE + || !in_array($tableName, $tablesStaging) + ) { + return $fields; + } + if ($inKeys && isset($fields[$fieldEntityId])) { + $fields[$fieldStaging] = $fields[$fieldEntityId]; + unset($fields[$fieldEntityId]); + } else { + $map = function($item) use ($fieldEntityId, $fieldStaging) { + return $item == $fieldEntityId ? $fieldStaging : $item; + }; + $fields = array_map($map, $fields); + } + return $fields; + } +} diff --git a/src/Migration/Step/UrlRewrite/Version11300to2000.php b/src/Migration/Step/UrlRewrite/Version11300to2000.php index b56398622..5e1988766 100644 --- a/src/Migration/Step/UrlRewrite/Version11300to2000.php +++ b/src/Migration/Step/UrlRewrite/Version11300to2000.php @@ -103,6 +103,11 @@ class Version11300to2000 extends DatabaseStage implements StageInterface, Rollba */ protected $suffixData; + /** + * @var \Migration\Step\UrlRewrite\Helper + */ + protected $helper; + /** * @var array */ @@ -191,6 +196,7 @@ public function __construct( \Migration\ResourceModel\Destination $destination, \Migration\ResourceModel\Record\CollectionFactory $recordCollectionFactory, \Migration\ResourceModel\RecordFactory $recordFactory, + \Migration\Step\UrlRewrite\Helper $helper, $stage ) { $this->progress = $progress; @@ -201,6 +207,7 @@ public function __construct( $this->recordFactory = $recordFactory; $this->tableName = 'url_rewrite_m2' . md5('url_rewrite_m2'); $this->stage = $stage; + $this->helper = $helper; parent::__construct($config); } @@ -417,6 +424,12 @@ protected function copyEavData($sourceName, $destinationName, $type) $storeRow = $row; $storeRow['store_id'] = $storeId; $storeRow['value'] = $storeRow['value'] . '-' . $urlKey; + $storeRow = $this->helper->processFields( + MapInterface::TYPE_DEST, + $destinationName, + $storeRow, + true + ); $records->addRecord($this->recordFactory->create(['data' => $storeRow])); if (!isset($this->resolvedDuplicates[$destinationName])) { $this->resolvedDuplicates[$destinationName] = 0; @@ -424,6 +437,7 @@ protected function copyEavData($sourceName, $destinationName, $type) $this->resolvedDuplicates[$destinationName]++; } } + $row = $this->helper->processFields(MapInterface::TYPE_DEST, $destinationName, $row, true); $records->addRecord($this->recordFactory->create(['data' => $row])); } $this->destination->saveRecords($destinationName, $records, true); @@ -450,6 +464,7 @@ protected function integrity() $errors = true; continue; } + $documentFields = $this->helper->processFields($resourceName, $documentName, $documentFields); $structure = array_keys($document->getStructure()->getFields()); if (!(empty(array_diff($structure, $documentFields)) && empty(array_diff($documentFields, $structure))) diff --git a/src/Migration/Step/UrlRewrite/Version11410to2000.php b/src/Migration/Step/UrlRewrite/Version11410to2000.php index e0e216f47..610715627 100644 --- a/src/Migration/Step/UrlRewrite/Version11410to2000.php +++ b/src/Migration/Step/UrlRewrite/Version11410to2000.php @@ -103,6 +103,11 @@ class Version11410to2000 extends DatabaseStage implements StageInterface, Rollba */ protected $suffixData; + /** + * @var \Migration\Step\UrlRewrite\Helper + */ + protected $helper; + /** * @var array */ @@ -196,6 +201,7 @@ public function __construct( \Migration\ResourceModel\Destination $destination, \Migration\ResourceModel\Record\CollectionFactory $recordCollectionFactory, \Migration\ResourceModel\RecordFactory $recordFactory, + \Migration\Step\UrlRewrite\Helper $helper, $stage ) { $this->progress = $progress; @@ -206,6 +212,7 @@ public function __construct( $this->recordFactory = $recordFactory; $this->tableName = 'url_rewrite_m2' . md5('url_rewrite_m2'); $this->stage = $stage; + $this->helper = $helper; parent::__construct($config); } @@ -422,6 +429,12 @@ protected function copyEavData($sourceName, $destinationName, $type) $storeRow = $row; $storeRow['store_id'] = $storeId; $storeRow['value'] = $storeRow['value'] . '-' . $urlKey; + $storeRow = $this->helper->processFields( + MapInterface::TYPE_DEST, + $destinationName, + $storeRow, + true + ); $records->addRecord($this->recordFactory->create(['data' => $storeRow])); if (!isset($this->resolvedDuplicates[$destinationName])) { $this->resolvedDuplicates[$destinationName] = 0; @@ -429,6 +442,7 @@ protected function copyEavData($sourceName, $destinationName, $type) $this->resolvedDuplicates[$destinationName]++; } } + $row = $this->helper->processFields(MapInterface::TYPE_DEST, $destinationName, $row, true); $records->addRecord($this->recordFactory->create(['data' => $row])); } $this->destination->saveRecords($destinationName, $records, true); @@ -455,6 +469,7 @@ protected function integrity() $errors = true; continue; } + $documentFields = $this->helper->processFields($resourceName, $documentName, $documentFields); $structure = array_keys($document->getStructure()->getFields()); if (!(empty(array_diff($structure, $documentFields)) && empty(array_diff($documentFields, $structure))) From afde2bfa95c096096e6402562e42c96141e346de Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Mon, 18 Apr 2016 17:15:00 +0300 Subject: [PATCH 13/71] MAGETWO-51396: Create map files for 1.9.2.4 and 1.14.2.4 --- etc/ce-to-ce/1.9.2.4/config.xml.dist | 134 ++ etc/ce-to-ce/1.9.2.4/map.xml.dist | 1565 ++++++++++++++ etc/ce-to-ee/1.9.2.4/config.xml.dist | 134 ++ etc/ce-to-ee/1.9.2.4/map.xml.dist | 2714 +++++++++++++++++++++++++ etc/ee-to-ee/1.14.2.4/config.xml.dist | 162 ++ etc/ee-to-ee/1.14.2.4/map.xml.dist | 2441 ++++++++++++++++++++++ 6 files changed, 7150 insertions(+) create mode 100644 etc/ce-to-ce/1.9.2.4/config.xml.dist create mode 100644 etc/ce-to-ce/1.9.2.4/map.xml.dist create mode 100644 etc/ce-to-ee/1.9.2.4/config.xml.dist create mode 100644 etc/ce-to-ee/1.9.2.4/map.xml.dist create mode 100644 etc/ee-to-ee/1.14.2.4/config.xml.dist create mode 100644 etc/ee-to-ee/1.14.2.4/map.xml.dist diff --git a/etc/ce-to-ce/1.9.2.4/config.xml.dist b/etc/ce-to-ce/1.9.2.4/config.xml.dist new file mode 100644 index 000000000..fca92966f --- /dev/null +++ b/etc/ce-to-ce/1.9.2.4/config.xml.dist @@ -0,0 +1,134 @@ + + + + + + Migration\Step\Settings\Integrity + Migration\Step\Settings\Data + + + Migration\Step\Stores\Integrity + Migration\Step\Stores\Data + Migration\Step\Stores\Volume + + + + + Migration\Step\Eav\Integrity + Migration\Step\Eav\Data + Migration\Step\Eav\Volume + + + Migration\Step\Customer\Integrity + Migration\Step\Customer\Data + Migration\Step\Customer\Volume + + + Migration\Step\Map\Integrity + Migration\Step\Map\Data + Migration\Step\Map\Volume + + + Migration\Step\UrlRewrite\Version191to2000 + Migration\Step\UrlRewrite\Version191to2000 + Migration\Step\UrlRewrite\Version191to2000 + + + Migration\Step\Log\Integrity + Migration\Step\Log\Data + Migration\Step\Log\Volume + + + Migration\Step\Ratings\Integrity + Migration\Step\Ratings\Data + Migration\Step\Ratings\Volume + + + Migration\Step\ConfigurablePrices\Integrity + Migration\Step\ConfigurablePrices\Data + Migration\Step\ConfigurablePrices\Volume + + + Migration\Step\OrderGrids\Integrity + Migration\Step\OrderGrids\Data + Migration\Step\OrderGrids\Volume + + + Migration\Step\TierPrice\Integrity + Migration\Step\TierPrice\Data + Migration\Step\TierPrice\Volume + + + Migration\Step\SalesIncrement\Integrity + Migration\Step\SalesIncrement\Data + Migration\Step\SalesIncrement\Volume + + + + + Migration\Step\Customer\Delta + Migration\Step\Customer\Volume + + + Migration\Step\Map\Delta + Migration\Step\Map\Volume + + + Migration\Step\Log\Delta + Migration\Step\Log\Volume + + + Migration\Step\OrderGrids\Delta + Migration\Step\OrderGrids\Volume + + + Migration\Step\SalesIncrement\Delta + Migration\Step\SalesIncrement\Volume + + + + + + + + + + etc/ce-to-ce/1.9.2.4/map.xml.dist + etc/ce-to-ce/map-eav.xml.dist + etc/ce-to-ce/eav-document-groups.xml.dist + etc/ce-to-ce/eav-attribute-groups.xml.dist + etc/ce-to-ce/map-log.xml.dist + etc/ce-to-ce/log-document-groups.xml.dist + etc/ce-to-ce/settings.xml.dist + etc/ce-to-ce/map-customer.xml.dist + etc/ce-to-ce/customer-document-groups.xml.dist + etc/ce-to-ce/customer-attribute-groups.xml.dist + etc/ce-to-ce/deltalog.xml.dist + etc/ce-to-ce/order-grids-document-groups.xml.dist + etc/ce-to-ce/map-document-groups.xml.dist + etc/ce-to-ce/class-map.xml.dist + + 0 + + 0 + + + 0 + migration.log + %percent%% [%bar%] Remaining Time: %remaining% + 1 + ce-to-ce + + + diff --git a/etc/ce-to-ce/1.9.2.4/map.xml.dist b/etc/ce-to-ce/1.9.2.4/map.xml.dist new file mode 100644 index 000000000..a8b7a5b6c --- /dev/null +++ b/etc/ce-to-ce/1.9.2.4/map.xml.dist @@ -0,0 +1,1565 @@ + + + + + + + googleshopping_attributes + + + googleshopping_items + + + googleshopping_types + + + sales_flat_creditmemo_grid + + + sales_flat_invoice_grid + + + sales_flat_order_grid + + + sales_flat_shipment_grid + + + customer_entity + + + customer_entity_datetime + + + customer_entity_decimal + + + customer_entity_int + + + customer_entity_text + + + customer_entity_varchar + + + customer_address_entity + + + customer_address_entity_datetime + + + customer_address_entity_decimal + + + customer_address_entity_int + + + customer_address_entity_text + + + customer_address_entity_varchar + + + m2_cl_* + + + url_rewrite_m2* + + + admin_assert + + + api2_acl_attribute + + + api2_acl_role + + + api2_acl_rule + + + api2_acl_user + + + api_assert + + + api_role + + + api_rule + + + api_session + + + api_user + + + log_customer + + + log_quote + + + log_summary_type + + + log_summary + + + log_url + + + log_url_info + + + catalog_category_anc_categs_index_idx + + + catalog_category_anc_categs_index_tmp + + + catalog_category_anc_products_index_idx + + + catalog_category_anc_products_index_tmp + + + catalog_category_flat_cl + + + catalog_category_product_index + + + catalog_category_product_index_cl + + + catalog_category_product_index_enbl_idx + + + catalog_category_product_index_enbl_tmp + + + catalog_category_product_index_idx + + + catalog_category_product_index_tmp + + + catalog_product_enabled_index + + + catalog_product_flat_cl + + + cataloginventory_stock_status_idx + + + cataloginventory_stock_status_tmp + + + catalog_category_product_cat_cl + + + catalog_product_bundle_price_index + + + catalog_product_bundle_stock_index + + + catalog_product_index_group_price + + + catalog_product_index_price + + + catalog_product_index_price* + + + catalog_product_index_tier_price + + + catalog_product_index_website + + + catalogindex_aggregation + + + catalogindex_aggregation_tag + + + catalogindex_aggregation_to_tag + + + catalogindex_minimal_price + + + catalogindex_price + + + core_layout_update + + + core_layout_link + + + widget_instance_page_layout + + + googlecheckout_api_debug + + + ogone_api_debug + + + oscommerce_import + + + oscommerce_import_type + + + oscommerce_orders + + + oscommerce_orders_products + + + oscommerce_orders_status_history + + + oscommerce_orders_total + + + oscommerce_ref + + + paygate_authorizenet_debug + + + paypal_api_debug + + + paypaluk_api_debug + + + amazonpayments_api_debug + + + chronopay_api_debug + + + cybermut_api_debug + + + cybersource_api_debug + + + eway_api_debug + + + flo2cash_api_debug + + + ideal_api_debug + + + paybox_api_debug + + + protx_api_debug + + + googlecheckout_notification + + + index_event + + + index_process + + + index_process_event + + + cataloginventory_stock_status_cl + + + catalogsearch_fulltext + + + catalogsearch_fulltext_cl + + + core_cache_tag + + + core_cache_option + + + core_cache + + + core_flag + + + core_email_queue + + + core_email_queue_recipients + + + merchandiser_category_values + + + merchandiser_vmbuild + + + dataflow_batch + + + dataflow_batch_export + + + dataflow_batch_import + + + dataflow_import_data + + + dataflow_profile + + + dataflow_profile_history + + + dataflow_session + + + core_url_rewrite + + + catalog_product_entity_url_key + + + catalogindex_eav + + + catalog_eav_attribute + + + customer_eav_attribute + + + catalog_product_index_eav + + + catalog_product_index_eav_decimal + + + catalog_product_index_eav_decimal_idx + + + catalog_product_index_eav_decimal_tmp + + + catalog_product_index_eav_idx + + + catalog_product_index_eav_tmp + + + eav_attribute + + + eav_attribute_group + + + eav_attribute_set + + + eav_entity_attribute + + + eav_entity_type + + + catalog_category_entity_url_key + + + poll + + + poll_answer + + + poll_store + + + poll_vote + + + sales_recurring_profile + + + sales_recurring_profile_order + + + tag + + + tag_properties + + + tag_relation + + + tag_summary + + + weee_discount + + + catalogsearch_result + + + log_visitor + + + log_visitor_info + + + log_visitor_online + + + core_config_data + + + s_*b_*_* + + + catalog_product_flat_* + + + catalog_category_flat_* + + + catalog_category_flat_store_* + + + googleoptimizer_code + + + core_resource + + + cron_schedule + + + admin_user + + + admin_role + + + admin_rule + + + admin_role + + + admin_rule + + + catalogrule_affected_product + + + catalog_product_super_attribute_pricing + + + core_website + + + catalog_product_entity_group_price + + + catalog_product_entity_tier_price + + + permission_block + + + permission_variable + + + catalogsearch_query + search_query + + + core_variable + variable + + + core_variable_value + variable_value + + + core_email_template + email_template + + + core_store + store + + + core_store_group + store_group + + + core_translate + translation + + + core_session + session + + + coupon_aggregated + salesrule_coupon_aggregated + + + coupon_aggregated_order + salesrule_coupon_aggregated_order + + + coupon_aggregated_updated + salesrule_coupon_aggregated_updated + + + sales_flat_order + sales_order + + + sales_flat_creditmemo + sales_creditmemo + + + sales_flat_creditmemo_comment + sales_creditmemo_comment + + + sales_flat_creditmemo_item + sales_creditmemo_item + + + sales_flat_invoice + sales_invoice + + + sales_flat_invoice_comment + sales_invoice_comment + + + sales_flat_invoice_item + sales_invoice_item + + + sales_flat_order_address + sales_order_address + + + sales_flat_order_item + sales_order_item + + + sales_flat_order_payment + sales_order_payment + + + sales_flat_order_status_history + sales_order_status_history + + + sales_flat_quote + quote + + + sales_flat_quote_address + quote_address + + + sales_flat_quote_address_item + quote_address_item + + + sales_flat_quote_item + quote_item + + + sales_flat_quote_item_option + quote_item_option + + + sales_flat_quote_payment + quote_payment + + + sales_flat_quote_shipping_rate + quote_shipping_rate + + + sales_flat_shipment + sales_shipment + + + sales_flat_shipment_comment + sales_shipment_comment + + + sales_flat_shipment_item + sales_shipment_item + + + sales_flat_shipment_track + sales_shipment_track + + + core_directory_storage + media_storage_directory_storage + + + core_file_storage + media_storage_file_storage + + + sales_billing_agreement + paypal_billing_agreement + + + sales_billing_agreement_order + paypal_billing_agreement_order + + + + + cms_page.root_template + cms_page.page_layout + + + sales_flat_order.hidden_tax_amount + sales_order.discount_tax_compensation_amount + + + sales_flat_order.base_hidden_tax_amount + sales_order.base_discount_tax_compensation_amount + + + sales_flat_order.shipping_hidden_tax_amount + sales_order.shipping_discount_tax_compensation_amount + + + sales_flat_order.base_shipping_hidden_tax_amnt + sales_order.base_shipping_discount_tax_compensation_amnt + + + sales_flat_order.hidden_tax_invoiced + sales_order.discount_tax_compensation_invoiced + + + sales_flat_order.base_hidden_tax_invoiced + sales_order.base_discount_tax_compensation_invoiced + + + sales_flat_order.hidden_tax_refunded + sales_order.discount_tax_compensation_refunded + + + sales_flat_order.base_hidden_tax_refunded + sales_order.base_discount_tax_compensation_refunded + + + sales_flat_creditmemo.hidden_tax_amount + sales_creditmemo.discount_tax_compensation_amount + + + sales_flat_creditmemo.base_hidden_tax_amount + sales_creditmemo.base_discount_tax_compensation_amount + + + sales_flat_creditmemo.shipping_hidden_tax_amount + sales_creditmemo.shipping_discount_tax_compensation_amount + + + sales_flat_creditmemo.base_shipping_hidden_tax_amnt + sales_creditmemo.base_shipping_discount_tax_compensation_amnt + + + sales_flat_creditmemo_item.hidden_tax_amount + sales_creditmemo_item.discount_tax_compensation_amount + + + sales_flat_creditmemo_item.base_hidden_tax_amount + sales_creditmemo_item.base_discount_tax_compensation_amount + + + sales_flat_invoice.hidden_tax_amount + sales_invoice.discount_tax_compensation_amount + + + sales_flat_invoice.base_hidden_tax_amount + sales_invoice.base_discount_tax_compensation_amount + + + sales_flat_invoice.shipping_hidden_tax_amount + sales_invoice.shipping_discount_tax_compensation_amount + + + sales_flat_invoice.base_shipping_hidden_tax_amnt + sales_invoice.base_shipping_discount_tax_compensation_amnt + + + sales_flat_invoice_item.hidden_tax_amount + sales_invoice_item.discount_tax_compensation_amount + + + sales_flat_invoice_item.base_hidden_tax_amount + sales_invoice_item.base_discount_tax_compensation_amount + + + sales_flat_order_item.hidden_tax_amount + sales_order_item.discount_tax_compensation_amount + + + sales_flat_order_item.base_hidden_tax_amount + sales_order_item.base_discount_tax_compensation_amount + + + sales_flat_order_item.hidden_tax_invoiced + sales_order_item.discount_tax_compensation_invoiced + + + sales_flat_order_item.base_hidden_tax_invoiced + sales_order_item.base_discount_tax_compensation_invoiced + + + sales_flat_order_item.hidden_tax_refunded + sales_order_item.discount_tax_compensation_refunded + + + sales_flat_order_item.base_hidden_tax_refunded + sales_order_item.base_discount_tax_compensation_refunded + + + sales_flat_order_item.hidden_tax_canceled + sales_order_item.discount_tax_compensation_canceled + + + sales_flat_order_payment.cc_last4 + sales_order_payment.cc_last_4 + + + sales_flat_quote_payment.cc_last4 + quote_payment.cc_last_4 + + + sales_flat_quote_address.hidden_tax_amount + quote_address.discount_tax_compensation_amount + + + sales_flat_quote_address.base_hidden_tax_amount + quote_address.base_discount_tax_compensation_amount + + + sales_flat_quote_address.shipping_hidden_tax_amount + quote_address.shipping_discount_tax_compensation_amount + + + sales_flat_quote_address.base_shipping_hidden_tax_amnt + quote_address.base_shipping_discount_tax_compensation_amnt + + + sales_flat_quote_address_item.hidden_tax_amount + quote_address_item.discount_tax_compensation_amount + + + sales_flat_quote_address_item.base_hidden_tax_amount + quote_address_item.base_discount_tax_compensation_amount + + + sales_flat_quote_item.hidden_tax_amount + quote_item.discount_tax_compensation_amount + + + sales_flat_quote_item.base_hidden_tax_amount + quote_item.base_discount_tax_compensation_amount + + + catalog_category_entity_varchar.value + + + + + + + catalog_product_entity_varchar.value + + + + + + + cms_page.root_template + + + + + + cms_block.content + + + + cms_page.content + + + + newsletter_template.template_text + + + + core_email_template.template_text + + + + widget_instance.instance_type + + + + catalogrule.conditions_serialized + + + + catalogrule.actions_serialized + + + + salesrule.conditions_serialized + + + + salesrule.actions_serialized + + + + sales_flat_order_item.weee_tax_applied + + + + sales_flat_quote_item.weee_tax_applied + + + + sales_flat_creditmemo_item.weee_tax_applied + + + + sales_flat_invoice_item.weee_tax_applied + + + + catalog_product_entity_media_gallery.value_id + + + + rating_option_vote.remote_ip_long + + + + sendfriend_log.ip + + + + catalogsearch_query.synonym_for + + + + admin_rule.role_type + + + admin_rule.assert_id + + + core_website.is_staging + + + core_website.master_login + + + core_website.master_password + + + core_website.visibility + + + sales_order_tax.hidden + + + sales_flat_order.paypal_ipn_customer_notified + + + sales_flat_order_item.is_nominal + + + sales_flat_order_payment.paybox_request_number + + + weee_tax.entity_type_id + + + catalog_category_entity.entity_type_id + + + catalog_category_entity_datetime.entity_type_id + + + catalog_category_entity_decimal.entity_type_id + + + catalog_category_entity_int.entity_type_id + + + catalog_category_entity_text.entity_type_id + + + catalog_category_entity_varchar.entity_type_id + + + catalog_product_entity.entity_type_id + + + catalog_product_entity_datetime.entity_type_id + + + catalog_product_entity_decimal.entity_type_id + + + catalog_product_entity_gallery.entity_type_id + + + catalog_product_entity_media_gallery.entity_id + + + catalog_product_entity_int.entity_type_id + + + catalog_product_entity_text.entity_type_id + + + catalog_product_entity_varchar.entity_type_id + + + sales_flat_creditmemo.cybersource_token + + + sales_flat_invoice.cybersource_token + + + sales_flat_order_payment.ideal_transaction_checked + + + sales_flat_order_payment.cybersource_token + + + sales_flat_order_payment.ideal_issuer_title + + + sales_flat_order_payment.paybox_question_number + + + sales_flat_order_payment.ideal_issuer_id + + + sales_flat_order_payment.flo2cash_account_id + + + sales_flat_quote_payment.cybersource_token + + + sales_flat_quote_payment.ideal_issuer_id + + + sales_flat_quote_payment.ideal_issuer_list + + + sales_flat_quote_payment.paypal_payer_id + + + sales_flat_quote_payment.paypal_payer_status + + + sales_flat_quote_payment.paypal_correlation_id + + + cms_page.layout_update_xml + + + cms_page.custom_layout_update_xml + + + widget_instance.package_theme + + + newsletter_template.template_text_preprocessed + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + catalogsearch_query.synonym_for + + + sales_flat_quote_payment.cc_exp_month + + + weee_tax.state + + + sendfriend_log.ip + + + rating_option_vote.remote_ip_long + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + + + + + customer_entity + + + customer_entity_datetime + + + customer_entity_decimal + + + customer_entity_int + + + customer_entity_text + + + customer_entity_varchar + + + customer_address_entity + + + customer_address_entity_datetime + + + customer_address_entity_decimal + + + customer_address_entity_int + + + customer_address_entity_text + + + customer_address_entity_varchar + + + ui_bookmark + + + migration_backup_* + + + googleoptimizer_code + + + indexer_state + + + integration + + + mview_state + + + theme + + + theme_file + + + vde_theme_change + + + admin_system_messages + + + catalog_url_rewrite_product_category + + + customer_visitor + + + url_rewrite + + + layout_update + + + layout_link + + + catalog_product_flat_* + + + catalog_category_flat_* + + + catalogindex_eav + + + catalog_eav_attribute + + + catalogsearch_fulltext_index_default + + + customer_eav_attribute + + + customer_eav_attribute_website + + + catalog_product_index_eav + + + catalog_product_index_eav_decimal + + + catalog_product_index_eav_decimal_idx + + + catalog_product_index_eav_decimal_tmp + + + catalog_product_index_eav_idx + + + catalog_product_index_eav_tmp + + + catalog_category_product_index_tmp + + + eav_attribute + + + eav_attribute_group + + + eav_attribute_set + + + eav_entity_attribute + + + eav_entity_type + + + authorization_role + + + authorization_rule + + + setup_module + + + cache + + + cache_tag + + + customer_log + + + flag + + + log_customer + + + log_quote + + + log_summary_type + + + log_summary + + + log_url + + + log_url_info + + + quote_id_mask + + + session + + + sales_sequence_profile + + + sales_sequence_meta + + + sequence_invoice_* + + + sequence_creditmemo_* + + + sequence_order_* + + + sequence_shipment* + + + sequence_rma_item_* + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + search_synonyms + + + eav_attribute_option_swatch + + + import_history + + + sales_creditmemo_grid + + + sales_invoice_grid + + + sales_order_grid + + + sales_shipment_grid + + + catalogsearch_fulltext_scope* + + + store_website + + + log_visitor_info + + + log_visitor_online + + + reporting_module_status + + + reporting_orders + + + reporting_system_updates + + + reporting_users + + + reporting_counts + + + admin_passwords + + + catalog_product_entity_media_gallery_value_to_entity + + + catalog_product_entity_media_gallery_value_video + + + catalog_product_entity_tier_price + + + customer_grid_flat + + + admin_user_session + + + password_reset_request_event + + + oauth_token_request_log + + + design_config_grid_flat + + + + + admin_user.interface_locale + + + + + + cataloginventory_stock.website_id + + + + cataloginventory_stock_item.website_id + + + + rating.is_active + + + + + + authorization_role.user_type + + + + + + sales_order_tax_item.amount + + + + + + sales_order_tax_item.base_amount + + + + + + sales_order_tax_item.real_amount + + + + + + sales_order_tax_item.real_base_amount + + + + + + sales_order_tax_item.taxable_item_type + + + + + + oauth_token.user_type + + + + + + widget_instance.theme_id + + + + + + sales_order_status_state.visible_on_front + + + + catalog_product_entity_media_gallery_value.entity_id + + + + catalog_product_entity_media_gallery_value.entity_id + + + catalog_product_entity_media_gallery.media_type + + + catalog_product_entity_media_gallery.disabled + + + catalog_product_entity_media_gallery_value.record_id + + + admin_user.interface_locale + + + admin_user.failures_num + + + admin_user.first_failure + + + admin_user.lock_expires + + + rating.is_active + + + sales_creditmemo.send_email + + + sales_creditmemo.customer_note + + + sales_creditmemo.customer_note_notify + + + sales_invoice.send_email + + + sales_invoice.customer_note + + + sales_invoice.customer_note_notify + + + sales_shipment.send_email + + + sales_shipment.customer_note + + + sales_shipment.customer_note_notify + + + sales_creditmemo_item.tax_ratio + + + sales_invoice_item.tax_ratio + + + authorization_role.user_type + + + cataloginventory_stock.website_id + + + cataloginventory_stock_item.website_id + + + oauth_nonce.consumer_id + + + oauth_token.user_type + + + sales_order_status_state.visible_on_front + + + widget_instance.theme_id + + + sales_order_tax_item.amount + + + sales_order_tax_item.base_amount + + + sales_order_tax_item.real_amount + + + sales_order_tax_item.real_base_amount + + + sales_order_tax_item.associated_item_id + + + sales_order_tax_item.taxable_item_type + + + sales_creditmemo_grid.updated_at + + + sales_invoice_grid.updated_at + + + sales_shipment_grid.updated_at + + + sales_order.send_email + + + checkout_agreement.mode + + + catalog_category_product.entity_id + + + quote_payment.cc_exp_month + + + weee_tax.state + + + sendfriend_log.ip + + + rating_option_vote.remote_ip_long + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + + diff --git a/etc/ce-to-ee/1.9.2.4/config.xml.dist b/etc/ce-to-ee/1.9.2.4/config.xml.dist new file mode 100644 index 000000000..e89543a8b --- /dev/null +++ b/etc/ce-to-ee/1.9.2.4/config.xml.dist @@ -0,0 +1,134 @@ + + + + + + Migration\Step\Settings\Integrity + Migration\Step\Settings\Data + + + Migration\Step\Stores\Integrity + Migration\Step\Stores\Data + Migration\Step\Stores\Volume + + + + + Migration\Step\Eav\Integrity + Migration\Step\Eav\Data + Migration\Step\Eav\Volume + + + Migration\Step\Customer\Integrity + Migration\Step\Customer\Data + Migration\Step\Customer\Volume + + + Migration\Step\Map\Integrity + Migration\Step\Map\Data + Migration\Step\Map\Volume + + + Migration\Step\UrlRewrite\Version191to2000 + Migration\Step\UrlRewrite\Version191to2000 + Migration\Step\UrlRewrite\Version191to2000 + + + Migration\Step\Log\Integrity + Migration\Step\Log\Data + Migration\Step\Log\Volume + + + Migration\Step\Ratings\Integrity + Migration\Step\Ratings\Data + Migration\Step\Ratings\Volume + + + Migration\Step\ConfigurablePrices\Integrity + Migration\Step\ConfigurablePrices\Data + Migration\Step\ConfigurablePrices\Volume + + + Migration\Step\OrderGrids\Integrity + Migration\Step\OrderGrids\Data + Migration\Step\OrderGrids\Volume + + + Migration\Step\TierPrice\Integrity + Migration\Step\TierPrice\Data + Migration\Step\TierPrice\Volume + + + Migration\Step\SalesIncrement\Integrity + Migration\Step\SalesIncrement\Data + Migration\Step\SalesIncrement\Volume + + + + + Migration\Step\Customer\Delta + Migration\Step\Customer\Volume + + + Migration\Step\Map\Delta + Migration\Step\Map\Volume + + + Migration\Step\Log\Delta + Migration\Step\Log\Volume + + + Migration\Step\OrderGrids\Delta + Migration\Step\OrderGrids\Volume + + + Migration\Step\SalesIncrement\Delta + Migration\Step\SalesIncrement\Volume + + + + + + + + + + etc/ce-to-ee/1.9.2.4/map.xml.dist + etc/ce-to-ee/map-eav.xml.dist + etc/ce-to-ee/eav-document-groups.xml.dist + etc/ce-to-ee/eav-attribute-groups.xml.dist + etc/ce-to-ee/map-log.xml.dist + etc/ce-to-ee/log-document-groups.xml.dist + etc/ce-to-ee/settings.xml.dist + etc/ce-to-ee/map-customer.xml.dist + etc/ce-to-ee/customer-document-groups.xml.dist + etc/ce-to-ee/customer-attribute-groups.xml.dist + etc/ce-to-ee/deltalog.xml.dist + etc/ce-to-ee/order-grids-document-groups.xml.dist + etc/ce-to-ee/map-document-groups.xml.dist + etc/ce-to-ee/class-map.xml.dist + + 0 + + 0 + + + 0 + migration.log + %percent%% [%bar%] Remaining Time: %remaining% + 1 + ce-to-ee + + + diff --git a/etc/ce-to-ee/1.9.2.4/map.xml.dist b/etc/ce-to-ee/1.9.2.4/map.xml.dist new file mode 100644 index 000000000..73523879d --- /dev/null +++ b/etc/ce-to-ee/1.9.2.4/map.xml.dist @@ -0,0 +1,2714 @@ + + + + + + + googleshopping_attributes + + + googleshopping_items + + + googleshopping_types + + + sales_flat_creditmemo_grid + + + sales_flat_invoice_grid + + + sales_flat_order_grid + + + sales_flat_shipment_grid + + + customer_entity + + + customer_entity_datetime + + + customer_entity_decimal + + + customer_entity_int + + + customer_entity_text + + + customer_entity_varchar + + + customer_address_entity + + + customer_address_entity_datetime + + + customer_address_entity_decimal + + + customer_address_entity_int + + + customer_address_entity_text + + + customer_address_entity_varchar + + + m2_cl_* + + + url_rewrite_m2* + + + admin_assert + + + api2_acl_attribute + + + api2_acl_role + + + api2_acl_rule + + + api2_acl_user + + + api_assert + + + api_role + + + api_rule + + + api_session + + + api_user + + + log_customer + + + log_quote + + + log_summary_type + + + log_summary + + + log_url + + + log_url_info + + + catalog_category_anc_categs_index_idx + + + catalog_category_anc_categs_index_tmp + + + catalog_category_anc_products_index_idx + + + catalog_category_anc_products_index_tmp + + + catalog_category_flat_cl + + + catalog_category_product_index + + + catalog_category_product_index_cl + + + catalog_category_product_index_enbl_idx + + + catalog_category_product_index_enbl_tmp + + + catalog_category_product_index_idx + + + catalog_category_product_index_tmp + + + catalog_product_enabled_index + + + catalog_product_flat_cl + + + cataloginventory_stock_status_idx + + + cataloginventory_stock_status_tmp + + + catalog_category_product_cat_cl + + + catalog_product_bundle_price_index + + + catalog_product_bundle_stock_index + + + catalog_product_index_group_price + + + catalog_product_index_price + + + catalog_product_index_price* + + + catalog_product_index_tier_price + + + catalog_product_index_website + + + catalogindex_aggregation + + + catalogindex_aggregation_tag + + + catalogindex_aggregation_to_tag + + + catalogindex_minimal_price + + + catalogindex_price + + + core_layout_update + + + core_layout_link + + + widget_instance_page_layout + + + googlecheckout_api_debug + + + ogone_api_debug + + + oscommerce_import + + + oscommerce_import_type + + + oscommerce_orders + + + oscommerce_orders_products + + + oscommerce_orders_status_history + + + oscommerce_orders_total + + + oscommerce_ref + + + paygate_authorizenet_debug + + + paypal_api_debug + + + paypaluk_api_debug + + + amazonpayments_api_debug + + + chronopay_api_debug + + + cybermut_api_debug + + + cybersource_api_debug + + + eway_api_debug + + + flo2cash_api_debug + + + ideal_api_debug + + + paybox_api_debug + + + protx_api_debug + + + googlecheckout_notification + + + index_event + + + index_process + + + index_process_event + + + cataloginventory_stock_status_cl + + + catalogsearch_fulltext + + + catalogsearch_fulltext_cl + + + core_cache_tag + + + core_cache_option + + + core_cache + + + core_flag + + + core_email_queue + + + core_email_queue_recipients + + + merchandiser_category_values + + + merchandiser_vmbuild + + + dataflow_batch + + + dataflow_batch_export + + + dataflow_batch_import + + + dataflow_import_data + + + dataflow_profile + + + dataflow_profile_history + + + dataflow_session + + + core_url_rewrite + + + catalog_product_entity_url_key + + + catalogindex_eav + + + catalog_eav_attribute + + + customer_eav_attribute + + + catalog_product_index_eav + + + catalog_product_index_eav_decimal + + + catalog_product_index_eav_decimal_idx + + + catalog_product_index_eav_decimal_tmp + + + catalog_product_index_eav_idx + + + catalog_product_index_eav_tmp + + + eav_attribute + + + eav_attribute_group + + + eav_attribute_set + + + eav_entity_attribute + + + eav_entity_type + + + catalog_category_entity_url_key + + + poll + + + poll_answer + + + poll_store + + + poll_vote + + + sales_recurring_profile + + + sales_recurring_profile_order + + + tag + + + tag_properties + + + tag_relation + + + tag_summary + + + weee_discount + + + catalogsearch_result + + + log_visitor + + + log_visitor_info + + + log_visitor_online + + + core_config_data + + + s_*b_*_* + + + catalog_product_flat_* + + + catalog_category_flat_* + + + catalog_category_flat_store_* + + + googleoptimizer_code + + + core_resource + + + cron_schedule + + + admin_user + + + admin_role + + + admin_rule + + + admin_role + + + admin_rule + + + catalogrule_affected_product + + + catalog_product_super_attribute_pricing + + + core_website + + + catalog_product_entity_group_price + + + catalog_product_entity_tier_price + + + permission_block + + + permission_variable + + + catalogsearch_query + search_query + + + core_variable + variable + + + core_variable_value + variable_value + + + core_email_template + email_template + + + core_store + store + + + core_store_group + store_group + + + core_translate + translation + + + core_session + session + + + coupon_aggregated + salesrule_coupon_aggregated + + + coupon_aggregated_order + salesrule_coupon_aggregated_order + + + coupon_aggregated_updated + salesrule_coupon_aggregated_updated + + + sales_flat_order + sales_order + + + sales_flat_creditmemo + sales_creditmemo + + + sales_flat_creditmemo_comment + sales_creditmemo_comment + + + sales_flat_creditmemo_item + sales_creditmemo_item + + + sales_flat_invoice + sales_invoice + + + sales_flat_invoice_comment + sales_invoice_comment + + + sales_flat_invoice_item + sales_invoice_item + + + sales_flat_order_address + sales_order_address + + + sales_flat_order_item + sales_order_item + + + sales_flat_order_payment + sales_order_payment + + + sales_flat_order_status_history + sales_order_status_history + + + sales_flat_quote + quote + + + sales_flat_quote_address + quote_address + + + sales_flat_quote_address_item + quote_address_item + + + sales_flat_quote_item + quote_item + + + sales_flat_quote_item_option + quote_item_option + + + sales_flat_quote_payment + quote_payment + + + sales_flat_quote_shipping_rate + quote_shipping_rate + + + sales_flat_shipment + sales_shipment + + + sales_flat_shipment_comment + sales_shipment_comment + + + sales_flat_shipment_item + sales_shipment_item + + + sales_flat_shipment_track + sales_shipment_track + + + core_directory_storage + media_storage_directory_storage + + + core_file_storage + media_storage_file_storage + + + sales_billing_agreement + paypal_billing_agreement + + + sales_billing_agreement_order + paypal_billing_agreement_order + + + + + cms_page.root_template + cms_page.page_layout + + + sales_flat_order.hidden_tax_amount + sales_order.discount_tax_compensation_amount + + + sales_flat_order.base_hidden_tax_amount + sales_order.base_discount_tax_compensation_amount + + + sales_flat_order.shipping_hidden_tax_amount + sales_order.shipping_discount_tax_compensation_amount + + + sales_flat_order.base_shipping_hidden_tax_amnt + sales_order.base_shipping_discount_tax_compensation_amnt + + + sales_flat_order.hidden_tax_invoiced + sales_order.discount_tax_compensation_invoiced + + + sales_flat_order.base_hidden_tax_invoiced + sales_order.base_discount_tax_compensation_invoiced + + + sales_flat_order.hidden_tax_refunded + sales_order.discount_tax_compensation_refunded + + + sales_flat_order.base_hidden_tax_refunded + sales_order.base_discount_tax_compensation_refunded + + + sales_flat_creditmemo.hidden_tax_amount + sales_creditmemo.discount_tax_compensation_amount + + + sales_flat_creditmemo.base_hidden_tax_amount + sales_creditmemo.base_discount_tax_compensation_amount + + + sales_flat_creditmemo.shipping_hidden_tax_amount + sales_creditmemo.shipping_discount_tax_compensation_amount + + + sales_flat_creditmemo.base_shipping_hidden_tax_amnt + sales_creditmemo.base_shipping_discount_tax_compensation_amnt + + + sales_flat_creditmemo_item.hidden_tax_amount + sales_creditmemo_item.discount_tax_compensation_amount + + + sales_flat_creditmemo_item.base_hidden_tax_amount + sales_creditmemo_item.base_discount_tax_compensation_amount + + + sales_flat_invoice.hidden_tax_amount + sales_invoice.discount_tax_compensation_amount + + + sales_flat_invoice.base_hidden_tax_amount + sales_invoice.base_discount_tax_compensation_amount + + + sales_flat_invoice.shipping_hidden_tax_amount + sales_invoice.shipping_discount_tax_compensation_amount + + + sales_flat_invoice.base_shipping_hidden_tax_amnt + sales_invoice.base_shipping_discount_tax_compensation_amnt + + + sales_flat_invoice_item.hidden_tax_amount + sales_invoice_item.discount_tax_compensation_amount + + + sales_flat_invoice_item.base_hidden_tax_amount + sales_invoice_item.base_discount_tax_compensation_amount + + + sales_flat_order_item.hidden_tax_amount + sales_order_item.discount_tax_compensation_amount + + + sales_flat_order_item.base_hidden_tax_amount + sales_order_item.base_discount_tax_compensation_amount + + + sales_flat_order_item.hidden_tax_invoiced + sales_order_item.discount_tax_compensation_invoiced + + + sales_flat_order_item.base_hidden_tax_invoiced + sales_order_item.base_discount_tax_compensation_invoiced + + + sales_flat_order_item.hidden_tax_refunded + sales_order_item.discount_tax_compensation_refunded + + + sales_flat_order_item.base_hidden_tax_refunded + sales_order_item.base_discount_tax_compensation_refunded + + + sales_flat_order_item.hidden_tax_canceled + sales_order_item.discount_tax_compensation_canceled + + + sales_flat_order_payment.cc_last4 + sales_order_payment.cc_last_4 + + + sales_flat_quote_payment.cc_last4 + quote_payment.cc_last_4 + + + sales_flat_quote_address.hidden_tax_amount + quote_address.discount_tax_compensation_amount + + + sales_flat_quote_address.base_hidden_tax_amount + quote_address.base_discount_tax_compensation_amount + + + sales_flat_quote_address.shipping_hidden_tax_amount + quote_address.shipping_discount_tax_compensation_amount + + + sales_flat_quote_address.base_shipping_hidden_tax_amnt + quote_address.base_shipping_discount_tax_compensation_amnt + + + sales_flat_quote_address_item.hidden_tax_amount + quote_address_item.discount_tax_compensation_amount + + + sales_flat_quote_address_item.base_hidden_tax_amount + quote_address_item.base_discount_tax_compensation_amount + + + sales_flat_quote_item.hidden_tax_amount + quote_item.discount_tax_compensation_amount + + + sales_flat_quote_item.base_hidden_tax_amount + quote_item.base_discount_tax_compensation_amount + + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + catalog_category_entity_varchar.value + + + + + + + catalog_product_entity_varchar.value + + + + + + + cms_page.root_template + + + + + + cms_block.content + + + + cms_page.content + + + + newsletter_template.template_text + + + + core_email_template.template_text + + + + widget_instance.instance_type + + + + catalogrule.conditions_serialized + + + + catalogrule.actions_serialized + + + + salesrule.conditions_serialized + + + + salesrule.actions_serialized + + + + sales_flat_order_item.weee_tax_applied + + + + sales_flat_quote_item.weee_tax_applied + + + + sales_flat_creditmemo_item.weee_tax_applied + + + + sales_flat_invoice_item.weee_tax_applied + + + + rating_option_vote.remote_ip_long + + + + sendfriend_log.ip + + + + catalog_product_entity_media_gallery.value_id + + + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + + + admin_rule.role_type + + + admin_rule.assert_id + + + core_website.is_staging + + + core_website.master_login + + + core_website.master_password + + + core_website.visibility + + + sales_order_tax.hidden + + + sales_flat_order.paypal_ipn_customer_notified + + + sales_flat_order_item.is_nominal + + + sales_flat_order_payment.paybox_request_number + + + weee_tax.entity_type_id + + + catalog_category_entity.entity_type_id + + + catalog_category_entity_datetime.entity_type_id + + + catalog_category_entity_decimal.entity_type_id + + + catalog_category_entity_int.entity_type_id + + + catalog_category_entity_text.entity_type_id + + + catalog_category_entity_varchar.entity_type_id + + + catalog_product_entity.entity_type_id + + + catalog_product_entity_datetime.entity_type_id + + + catalog_product_entity_decimal.entity_type_id + + + catalog_product_entity_gallery.entity_type_id + + + catalog_product_entity_media_gallery.entity_id + + + catalog_product_entity_int.entity_type_id + + + catalog_product_entity_text.entity_type_id + + + catalog_product_entity_varchar.entity_type_id + + + sales_flat_creditmemo.cybersource_token + + + sales_flat_invoice.cybersource_token + + + sales_flat_order_payment.ideal_transaction_checked + + + sales_flat_order_payment.cybersource_token + + + sales_flat_order_payment.ideal_issuer_title + + + sales_flat_order_payment.paybox_question_number + + + sales_flat_order_payment.ideal_issuer_id + + + sales_flat_order_payment.flo2cash_account_id + + + sales_flat_quote_payment.cybersource_token + + + sales_flat_quote_payment.ideal_issuer_id + + + sales_flat_quote_payment.ideal_issuer_list + + + sales_flat_quote_payment.paypal_payer_id + + + sales_flat_quote_payment.paypal_payer_status + + + sales_flat_quote_payment.paypal_correlation_id + + + cms_page.layout_update_xml + + + cms_page.custom_layout_update_xml + + + widget_instance.package_theme + + + newsletter_template.template_text_preprocessed + + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + sales_flat_quote_payment.cc_exp_month + + + weee_tax.state + + + sendfriend_log.ip + + + rating_option_vote.remote_ip_long + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + + + + + customer_entity + + + customer_entity_datetime + + + customer_entity_decimal + + + customer_entity_int + + + customer_entity_text + + + customer_entity_varchar + + + customer_address_entity + + + customer_address_entity_datetime + + + customer_address_entity_decimal + + + customer_address_entity_int + + + customer_address_entity_text + + + customer_address_entity_varchar + + + ui_bookmark + + + migration_backup_* + + + googleoptimizer_code + + + indexer_state + + + integration + + + mview_state + + + theme + + + theme_file + + + vde_theme_change + + + admin_system_messages + + + catalog_url_rewrite_product_category + + + customer_visitor + + + url_rewrite + + + layout_update + + + layout_link + + + catalog_product_flat_* + + + catalog_category_flat_* + + + catalogindex_eav + + + catalog_eav_attribute + + + catalogsearch_fulltext_index_default + + + customer_eav_attribute + + + customer_eav_attribute_website + + + catalog_product_index_eav + + + catalog_product_index_eav_decimal + + + catalog_product_index_eav_decimal_idx + + + catalog_product_index_eav_decimal_tmp + + + catalog_product_index_eav_idx + + + catalog_product_index_eav_tmp + + + catalog_category_product_index_tmp + + + eav_attribute + + + eav_attribute_group + + + eav_attribute_set + + + eav_entity_attribute + + + eav_entity_type + + + authorization_role + + + authorization_rule + + + setup_module + + + cache + + + cache_tag + + + customer_log + + + flag + + + log_customer + + + log_quote + + + log_summary_type + + + log_summary + + + log_url + + + log_url_info + + + quote_id_mask + + + session + + + sales_sequence_profile + + + sales_sequence_meta + + + sequence_invoice_* + + + sequence_creditmemo_* + + + sequence_order_* + + + sequence_shipment* + + + sequence_rma_item_* + + + catalogsearch_recommendations + + + enterprise_admin_passwords + + + magento_banner + + + magento_banner_catalogrule + + + magento_banner_content + + + magento_banner_customersegment + + + magento_banner_salesrule + + + magento_catalogevent_event + + + magento_catalogevent_event_image + + + magento_catalogpermissions + + + magento_catalogpermissions_index + + + magento_catalogpermissions_index_product + + + magento_catalogpermissions_index_product_tmp + + + magento_catalogpermissions_index_tmp + + + magento_customerbalance + + + magento_customerbalance_history + + + magento_customercustomattributes_sales_flat_order + + + magento_customercustomattributes_sales_flat_order_address + + + magento_customercustomattributes_sales_flat_quote + + + magento_customercustomattributes_sales_flat_quote_address + + + magento_customersegment_customer + + + magento_customersegment_event + + + magento_customersegment_segment + + + magento_customersegment_website + + + magento_giftcard_amount + + + magento_giftcardaccount + + + magento_giftcardaccount_history + + + magento_giftcardaccount_pool + + + magento_giftregistry_data + + + magento_giftregistry_entity + + + magento_giftregistry_item + + + magento_giftregistry_item_option + + + magento_giftregistry_label + + + magento_giftregistry_person + + + magento_giftregistry_type + + + magento_giftregistry_type_info + + + magento_giftwrapping + + + magento_giftwrapping_store_attributes + + + magento_giftwrapping_website + + + magento_invitation + + + magento_invitation_status_history + + + magento_invitation_track + + + magento_logging_event + + + magento_logging_event_changes + + + magento_reminder_rule + + + magento_reminder_rule_coupon + + + magento_reminder_rule_log + + + magento_reminder_rule_website + + + magento_reminder_template + + + magento_reward + + + magento_reward_history + + + magento_reward_rate + + + magento_reward_salesrule + + + magento_rma + + + magento_rma_grid + + + sales_creditmemo_grid + + + sales_invoice_grid + + + sales_order_grid + + + sales_shipment_grid + + + magento_rma_item_eav_attribute + + + magento_rma_item_eav_attribute_website + + + magento_rma_item_entity + + + magento_rma_item_entity_datetime + + + magento_rma_item_entity_decimal + + + magento_rma_item_entity_int + + + magento_rma_item_entity_text + + + magento_rma_item_entity_varchar + + + magento_rma_item_form_attribute + + + magento_rma_shipping_label + + + magento_rma_status_history + + + magento_sales_creditmemo_grid_archive + + + magento_sales_invoice_grid_archive + + + magento_sales_order_grid_archive + + + store_website + + + support_report + + + magento_sales_shipment_grid_archive + + + magento_scheduled_operations + + + magento_targetrule + + + magento_targetrule_customersegment + + + magento_targetrule_index + + + magento_targetrule_index_crosssell + + + magento_targetrule_index_crosssell_product + + + magento_targetrule_index_related + + + magento_targetrule_index_related_product + + + magento_targetrule_index_upsell + + + magento_targetrule_index_upsell_product + + + magento_targetrule_product + + + magento_versionscms_hierarchy_lock + + + magento_versionscms_hierarchy_metadata + + + magento_versionscms_hierarchy_node + + + magento_versionscms_increment + + + magento_versionscms_page_revision + + + magento_versionscms_page_version + + + paypal_billing_agreement + + + paypal_billing_agreement_order + + + eav_attribute_option_swatch + + + import_history + + + catalogsearch_fulltext_scope* + + + log_visitor_info + + + log_visitor_online + + + reporting_module_status + + + reporting_orders + + + reporting_system_updates + + + reporting_users + + + reporting_counts + + + queue + + + queue_message + + + queue_message_status + + + admin_passwords + + + support_backup + + + support_backup_item + + + catalog_product_entity_media_gallery_value_to_entity + + + catalog_product_entity_media_gallery_value_video + + + catalog_product_entity_tier_price + + + customer_grid_flat + + + visual_merchandiser_rule + + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + + + admin_user.interface_locale + + + + + + cataloginventory_stock.website_id + + + + cataloginventory_stock_item.website_id + + + + rating.is_active + + + + + + authorization_role.user_type + + + + + + sales_order_tax_item.amount + + + + + + sales_order_tax_item.base_amount + + + + + + sales_order_tax_item.real_amount + + + + + + sales_order_tax_item.real_base_amount + + + + + + sales_order_tax_item.taxable_item_type + + + + + + oauth_token.user_type + + + + + + widget_instance.theme_id + + + + + + sales_order_status_state.visible_on_front + + + + catalog_product_entity_media_gallery_value.entity_id + + + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + + + catalog_product_entity_media_gallery_value.entity_id + + + catalog_product_entity_media_gallery.media_type + + + catalog_product_entity_media_gallery.disabled + + + catalog_product_entity_media_gallery_value.record_id + + + admin_user.interface_locale + + + rating.is_active + + + sales_creditmemo.send_email + + + sales_creditmemo.customer_note + + + sales_creditmemo.customer_note_notify + + + sales_invoice.send_email + + + sales_invoice.customer_note + + + sales_invoice.customer_note_notify + + + sales_shipment.send_email + + + sales_shipment.customer_note + + + sales_shipment.customer_note_notify + + + sales_creditmemo_item.tax_ratio + + + sales_invoice_item.tax_ratio + + + authorization_role.user_type + + + cataloginventory_stock.website_id + + + cataloginventory_stock_item.website_id + + + oauth_nonce.consumer_id + + + oauth_token.user_type + + + sales_order_status_state.visible_on_front + + + widget_instance.theme_id + + + sales_order_tax_item.amount + + + sales_order_tax_item.base_amount + + + sales_order_tax_item.real_amount + + + sales_order_tax_item.real_base_amount + + + sales_order_tax_item.associated_item_id + + + sales_order_tax_item.taxable_item_type + + + sales_creditmemo_grid.updated_at + + + sales_invoice_grid.updated_at + + + sales_shipment_grid.updated_at + + + sales_order.send_email + + + admin_user.failures_num + + + admin_user.first_failure + + + admin_user.lock_expires + + + cms_page.published_revision_id + + + cms_page.website_root + + + cms_page.under_version_control + + + quote.customer_balance_amount_used + + + quote.base_customer_bal_amount_used + + + quote.use_customer_balance + + + quote.gift_cards + + + quote.gift_cards_amount + + + quote.base_gift_cards_amount + + + quote.gift_cards_amount_used + + + quote.base_gift_cards_amount_used + + + quote.gw_id + + + quote.gw_allow_gift_receipt + + + quote.gw_add_card + + + quote.gw_base_price + + + quote.gw_price + + + quote.gw_items_base_price + + + quote.gw_items_price + + + quote.gw_card_base_price + + + quote.gw_card_price + + + quote.gw_base_tax_amount + + + quote.gw_tax_amount + + + quote.gw_items_base_tax_amount + + + quote.gw_items_tax_amount + + + quote.gw_card_base_tax_amount + + + quote.gw_card_tax_amount + + + quote.use_reward_points + + + quote.reward_points_balance + + + quote.base_reward_currency_amount + + + quote.reward_currency_amount + + + quote_address.base_customer_balance_amount + + + quote_address.customer_balance_amount + + + quote_address.gift_cards_amount + + + quote_address.base_gift_cards_amount + + + quote_address.gift_cards + + + quote_address.used_gift_cards + + + quote_address.gw_id + + + quote_address.gw_allow_gift_receipt + + + quote_address.gw_add_card + + + quote_address.gw_base_price + + + quote_address.gw_price + + + quote_address.gw_items_base_price + + + quote_address.gw_items_price + + + quote_address.gw_card_base_price + + + quote_address.gw_card_price + + + quote_address.gw_base_tax_amount + + + quote_address.gw_tax_amount + + + quote_address.gw_items_base_tax_amount + + + quote_address.gw_items_tax_amount + + + quote_address.gw_card_base_tax_amount + + + quote_address.gw_card_tax_amount + + + quote_address.reward_points_balance + + + quote_address.base_reward_currency_amount + + + quote_address.reward_currency_amount + + + quote_address.giftregistry_item_id + + + quote_address_item.gw_id + + + quote_address_item.gw_base_price + + + quote_address_item.gw_price + + + quote_address_item.gw_base_tax_amount + + + quote_address_item.gw_tax_amount + + + quote_item.gw_id + + + quote_item.gw_base_price + + + quote_item.gw_price + + + quote_item.gw_base_tax_amount + + + quote_item.gw_tax_amount + + + quote_item.event_id + + + quote_item.giftregistry_item_id + + + sales_creditmemo.base_customer_balance_amount + + + sales_creditmemo.customer_balance_amount + + + sales_creditmemo.bs_customer_bal_total_refunded + + + sales_creditmemo.customer_bal_total_refunded + + + sales_creditmemo.base_gift_cards_amount + + + sales_creditmemo.gift_cards_amount + + + sales_creditmemo.gw_base_price + + + sales_creditmemo.gw_price + + + sales_creditmemo.gw_items_base_price + + + sales_creditmemo.gw_items_price + + + sales_creditmemo.gw_card_base_price + + + sales_creditmemo.gw_card_price + + + sales_creditmemo.gw_base_tax_amount + + + sales_creditmemo.gw_tax_amount + + + sales_creditmemo.gw_items_base_tax_amount + + + sales_creditmemo.gw_items_tax_amount + + + sales_creditmemo.gw_card_base_tax_amount + + + sales_creditmemo.gw_card_tax_amount + + + sales_creditmemo.base_reward_currency_amount + + + sales_creditmemo.reward_currency_amount + + + sales_creditmemo.reward_points_balance + + + sales_creditmemo.reward_points_balance_refund + + + sales_invoice.base_customer_balance_amount + + + sales_invoice.customer_balance_amount + + + sales_invoice.base_gift_cards_amount + + + sales_invoice.gift_cards_amount + + + sales_invoice.gw_base_price + + + sales_invoice.gw_price + + + sales_invoice.gw_items_base_price + + + sales_invoice.gw_items_price + + + sales_invoice.gw_card_base_price + + + sales_invoice.gw_card_price + + + sales_invoice.gw_base_tax_amount + + + sales_invoice.gw_tax_amount + + + sales_invoice.gw_items_base_tax_amount + + + sales_invoice.gw_items_tax_amount + + + sales_invoice.gw_card_base_tax_amount + + + sales_invoice.gw_card_tax_amount + + + sales_invoice.base_reward_currency_amount + + + sales_invoice.reward_currency_amount + + + sales_invoice.reward_points_balance + + + sales_order.base_customer_balance_amount + + + sales_order.customer_balance_amount + + + sales_order.base_customer_balance_invoiced + + + sales_order.customer_balance_invoiced + + + sales_order.base_customer_balance_refunded + + + sales_order.customer_balance_refunded + + + sales_order.bs_customer_bal_total_refunded + + + sales_order.customer_bal_total_refunded + + + sales_order.gift_cards + + + sales_order.base_gift_cards_amount + + + sales_order.gift_cards_amount + + + sales_order.base_gift_cards_invoiced + + + sales_order.gift_cards_invoiced + + + sales_order.base_gift_cards_refunded + + + sales_order.gift_cards_refunded + + + sales_order.gw_id + + + sales_order.gw_allow_gift_receipt + + + sales_order.gw_add_card + + + sales_order.gw_base_price + + + sales_order.gw_price + + + sales_order.gw_items_base_price + + + sales_order.gw_items_price + + + sales_order.gw_card_base_price + + + sales_order.gw_card_price + + + sales_order.gw_base_tax_amount + + + sales_order.gw_tax_amount + + + sales_order.gw_items_base_tax_amount + + + sales_order.gw_items_tax_amount + + + sales_order.gw_card_base_tax_amount + + + sales_order.gw_card_tax_amount + + + sales_order.gw_base_price_invoiced + + + sales_order.gw_price_invoiced + + + sales_order.gw_items_base_price_invoiced + + + sales_order.gw_items_price_invoiced + + + sales_order.gw_card_base_price_invoiced + + + sales_order.gw_card_price_invoiced + + + sales_order.gw_base_tax_amount_invoiced + + + sales_order.gw_tax_amount_invoiced + + + sales_order.gw_items_base_tax_invoiced + + + sales_order.gw_items_tax_invoiced + + + sales_order.gw_card_base_tax_invoiced + + + sales_order.gw_card_tax_invoiced + + + sales_order.gw_base_price_refunded + + + sales_order.gw_price_refunded + + + sales_order.gw_items_base_price_refunded + + + sales_order.gw_items_price_refunded + + + sales_order.gw_card_base_price_refunded + + + sales_order.gw_card_price_refunded + + + sales_order.gw_base_tax_amount_refunded + + + sales_order.gw_tax_amount_refunded + + + sales_order.gw_items_base_tax_refunded + + + sales_order.gw_items_tax_refunded + + + sales_order.gw_card_base_tax_refunded + + + sales_order.gw_card_tax_refunded + + + sales_order.reward_points_balance + + + sales_order.base_reward_currency_amount + + + sales_order.reward_currency_amount + + + sales_order.base_rwrd_crrncy_amt_invoiced + + + sales_order.rwrd_currency_amount_invoiced + + + sales_order.base_rwrd_crrncy_amnt_refnded + + + sales_order.rwrd_crrncy_amnt_refunded + + + sales_order.reward_points_balance_refund + + + sales_order_address.giftregistry_item_id + + + sales_order_item.qty_returned + + + sales_order_item.gw_id + + + sales_order_item.gw_base_price + + + sales_order_item.gw_price + + + sales_order_item.gw_base_tax_amount + + + sales_order_item.gw_tax_amount + + + sales_order_item.gw_base_price_invoiced + + + sales_order_item.gw_price_invoiced + + + sales_order_item.gw_base_tax_amount_invoiced + + + sales_order_item.gw_tax_amount_invoiced + + + sales_order_item.gw_base_price_refunded + + + sales_order_item.gw_price_refunded + + + sales_order_item.gw_base_tax_amount_refunded + + + sales_order_item.gw_tax_amount_refunded + + + sales_order_item.event_id + + + sales_order_item.giftregistry_item_id + + + wishlist.name + + + wishlist.visibility + + + checkout_agreement.mode + + + cataloginventory_stock_item.deferred_stock_update + + + cataloginventory_stock_item.use_config_deferred_stock_update + + + quote.gw_base_price_incl_tax + + + quote.gw_price_incl_tax + + + quote.gw_items_base_price_incl_tax + + + quote.gw_items_price_incl_tax + + + quote.gw_card_base_price_incl_tax + + + quote.gw_card_price_incl_tax + + + quote_address.gw_base_price_incl_tax + + + quote_address.gw_price_incl_tax + + + quote_address.gw_items_base_price_incl_tax + + + quote_address.gw_items_price_incl_tax + + + quote_address.gw_card_base_price_incl_tax + + + quote_address.gw_card_price_incl_tax + + + sales_order.gw_base_price_incl_tax + + + sales_order.gw_price_incl_tax + + + sales_order.gw_items_base_price_incl_tax + + + sales_order.gw_items_price_incl_tax + + + sales_order.gw_card_base_price_incl_tax + + + sales_order.gw_card_price_incl_tax + + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + + + quote_payment.cc_exp_month + + + weee_tax.state + + + sendfriend_log.ip + + + rating_option_vote.remote_ip_long + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + + diff --git a/etc/ee-to-ee/1.14.2.4/config.xml.dist b/etc/ee-to-ee/1.14.2.4/config.xml.dist new file mode 100644 index 000000000..dbe21314f --- /dev/null +++ b/etc/ee-to-ee/1.14.2.4/config.xml.dist @@ -0,0 +1,162 @@ + + + + + + Migration\Step\Settings\Integrity + Migration\Step\Settings\Data + + + Migration\Step\Stores\Integrity + Migration\Step\Stores\Data + Migration\Step\Stores\Volume + + + + + Migration\Step\Eav\Integrity + Migration\Step\Eav\Data + Migration\Step\Eav\Volume + + + Migration\Step\CustomCustomerAttributes\Integrity + Migration\Step\CustomCustomerAttributes\Data + Migration\Step\CustomCustomerAttributes\Volume + + + Migration\Step\Customer\Integrity + Migration\Step\Customer\Data + Migration\Step\Customer\Volume + + + Migration\Step\Map\Integrity + Migration\Step\Map\Data + Migration\Step\Map\Volume + + + Migration\Step\UrlRewrite\Version11410to2000 + Migration\Step\UrlRewrite\Version11410to2000 + Migration\Step\UrlRewrite\Version11410to2000 + + + Migration\Step\Log\Integrity + Migration\Step\Log\Data + Migration\Step\Log\Volume + + + Migration\Step\Ratings\Integrity + Migration\Step\Ratings\Data + Migration\Step\Ratings\Volume + + + Migration\Step\SalesOrder\Integrity + Migration\Step\SalesOrder\Data + Migration\Step\SalesOrder\Volume + + + Migration\Step\ConfigurablePrices\Integrity + Migration\Step\ConfigurablePrices\Data + Migration\Step\ConfigurablePrices\Volume + + + Migration\Step\OrderGridsEE\Integrity + Migration\Step\OrderGridsEE\Data + Migration\Step\OrderGridsEE\Volume + + + Migration\Step\TierPrice\Integrity + Migration\Step\TierPrice\Data + Migration\Step\TierPrice\Volume + + + Migration\Step\SalesIncrement\Integrity + Migration\Step\SalesIncrement\Data + Migration\Step\SalesIncrement\Volume + + + Migration\Step\VisualMerchandiser\Integrity + Migration\Step\VisualMerchandiser\Data + Migration\Step\VisualMerchandiser\Volume + + + + + Migration\Step\CustomCustomerAttributes\Delta + Migration\Step\CustomCustomerAttributes\Volume + + + Migration\Step\Customer\Delta + Migration\Step\Customer\Volume + + + Migration\Step\Map\Delta + + + Migration\Step\Log\Delta + Migration\Step\Log\Volume + + + Migration\Step\SalesOrder\Delta + Migration\Step\SalesOrder\Volume + + + Migration\Step\OrderGridsEE\Delta + Migration\Step\OrderGridsEE\Volume + + + Migration\Step\SalesIncrement\Delta + Migration\Step\SalesIncrement\Volume + + + + + + + + + + etc/ee-to-ee/1.14.2.4/map.xml.dist + etc/ee-to-ee/map-eav.xml.dist + etc/ee-to-ee/eav-document-groups.xml.dist + etc/ee-to-ee/eav-attribute-groups.xml.dist + etc/ee-to-ee/map-log.xml.dist + etc/ee-to-ee/log-document-groups.xml.dist + etc/ee-to-ee/settings.xml.dist + etc/ee-to-ee/map-customer.xml.dist + etc/ee-to-ee/customer-document-groups.xml.dist + etc/ee-to-ee/customer-attribute-groups.xml.dist + etc/ee-to-ee/map-sales.xml.dist + etc/ee-to-ee/deltalog.xml.dist + etc/ee-to-ee/customer-attr-map.xml.dist + etc/ee-to-ee/customer-attr-document-groups.xml.dist + etc/ee-to-ee/order-grids-document-groups.xml.dist + etc/ee-to-ee/class-map.xml.dist + etc/ee-to-ee/visual_merchandiser_map.xml.dist + etc/ee-to-ee/visual_merchandiser_document_groups.xml.dist + etc/ee-to-ee/visual_merchandiser_attribute_groups.xml.dist + etc/ee-to-ee/map-document-groups.xml.dist + + 0 + + 0 + + + 0 + migration.log + %percent%% [%bar%] Remaining Time: %remaining% + 1 + ee-to-ee + + + 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 new file mode 100644 index 000000000..b275d3df9 --- /dev/null +++ b/etc/ee-to-ee/1.14.2.4/map.xml.dist @@ -0,0 +1,2441 @@ + + + + + + + googleshopping_attributes + + + googleshopping_items + + + googleshopping_types + + + enterprise_sales_creditmemo_grid_archive + + + enterprise_sales_invoice_grid_archive + + + enterprise_sales_order_grid_archive + + + enterprise_sales_shipment_grid_archive + + + sales_flat_creditmemo_grid + + + sales_flat_invoice_grid + + + sales_flat_order_grid + + + sales_flat_shipment_grid + + + customer_entity + + + customer_entity_datetime + + + customer_entity_decimal + + + customer_entity_int + + + customer_entity_text + + + customer_entity_varchar + + + customer_address_entity + + + customer_address_entity_datetime + + + customer_address_entity_decimal + + + customer_address_entity_int + + + customer_address_entity_text + + + customer_address_entity_varchar + + + m2_cl_* + + + url_rewrite_m2* + + + admin_assert + + + api2_acl_attribute + + + api2_acl_role + + + api2_acl_rule + + + api2_acl_user + + + api_assert + + + api_role + + + api_rule + + + api_session + + + api_user + + + log_customer + + + log_quote + + + log_summary_type + + + log_summary + + + log_url + + + log_url_info + + + catalog_category_anc_categs_index_idx + + + catalog_category_anc_categs_index_tmp + + + catalog_category_anc_products_index_idx + + + catalog_category_anc_products_index_tmp + + + catalog_category_flat_cl + + + catalog_category_product_index + + + catalog_category_product_index_cl + + + catalog_category_product_index_enbl_idx + + + catalog_category_product_index_enbl_tmp + + + catalog_category_product_index_idx + + + catalog_category_product_index_tmp + + + catalog_product_enabled_index + + + catalog_product_flat_cl + + + cataloginventory_stock_status_idx + + + cataloginventory_stock_status_tmp + + + catalog_category_product_cat_cl + + + catalog_product_bundle_price_index + + + catalog_product_bundle_stock_index + + + catalog_product_index_group_price + + + catalog_product_index_price + + + catalog_product_index_price* + + + catalog_product_index_tier_price + + + catalog_product_index_website + + + catalogindex_aggregation + + + catalogindex_aggregation_tag + + + catalogindex_aggregation_to_tag + + + catalogindex_minimal_price + + + catalogindex_price + + + core_layout_update + + + core_layout_link + + + widget_instance_page_layout + + + enterprise_queue_queue + + + enterprise_queue_task + + + find_feed_import_codes + + + googlebase_attributes + + + googlebase_items + + + googlebase_types + + + googlecheckout_api_debug + + + ogone_api_debug + + + oscommerce_import + + + oscommerce_import_type + + + oscommerce_orders + + + oscommerce_orders_products + + + oscommerce_orders_status_history + + + oscommerce_orders_total + + + oscommerce_ref + + + paygate_authorizenet_debug + + + paypal_api_debug + + + paypaluk_api_debug + + + amazonpayments_api_debug + + + chronopay_api_debug + + + cybermut_api_debug + + + cybersource_api_debug + + + eway_api_debug + + + flo2cash_api_debug + + + ideal_api_debug + + + paybox_api_debug + + + paybox_question_number + + + protx_api_debug + + + social_facebook_actions + + + strikeiron_tax_rate + + + xmlconnect_application + + + xmlconnect_config_data + + + xmlconnect_history + + + xmlconnect_images + + + xmlconnect_notification_template + + + xmlconnect_queue + + + googlecheckout_notification + + + index_event + + + index_process + + + index_process_event + + + cataloginventory_stock_status_cl + + + catalogsearch_fulltext + + + catalogsearch_fulltext_cl + + + core_cache_tag + + + core_cache_option + + + core_cache + + + core_flag + + + core_email_queue + + + core_email_queue_recipients + + + merchandiser_category_values + + + merchandiser_vmbuild + + + dataflow_batch + + + dataflow_batch_export + + + dataflow_batch_import + + + dataflow_import_data + + + dataflow_profile + + + dataflow_profile_history + + + dataflow_session + + + core_url_rewrite + + + catalog_product_entity_url_key + + + catalogindex_eav + + + catalog_eav_attribute + + + customer_eav_attribute + + + catalog_product_index_eav + + + catalog_product_index_eav_decimal + + + catalog_product_index_eav_decimal_idx + + + catalog_product_index_eav_decimal_tmp + + + catalog_product_index_eav_idx + + + catalog_product_index_eav_tmp + + + eav_attribute + + + eav_attribute_group + + + eav_attribute_set + + + eav_entity_attribute + + + eav_entity_type + + + catalog_category_entity_url_key + + + poll + + + poll_answer + + + poll_store + + + poll_vote + + + sales_recurring_profile + + + sales_recurring_profile_order + + + tag + + + tag_properties + + + tag_relation + + + tag_summary + + + weee_discount + + + catalogsearch_result + + + log_visitor + + + log_visitor_info + + + log_visitor_online + + + core_config_data + + + s_*b_*_* + + + catalog_product_flat_* + + + catalog_category_flat_* + + + catalog_category_flat_store_* + + + googleoptimizer_code + + + core_resource + + + cron_schedule + + + admin_user + + + enterprise_admin_passwords + + + admin_role + + + admin_rule + + + sales_flat_order + + + admin_role + + + admin_rule + + + enterprise_url_rewrite + + + enterprise_url_rewrite_category_cl + + + enterprise_url_rewrite_product_cl + + + enterprise_url_rewrite_redirect + + + enterprise_url_rewrite_redirect_cl + + + enterprise_url_rewrite_redirect_rewrite + + + enterprise_catalog_category_rewrite + + + enterprise_catalog_product_rewrite + + + enterprise_catalogpermissions_index + + + enterprise_catalogpermissions_index_product + + + enterprise_rma_item_eav_attribute + + + enterprise_rma_item_eav_attribute_website + + + enterprise_customer_sales_flat_order + + + enterprise_customer_sales_flat_order_address + + + enterprise_customer_sales_flat_quote + + + enterprise_customer_sales_flat_quote_address + + + enterprise_targetrule_index + + + enterprise_targetrule_index_crosssell + + + enterprise_targetrule_index_crosssell_product + + + enterprise_targetrule_index_related + + + enterprise_targetrule_index_related_product + + + enterprise_targetrule_index_upsell + + + enterprise_targetrule_index_upsell_product + + + enterprise_staging + + + enterprise_staging_action + + + enterprise_staging_item + + + enterprise_staging_log + + + core_session + + + enterprise_staging_product_unlinked + + + enterprise_support_backup + + + enterprise_support_backup_item + + + enterprise_support_sysreport + + + enterprise_mview_event + + + enterprise_mview_metadata + + + enterprise_mview_metadata_event + + + enterprise_mview_metadata_group + + + enterprise_mview_subscriber + + + enterprise_index_multiplier + + + catalogrule_affected_product + + + catalog_product_super_attribute_pricing + + + core_website + + + catalog_product_entity_group_price + + + catalog_product_entity_tier_price + + + permission_block + + + permission_variable + + + enterprise_cms_page_revision + + + enterprise_cms_page_version + + + catalogsearch_query + search_query + + + core_variable + variable + + + core_variable_value + variable_value + + + core_email_template + email_template + + + core_store + store + + + core_store_group + store_group + + + core_translate + translation + + + core_session + session + + + coupon_aggregated + salesrule_coupon_aggregated + + + coupon_aggregated_order + salesrule_coupon_aggregated_order + + + coupon_aggregated_updated + salesrule_coupon_aggregated_updated + + + sales_flat_creditmemo + sales_creditmemo + + + sales_flat_creditmemo_comment + sales_creditmemo_comment + + + sales_flat_creditmemo_item + sales_creditmemo_item + + + sales_flat_invoice + sales_invoice + + + sales_flat_invoice_comment + sales_invoice_comment + + + sales_flat_invoice_item + sales_invoice_item + + + sales_flat_order_address + sales_order_address + + + sales_flat_order_item + sales_order_item + + + sales_flat_order_payment + sales_order_payment + + + sales_flat_order_status_history + sales_order_status_history + + + sales_flat_quote + quote + + + sales_flat_quote_address + quote_address + + + sales_flat_quote_address_item + quote_address_item + + + sales_flat_quote_item + quote_item + + + sales_flat_quote_item_option + quote_item_option + + + sales_flat_quote_payment + quote_payment + + + sales_flat_quote_shipping_rate + quote_shipping_rate + + + sales_flat_shipment + sales_shipment + + + sales_flat_shipment_comment + sales_shipment_comment + + + sales_flat_shipment_item + sales_shipment_item + + + sales_flat_shipment_track + sales_shipment_track + + + sales_billing_agreement + paypal_billing_agreement + + + sales_billing_agreement_order + paypal_billing_agreement_order + + + enterprise_rma + magento_rma + + + enterprise_rma_item_entity + magento_rma_item_entity + + + enterprise_rma_item_entity_datetime + magento_rma_item_entity_datetime + + + enterprise_rma_item_entity_decimal + magento_rma_item_entity_decimal + + + enterprise_rma_item_entity_int + magento_rma_item_entity_int + + + enterprise_rma_item_entity_text + magento_rma_item_entity_text + + + enterprise_rma_item_entity_varchar + magento_rma_item_entity_varchar + + + enterprise_rma_item_form_attribute + magento_rma_item_form_attribute + + + enterprise_rma_shipping_label + magento_rma_shipping_label + + + enterprise_rma_status_history + magento_rma_status_history + + + enterprise_banner + magento_banner + + + enterprise_banner_catalogrule + magento_banner_catalogrule + + + enterprise_banner_content + magento_banner_content + + + enterprise_banner_customersegment + magento_banner_customersegment + + + enterprise_banner_salesrule + magento_banner_salesrule + + + enterprise_catalogevent_event + magento_catalogevent_event + + + enterprise_catalogevent_event_image + magento_catalogevent_event_image + + + enterprise_catalogpermissions + magento_catalogpermissions + + + enterprise_cms_hierarchy_lock + magento_versionscms_hierarchy_lock + + + enterprise_cms_hierarchy_metadata + magento_versionscms_hierarchy_metadata + + + enterprise_cms_hierarchy_node + magento_versionscms_hierarchy_node + + + enterprise_cms_increment + magento_versionscms_increment + + + enterprise_customerbalance + magento_customerbalance + + + enterprise_customerbalance_history + magento_customerbalance_history + + + enterprise_customersegment_customer + magento_customersegment_customer + + + enterprise_customersegment_event + magento_customersegment_event + + + enterprise_customersegment_segment + magento_customersegment_segment + + + enterprise_customersegment_website + magento_customersegment_website + + + enterprise_giftcard_amount + magento_giftcard_amount + + + enterprise_giftcardaccount + magento_giftcardaccount + + + enterprise_giftcardaccount_history + magento_giftcardaccount_history + + + enterprise_giftcardaccount_pool + magento_giftcardaccount_pool + + + enterprise_giftregistry_data + magento_giftregistry_data + + + enterprise_giftregistry_entity + magento_giftregistry_entity + + + enterprise_giftregistry_item + magento_giftregistry_item + + + enterprise_giftregistry_item_option + magento_giftregistry_item_option + + + enterprise_giftregistry_label + magento_giftregistry_label + + + enterprise_giftregistry_person + magento_giftregistry_person + + + enterprise_giftregistry_type + magento_giftregistry_type + + + enterprise_giftregistry_type_info + magento_giftregistry_type_info + + + enterprise_giftwrapping + magento_giftwrapping + + + enterprise_giftwrapping_store_attributes + magento_giftwrapping_store_attributes + + + enterprise_giftwrapping_website + magento_giftwrapping_website + + + enterprise_invitation + magento_invitation + + + enterprise_invitation_status_history + magento_invitation_status_history + + + enterprise_invitation_track + magento_invitation_track + + + enterprise_logging_event + magento_logging_event + + + enterprise_logging_event_changes + magento_logging_event_changes + + + enterprise_reminder_rule + magento_reminder_rule + + + enterprise_reminder_rule_coupon + magento_reminder_rule_coupon + + + enterprise_reminder_rule_log + magento_reminder_rule_log + + + enterprise_reminder_rule_website + magento_reminder_rule_website + + + enterprise_reminder_template + magento_reminder_template + + + enterprise_reward + magento_reward + + + enterprise_reward_history + magento_reward_history + + + enterprise_reward_rate + magento_reward_rate + + + enterprise_reward_salesrule + magento_reward_salesrule + + + enterprise_scheduled_operations + magento_scheduled_operations + + + enterprise_targetrule + magento_targetrule + + + enterprise_targetrule_customersegment + magento_targetrule_customersegment + + + enterprise_targetrule_product + magento_targetrule_product + + + core_directory_storage + media_storage_directory_storage + + + core_file_storage + media_storage_file_storage + + + enterprise_rma_grid + magento_rma_grid + + + enterprise_support_backup + support_backup + + + enterprise_support_backup_item + support_backup_item + + + + + cms_page.root_template + cms_page.page_layout + + + sales_flat_creditmemo.hidden_tax_amount + sales_creditmemo.discount_tax_compensation_amount + + + sales_flat_creditmemo.base_hidden_tax_amount + sales_creditmemo.base_discount_tax_compensation_amount + + + sales_flat_creditmemo.shipping_hidden_tax_amount + sales_creditmemo.shipping_discount_tax_compensation_amount + + + sales_flat_creditmemo.base_shipping_hidden_tax_amnt + sales_creditmemo.base_shipping_discount_tax_compensation_amnt + + + sales_flat_creditmemo_item.hidden_tax_amount + sales_creditmemo_item.discount_tax_compensation_amount + + + sales_flat_creditmemo_item.base_hidden_tax_amount + sales_creditmemo_item.base_discount_tax_compensation_amount + + + sales_flat_invoice.hidden_tax_amount + sales_invoice.discount_tax_compensation_amount + + + sales_flat_invoice.base_hidden_tax_amount + sales_invoice.base_discount_tax_compensation_amount + + + sales_flat_invoice.shipping_hidden_tax_amount + sales_invoice.shipping_discount_tax_compensation_amount + + + sales_flat_invoice.base_shipping_hidden_tax_amnt + sales_invoice.base_shipping_discount_tax_compensation_amnt + + + sales_flat_invoice_item.hidden_tax_amount + sales_invoice_item.discount_tax_compensation_amount + + + sales_flat_invoice_item.base_hidden_tax_amount + sales_invoice_item.base_discount_tax_compensation_amount + + + sales_flat_order_item.hidden_tax_amount + sales_order_item.discount_tax_compensation_amount + + + sales_flat_order_item.base_hidden_tax_amount + sales_order_item.base_discount_tax_compensation_amount + + + sales_flat_order_item.hidden_tax_invoiced + sales_order_item.discount_tax_compensation_invoiced + + + sales_flat_order_item.base_hidden_tax_invoiced + sales_order_item.base_discount_tax_compensation_invoiced + + + sales_flat_order_item.hidden_tax_refunded + sales_order_item.discount_tax_compensation_refunded + + + sales_flat_order_item.base_hidden_tax_refunded + sales_order_item.base_discount_tax_compensation_refunded + + + sales_flat_order_item.hidden_tax_canceled + sales_order_item.discount_tax_compensation_canceled + + + sales_flat_order_payment.cc_last4 + sales_order_payment.cc_last_4 + + + sales_flat_quote_payment.cc_last4 + quote_payment.cc_last_4 + + + sales_flat_quote_address.hidden_tax_amount + quote_address.discount_tax_compensation_amount + + + sales_flat_quote_address.base_hidden_tax_amount + quote_address.base_discount_tax_compensation_amount + + + sales_flat_quote_address.shipping_hidden_tax_amount + quote_address.shipping_discount_tax_compensation_amount + + + sales_flat_quote_address.base_shipping_hidden_tax_amnt + quote_address.base_shipping_discount_tax_compensation_amnt + + + sales_flat_quote_address_item.hidden_tax_amount + quote_address_item.discount_tax_compensation_amount + + + sales_flat_quote_address_item.base_hidden_tax_amount + quote_address_item.base_discount_tax_compensation_amount + + + sales_flat_quote_item.hidden_tax_amount + quote_item.discount_tax_compensation_amount + + + sales_flat_quote_item.base_hidden_tax_amount + quote_item.base_discount_tax_compensation_amount + + + catalog_category_entity_datetime.entity_id + catalog_category_entity_datetime.row_id + + + catalog_category_entity_decimal.entity_id + catalog_category_entity_decimal.row_id + + + catalog_category_entity_int.entity_id + catalog_category_entity_int.row_id + + + catalog_category_entity_text.entity_id + catalog_category_entity_text.row_id + + + catalog_category_entity_varchar.entity_id + catalog_category_entity_varchar.row_id + + + catalog_product_entity_datetime.entity_id + catalog_product_entity_datetime.row_id + + + catalog_product_entity_decimal.entity_id + catalog_product_entity_decimal.row_id + + + catalog_product_entity_gallery.entity_id + catalog_product_entity_gallery.row_id + + + catalog_product_entity_int.entity_id + catalog_product_entity_int.row_id + + + catalog_product_entity_text.entity_id + catalog_product_entity_text.row_id + + + catalog_product_entity_varchar.entity_id + catalog_product_entity_varchar.row_id + + + catalogrule_customer_group.rule_id + catalogrule_customer_group.row_id + + + catalogrule_website.rule_id + catalogrule_website.row_id + + + salesrule_customer_group.rule_id + salesrule_customer_group.row_id + + + salesrule_product_attribute.rule_id + salesrule_product_attribute.row_id + + + salesrule_website.rule_id + salesrule_website.row_id + + + cms_block_store.block_id + cms_block_store.row_id + + + cms_page_store.page_id + cms_page_store.row_id + + + catalog_product_entity_tier_price.entity_id + catalog_product_entity_tier_price.row_id + + + enterprise_giftcard_amount.entity_id + magento_giftcard_amount.row_id + + + catalog_category_entity_varchar.value + + + + + + + catalog_product_entity_varchar.value + + + + + + + cms_page.root_template + + + + + + cms_block.content + + + + cms_page.content + + + + newsletter_template.template_text + + + + core_email_template.template_text + + + + widget_instance.instance_type + + + + catalogrule.conditions_serialized + + + + catalogrule.actions_serialized + + + + salesrule.conditions_serialized + + + + salesrule.actions_serialized + + + + enterprise_targetrule.conditions_serialized + + + + enterprise_targetrule.actions_serialized + + + + enterprise_reminder_rule.conditions_serialized + + + + enterprise_reminder_rule.condition_sql + + + + enterprise_customersegment_segment.conditions_serialized + + + + enterprise_customersegment_segment.condition_sql + + + + sales_flat_order_item.weee_tax_applied + + + + sales_flat_quote_item.weee_tax_applied + + + + sales_flat_creditmemo_item.weee_tax_applied + + + + sales_flat_invoice_item.weee_tax_applied + + + + enterprise_logging_event.ip + + + + enterprise_logging_event.x_forwarded_ip + + + + rating_option_vote.remote_ip_long + + + + sendfriend_log.ip + + + + catalog_product_entity_media_gallery.value_id + + + + enterprise_giftregistry_type.meta_xml + + + + catalogrule.rule_id + + + + + + salesrule.rule_id + + + + + + catalog_category_entity.entity_id + + + + + + catalog_product_entity.entity_id + + + + + + cms_block.block_id + + + + + + cms_page.page_id + + + + + + admin_rule.role_type + + + admin_rule.assert_id + + + core_website.is_staging + + + core_website.master_login + + + core_website.master_password + + + core_website.visibility + + + sales_order_tax.hidden + + + sales_flat_order.reward_points_balance_refunded + + + sales_flat_order.reward_salesrule_points + + + sales_flat_order_item.is_nominal + + + sales_flat_order_payment.paybox_request_number + + + weee_tax.entity_type_id + + + catalog_category_entity.entity_type_id + + + catalog_category_entity_datetime.entity_type_id + + + catalog_category_entity_decimal.entity_type_id + + + catalog_category_entity_int.entity_type_id + + + catalog_category_entity_text.entity_type_id + + + catalog_category_entity_varchar.entity_type_id + + + catalog_product_entity.entity_type_id + + + catalog_product_entity_datetime.entity_type_id + + + catalog_product_entity_decimal.entity_type_id + + + catalog_product_entity_gallery.entity_type_id + + + catalog_product_entity_media_gallery.entity_id + + + catalog_product_entity_int.entity_type_id + + + catalog_product_entity_text.entity_type_id + + + catalog_product_entity_varchar.entity_type_id + + + sales_flat_creditmemo.cybersource_token + + + sales_flat_invoice.cybersource_token + + + sales_flat_order_payment.ideal_transaction_checked + + + sales_flat_order_payment.cybersource_token + + + sales_flat_order_payment.ideal_issuer_title + + + sales_flat_order_payment.paybox_question_number + + + sales_flat_order_payment.ideal_issuer_id + + + sales_flat_order_payment.flo2cash_account_id + + + sales_flat_quote_payment.cybersource_token + + + sales_flat_quote_payment.ideal_issuer_id + + + sales_flat_quote_payment.ideal_issuer_list + + + sales_flat_quote_payment.paypal_payer_id + + + sales_flat_quote_payment.paypal_payer_status + + + sales_flat_quote_payment.paypal_correlation_id + + + cms_page.layout_update_xml + + + cms_page.custom_layout_update_xml + + + widget_instance.package_theme + + + enterprise_rma_item_entity.entity_type_id + + + enterprise_rma_item_entity.attribute_set_id + + + enterprise_rma_item_entity_datetime.entity_type_id + + + enterprise_rma_item_entity_decimal.entity_type_id + + + enterprise_rma_item_entity_int.entity_type_id + + + enterprise_rma_item_entity_text.entity_type_id + + + enterprise_rma_item_entity_varchar.entity_type_id + + + enterprise_giftcard_amount.entity_type_id + + + enterprise_targetrule.use_customer_segment + + + enterprise_targetrule_product.store_id + + + newsletter_template.template_text_preprocessed + + + enterprise_giftregistry_person.middlename + + + sales_flat_quote.base_customer_balance_virtual_amount + + + catalogsearch_query.synonym_for + + + catalogrule.sub_is_enable + + + catalogrule.sub_simple_action + + + catalogrule.sub_discount_amount + + + catalogrule_product.sub_simple_action + + + catalogrule_product.sub_discount_amount + + + cms_page.published_revision_id + + + cms_page.under_version_control + + + sales_flat_quote_payment.cc_exp_month + + + weee_tax.state + + + enterprise_banner.is_ga_enabled + + + enterprise_logging_event.ip + + + enterprise_logging_event.x_forwarded_ip + + + rating_option_vote.remote_ip_long + + + sendfriend_log.ip + + + enterprise_catalogevent_event.date_start + + + enterprise_catalogevent_event.date_end + + + oauth_token.callback_url + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + enterprise_reminder_rule.from_date + + + enterprise_reminder_rule.to_date + + + + + + + ui_bookmark + + + migration_backup_* + + + googleoptimizer_code + + + indexer_state + + + integration + + + mview_state + + + theme + + + theme_file + + + vde_theme_change + + + admin_system_messages + + + catalog_url_rewrite_product_category + + + customer_visitor + + + url_rewrite + + + layout_update + + + layout_link + + + catalog_product_flat_* + + + catalog_category_flat_* + + + catalogindex_eav + + + catalog_eav_attribute + + + catalogsearch_fulltext_index_default + + + customer_eav_attribute + + + customer_eav_attribute_website + + + catalog_product_index_eav + + + catalog_product_index_eav_decimal + + + catalog_product_index_eav_decimal_idx + + + catalog_product_index_eav_decimal_tmp + + + catalog_product_index_eav_idx + + + catalog_product_index_eav_tmp + + + catalog_category_product_index_tmp + + + eav_attribute + + + eav_attribute_group + + + eav_attribute_set + + + eav_entity_attribute + + + eav_entity_type + + + authorization_role + + + authorization_rule + + + setup_module + + + sales_order + + + cache + + + cache_tag + + + customer_log + + + flag + + + log_customer + + + log_quote + + + log_summary_type + + + log_summary + + + log_url + + + log_url_info + + + quote_id_mask + + + session + + + sales_sequence_profile + + + sales_sequence_meta + + + sequence_invoice_* + + + sequence_creditmemo_* + + + sequence_order_* + + + sequence_shipment* + + + sequence_rma_item_* + + + magento_rma_item_eav_attribute + + + magento_rma_item_eav_attribute_website + + + magento_catalogpermissions_index + + + magento_catalogpermissions_index_product + + + magento_catalogpermissions_index_product_tmp + + + magento_catalogpermissions_index_tmp + + + magento_customercustomattributes_sales_flat_order + + + magento_customercustomattributes_sales_flat_order_address + + + magento_customercustomattributes_sales_flat_quote + + + magento_customercustomattributes_sales_flat_quote_address + + + magento_targetrule_index + + + magento_targetrule_index_crosssell + + + magento_targetrule_index_crosssell_product + + + magento_targetrule_index_related + + + magento_targetrule_index_related_product + + + magento_targetrule_index_upsell + + + magento_targetrule_index_upsell_product + + + quote_id_mask + + + eav_attribute_option_swatch + + + import_history + + + magento_sales_creditmemo_grid_archive + + + magento_sales_invoice_grid_archive + + + magento_sales_order_grid_archive + + + magento_sales_shipment_grid_archive + + + sales_creditmemo_grid + + + sales_invoice_grid + + + sales_order_grid + + + sales_shipment_grid + + + catalogsearch_fulltext_scope* + + + customer_entity + + + customer_entity_datetime + + + customer_entity_decimal + + + customer_entity_int + + + customer_entity_text + + + customer_entity_varchar + + + customer_address_entity + + + customer_address_entity_datetime + + + customer_address_entity_decimal + + + customer_address_entity_int + + + customer_address_entity_text + + + customer_address_entity_varchar + + + store_website + + + support_report + + + log_visitor_info + + + log_visitor_online + + + reporting_module_status + + + reporting_orders + + + reporting_system_updates + + + reporting_users + + + reporting_counts + + + queue + + + queue_message + + + queue_message_status + + + catalog_product_entity_media_gallery_value_to_entity + + + catalog_product_entity_media_gallery_value_video + + + catalog_product_entity_tier_price + + + customer_grid_flat + + + visual_merchandiser_rule + + + admin_passwords + + + oauth_token_request_log + + + design_config_grid_flat + + + admin_user_session + + + magento_salesrule_filter + + + multiinventory_warehouse + + + password_reset_request_event + + + queue_lock + + + quote_preview + + + search_synonyms + + + sequence_catalog_category + + + sequence_catalogrule + + + sequence_cms_block + + + sequence_cms_page + + + sequence_product + + + sequence_salesrule + + + staging_update + + + vault_payment_token + + + vault_payment_token_order_payment_link + + + + + admin_user.interface_locale + + + + + + cataloginventory_stock.website_id + + + + cataloginventory_stock_item.website_id + + + + rating.is_active + + + + + + authorization_role.user_type + + + + + + sales_order_tax_item.amount + + + + + + sales_order_tax_item.base_amount + + + + + + sales_order_tax_item.real_amount + + + + + + sales_order_tax_item.real_base_amount + + + + + + sales_order_tax_item.taxable_item_type + + + + + + oauth_token.user_type + + + + + + widget_instance.theme_id + + + + + + sales_order_status_state.visible_on_front + + + + magento_banner_content.banner_content + + + + catalog_product_entity_media_gallery_value.entity_id + + + + catalog_category_entity.row_id + + + + + + catalog_product_entity.row_id + + + + + + catalogrule.row_id + + + + + + cms_block.row_id + + + + + + cms_page.row_id + + + + + + salesrule.row_id + + + + + + catalog_product_entity_media_gallery_value.entity_id + + + catalog_product_entity_media_gallery.media_type + + + catalog_product_entity_media_gallery.disabled + + + catalog_product_entity_media_gallery_value.record_id + + + admin_user.interface_locale + + + rating.is_active + + + sales_creditmemo.send_email + + + sales_creditmemo.customer_note + + + sales_creditmemo.customer_note_notify + + + sales_invoice.send_email + + + sales_invoice.customer_note + + + sales_invoice.customer_note_notify + + + sales_shipment.send_email + + + sales_shipment.customer_note + + + sales_shipment.customer_note_notify + + + sales_creditmemo_item.tax_ratio + + + sales_invoice_item.tax_ratio + + + authorization_role.user_type + + + cataloginventory_stock.website_id + + + cataloginventory_stock_item.website_id + + + oauth_nonce.consumer_id + + + oauth_token.user_type + + + sales_order_status_state.visible_on_front + + + widget_instance.theme_id + + + sales_order_tax_item.amount + + + sales_order_tax_item.base_amount + + + sales_order_tax_item.real_amount + + + sales_order_tax_item.real_base_amount + + + sales_order_tax_item.associated_item_id + + + sales_order_tax_item.taxable_item_type + + + magento_banner.is_ga_enabled + + + magento_banner.ga_creative + + + checkout_agreement.mode + + + cataloginventory_stock_item.deferred_stock_update + + + cataloginventory_stock_item.use_config_deferred_stock_update + + + quote.gw_base_price_incl_tax + + + quote.gw_price_incl_tax + + + quote.gw_items_base_price_incl_tax + + + quote.gw_items_price_incl_tax + + + quote.gw_card_base_price_incl_tax + + + quote.gw_card_price_incl_tax + + + quote_address.gw_base_price_incl_tax + + + quote_address.gw_price_incl_tax + + + quote_address.gw_items_base_price_incl_tax + + + quote_address.gw_items_price_incl_tax + + + quote_address.gw_card_base_price_incl_tax + + + quote_address.gw_card_price_incl_tax + + + catalog_category_entity.created_in + + + catalog_category_entity.updated_in + + + catalog_product_entity.created_in + + + catalog_product_entity.updated_in + + + catalogrule.created_in + + + catalogrule.updated_in + + + cms_block.created_in + + + cms_block.updated_in + + + cms_page.created_in + + + cms_page.updated_in + + + salesrule.created_in + + + salesrule.updated_in + + + catalog_category_entity.row_id + + + catalog_category_product.entity_id + + + catalog_product_entity.row_id + + + catalog_product_entity_media_gallery_value.row_id + + + catalogrule.row_id + + + cms_block.row_id + + + cms_page.row_id + + + salesrule.row_id + + + quote_payment.cc_exp_month + + + weee_tax.state + + + magento_logging_event.ip + + + magento_logging_event.x_forwarded_ip + + + rating_option_vote.remote_ip_long + + + sendfriend_log.ip + + + magento_catalogevent_event.date_start + + + magento_catalogevent_event.date_end + + + oauth_consumer.callback_url + + + oauth_consumer.rejected_callback_url + + + oauth_token.callback_url + + + magento_reminder_rule.from_date + + + magento_reminder_rule.to_date + + + + From 7962ee994fbc3931ec0aa457a285a53b8902b98e Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Wed, 11 May 2016 15:15:32 +0300 Subject: [PATCH 14/71] MAGETWO-48593: Adapt Data Migration Tool to Magento 2.1 MLS12 --- etc/ce-to-ce/1.6.0.0/map.xml.dist | 3 --- 1 file changed, 3 deletions(-) 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 index fb3fe1daf..37528242d 100644 --- a/etc/ce-to-ce/1.6.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.0.0/map.xml.dist @@ -1406,9 +1406,6 @@ customer_grid_flat - - oauth_token_request_log - admin_user_session From e34c2c29944995c733146fe5e4bbb119290471e6 Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Wed, 11 May 2016 16:25:29 +0300 Subject: [PATCH 15/71] MAGETWO-52034: No products on storefront after migration --- etc/ce-to-ce/1.6.0.0/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ce/1.6.1.0/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ce/1.6.2.0/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ce/1.7.0.0/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ce/1.7.0.1/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ce/1.7.0.2/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ce/1.8.0.0/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ce/1.8.1.0/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ce/1.9.0.0/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ce/1.9.0.1/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ce/1.9.1.0/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ce/1.9.1.1/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ce/1.9.2.0/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ce/1.9.2.1/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ce/1.9.2.2/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ce/1.9.2.3/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ce/1.9.2.4/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ee/1.6.0.0/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ee/1.6.1.0/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ee/1.6.2.0/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ee/1.7.0.0/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ee/1.7.0.1/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ee/1.7.0.2/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ee/1.8.0.0/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ee/1.8.1.0/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ee/1.9.0.0/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ee/1.9.0.1/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ee/1.9.1.0/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ee/1.9.1.1/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ee/1.9.2.0/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ee/1.9.2.1/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ee/1.9.2.2/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ee/1.9.2.3/map.xml.dist | 14 ++++++++++++-- etc/ce-to-ee/1.9.2.4/map.xml.dist | 14 ++++++++++++-- etc/ee-to-ee/1.11.0.0/map.xml.dist | 14 ++++++++++++-- etc/ee-to-ee/1.11.0.1/map.xml.dist | 14 ++++++++++++-- etc/ee-to-ee/1.11.0.2/map.xml.dist | 14 ++++++++++++-- etc/ee-to-ee/1.11.1.0/map.xml.dist | 14 ++++++++++++-- etc/ee-to-ee/1.11.2.0/map.xml.dist | 14 ++++++++++++-- etc/ee-to-ee/1.12.0.0/map.xml.dist | 14 ++++++++++++-- etc/ee-to-ee/1.12.0.1/map.xml.dist | 14 ++++++++++++-- etc/ee-to-ee/1.12.0.2/map.xml.dist | 14 ++++++++++++-- etc/ee-to-ee/1.13.0.0/map.xml.dist | 14 ++++++++++++-- etc/ee-to-ee/1.13.0.1/map.xml.dist | 14 ++++++++++++-- etc/ee-to-ee/1.13.0.2/map.xml.dist | 14 ++++++++++++-- etc/ee-to-ee/1.13.1.0/map.xml.dist | 14 ++++++++++++-- etc/ee-to-ee/1.14.0.0/map.xml.dist | 14 ++++++++++++-- etc/ee-to-ee/1.14.0.1/map.xml.dist | 14 ++++++++++++-- etc/ee-to-ee/1.14.1.0/map.xml.dist | 14 ++++++++++++-- etc/ee-to-ee/1.14.2.0/map.xml.dist | 14 ++++++++++++-- etc/ee-to-ee/1.14.2.1/map.xml.dist | 14 ++++++++++++-- etc/ee-to-ee/1.14.2.2/map.xml.dist | 14 ++++++++++++-- etc/ee-to-ee/1.14.2.3/map.xml.dist | 14 ++++++++++++-- etc/ee-to-ee/1.14.2.4/map.xml.dist | 14 ++++++++++++-- 54 files changed, 648 insertions(+), 108 deletions(-) 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 index 37528242d..5a7cb4482 100644 --- a/etc/ce-to-ce/1.6.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.0.0/map.xml.dist @@ -1428,11 +1428,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index 837869e0b..5a0e6ecb5 100644 --- a/etc/ce-to-ce/1.6.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.1.0/map.xml.dist @@ -1419,11 +1419,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index faa4f98e3..e7803c04c 100644 --- a/etc/ce-to-ce/1.6.2.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.2.0/map.xml.dist @@ -1419,11 +1419,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index df1419a55..6c58ca70d 100644 --- a/etc/ce-to-ce/1.7.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.0/map.xml.dist @@ -1346,11 +1346,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index df1419a55..6c58ca70d 100644 --- a/etc/ce-to-ce/1.7.0.1/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.1/map.xml.dist @@ -1346,11 +1346,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index df1419a55..6c58ca70d 100644 --- a/etc/ce-to-ce/1.7.0.2/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.2/map.xml.dist @@ -1346,11 +1346,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index 33784cda5..acd27e87d 100644 --- a/etc/ce-to-ce/1.8.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.8.0.0/map.xml.dist @@ -1346,11 +1346,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index 6a1d684f5..7db571487 100644 --- a/etc/ce-to-ce/1.8.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.8.1.0/map.xml.dist @@ -1343,11 +1343,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index 2bbb53af9..0403f5115 100644 --- a/etc/ce-to-ce/1.9.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.0.0/map.xml.dist @@ -1352,11 +1352,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index 2bbb53af9..0403f5115 100644 --- a/etc/ce-to-ce/1.9.0.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.0.1/map.xml.dist @@ -1352,11 +1352,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index 76de72c3c..ca5c95445 100644 --- a/etc/ce-to-ce/1.9.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.1.0/map.xml.dist @@ -1334,11 +1334,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index 76de72c3c..ca5c95445 100644 --- a/etc/ce-to-ce/1.9.1.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.1.1/map.xml.dist @@ -1334,11 +1334,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index 1f18eeaa1..52f04f3d3 100644 --- a/etc/ce-to-ce/1.9.2.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.0/map.xml.dist @@ -1348,11 +1348,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index 1f18eeaa1..52f04f3d3 100644 --- a/etc/ce-to-ce/1.9.2.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.1/map.xml.dist @@ -1348,11 +1348,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active diff --git a/etc/ce-to-ce/1.9.2.2/map.xml.dist b/etc/ce-to-ce/1.9.2.2/map.xml.dist index a8b7a5b6c..c729e63f4 100644 --- a/etc/ce-to-ce/1.9.2.2/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.2/map.xml.dist @@ -1354,11 +1354,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active diff --git a/etc/ce-to-ce/1.9.2.3/map.xml.dist b/etc/ce-to-ce/1.9.2.3/map.xml.dist index a8b7a5b6c..c729e63f4 100644 --- a/etc/ce-to-ce/1.9.2.3/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.3/map.xml.dist @@ -1354,11 +1354,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active diff --git a/etc/ce-to-ce/1.9.2.4/map.xml.dist b/etc/ce-to-ce/1.9.2.4/map.xml.dist index a8b7a5b6c..c729e63f4 100644 --- a/etc/ce-to-ce/1.9.2.4/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.4/map.xml.dist @@ -1354,11 +1354,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active diff --git a/etc/ce-to-ee/1.6.0.0/map.xml.dist b/etc/ce-to-ee/1.6.0.0/map.xml.dist index 6cee280bf..cc9aeabf0 100644 --- a/etc/ce-to-ee/1.6.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.6.0.0/map.xml.dist @@ -1860,11 +1860,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active diff --git a/etc/ce-to-ee/1.6.1.0/map.xml.dist b/etc/ce-to-ee/1.6.1.0/map.xml.dist index e0c8fb086..b9c9be3b1 100644 --- a/etc/ce-to-ee/1.6.1.0/map.xml.dist +++ b/etc/ce-to-ee/1.6.1.0/map.xml.dist @@ -1860,11 +1860,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active diff --git a/etc/ce-to-ee/1.6.2.0/map.xml.dist b/etc/ce-to-ee/1.6.2.0/map.xml.dist index 3c4826cee..6babdcfff 100644 --- a/etc/ce-to-ee/1.6.2.0/map.xml.dist +++ b/etc/ce-to-ee/1.6.2.0/map.xml.dist @@ -1860,11 +1860,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active diff --git a/etc/ce-to-ee/1.7.0.0/map.xml.dist b/etc/ce-to-ee/1.7.0.0/map.xml.dist index 8a7e41aac..483fd3938 100644 --- a/etc/ce-to-ee/1.7.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.7.0.0/map.xml.dist @@ -1775,11 +1775,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active diff --git a/etc/ce-to-ee/1.7.0.1/map.xml.dist b/etc/ce-to-ee/1.7.0.1/map.xml.dist index 8a7e41aac..483fd3938 100644 --- a/etc/ce-to-ee/1.7.0.1/map.xml.dist +++ b/etc/ce-to-ee/1.7.0.1/map.xml.dist @@ -1775,11 +1775,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active diff --git a/etc/ce-to-ee/1.7.0.2/map.xml.dist b/etc/ce-to-ee/1.7.0.2/map.xml.dist index 8a7e41aac..483fd3938 100644 --- a/etc/ce-to-ee/1.7.0.2/map.xml.dist +++ b/etc/ce-to-ee/1.7.0.2/map.xml.dist @@ -1775,11 +1775,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active diff --git a/etc/ce-to-ee/1.8.0.0/map.xml.dist b/etc/ce-to-ee/1.8.0.0/map.xml.dist index 96df2da70..5a4d9a414 100644 --- a/etc/ce-to-ee/1.8.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.8.0.0/map.xml.dist @@ -1775,11 +1775,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active diff --git a/etc/ce-to-ee/1.8.1.0/map.xml.dist b/etc/ce-to-ee/1.8.1.0/map.xml.dist index 3fff4ddb8..9cf26326f 100644 --- a/etc/ce-to-ee/1.8.1.0/map.xml.dist +++ b/etc/ce-to-ee/1.8.1.0/map.xml.dist @@ -1772,11 +1772,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active diff --git a/etc/ce-to-ee/1.9.0.0/map.xml.dist b/etc/ce-to-ee/1.9.0.0/map.xml.dist index fceeb5f35..84f2addce 100644 --- a/etc/ce-to-ee/1.9.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.9.0.0/map.xml.dist @@ -1775,11 +1775,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active diff --git a/etc/ce-to-ee/1.9.0.1/map.xml.dist b/etc/ce-to-ee/1.9.0.1/map.xml.dist index 96df2da70..5a4d9a414 100644 --- a/etc/ce-to-ee/1.9.0.1/map.xml.dist +++ b/etc/ce-to-ee/1.9.0.1/map.xml.dist @@ -1775,11 +1775,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active diff --git a/etc/ce-to-ee/1.9.1.0/map.xml.dist b/etc/ce-to-ee/1.9.1.0/map.xml.dist index 8d88ecd3a..e6bad7a41 100644 --- a/etc/ce-to-ee/1.9.1.0/map.xml.dist +++ b/etc/ce-to-ee/1.9.1.0/map.xml.dist @@ -1757,11 +1757,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active diff --git a/etc/ce-to-ee/1.9.1.1/map.xml.dist b/etc/ce-to-ee/1.9.1.1/map.xml.dist index 8d88ecd3a..e6bad7a41 100644 --- a/etc/ce-to-ee/1.9.1.1/map.xml.dist +++ b/etc/ce-to-ee/1.9.1.1/map.xml.dist @@ -1757,11 +1757,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active diff --git a/etc/ce-to-ee/1.9.2.0/map.xml.dist b/etc/ce-to-ee/1.9.2.0/map.xml.dist index 45bfc0385..2f305ea1c 100644 --- a/etc/ce-to-ee/1.9.2.0/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.0/map.xml.dist @@ -1777,11 +1777,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active diff --git a/etc/ce-to-ee/1.9.2.1/map.xml.dist b/etc/ce-to-ee/1.9.2.1/map.xml.dist index 45bfc0385..2f305ea1c 100644 --- a/etc/ce-to-ee/1.9.2.1/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.1/map.xml.dist @@ -1777,11 +1777,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active diff --git a/etc/ce-to-ee/1.9.2.2/map.xml.dist b/etc/ce-to-ee/1.9.2.2/map.xml.dist index 73523879d..80c9e0144 100644 --- a/etc/ce-to-ee/1.9.2.2/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.2/map.xml.dist @@ -1783,11 +1783,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active diff --git a/etc/ce-to-ee/1.9.2.3/map.xml.dist b/etc/ce-to-ee/1.9.2.3/map.xml.dist index 73523879d..80c9e0144 100644 --- a/etc/ce-to-ee/1.9.2.3/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.3/map.xml.dist @@ -1783,11 +1783,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active diff --git a/etc/ce-to-ee/1.9.2.4/map.xml.dist b/etc/ce-to-ee/1.9.2.4/map.xml.dist index 73523879d..80c9e0144 100644 --- a/etc/ce-to-ee/1.9.2.4/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.4/map.xml.dist @@ -1783,11 +1783,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index bcef3517b..d6c1e7373 100644 --- a/etc/ee-to-ee/1.11.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.0/map.xml.dist @@ -2121,11 +2121,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index 3b10c604d..cc33286bf 100644 --- a/etc/ee-to-ee/1.11.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.1/map.xml.dist @@ -2121,11 +2121,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index 3b10c604d..cc33286bf 100644 --- a/etc/ee-to-ee/1.11.0.2/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.2/map.xml.dist @@ -2121,11 +2121,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index 3d59a2439..5c4ee8be8 100644 --- a/etc/ee-to-ee/1.11.1.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.1.0/map.xml.dist @@ -2109,11 +2109,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index fa26f0d71..d8dd430e4 100644 --- a/etc/ee-to-ee/1.11.2.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.2.0/map.xml.dist @@ -2109,11 +2109,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index d4315c30e..4370a85de 100644 --- a/etc/ee-to-ee/1.12.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.0/map.xml.dist @@ -2061,11 +2061,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index 03e00b09d..40365685a 100644 --- a/etc/ee-to-ee/1.12.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.1/map.xml.dist @@ -2061,11 +2061,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index 03e00b09d..40365685a 100644 --- a/etc/ee-to-ee/1.12.0.2/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.2/map.xml.dist @@ -2061,11 +2061,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index aec60eee8..99fd2c288 100644 --- a/etc/ee-to-ee/1.13.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.13.0.0/map.xml.dist @@ -2037,11 +2037,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index aec60eee8..99fd2c288 100644 --- a/etc/ee-to-ee/1.13.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.13.0.1/map.xml.dist @@ -2037,11 +2037,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index aec60eee8..99fd2c288 100644 --- a/etc/ee-to-ee/1.13.0.2/map.xml.dist +++ b/etc/ee-to-ee/1.13.0.2/map.xml.dist @@ -2037,11 +2037,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index 2aafc2f35..f95096dd3 100644 --- a/etc/ee-to-ee/1.13.1.0/map.xml.dist +++ b/etc/ee-to-ee/1.13.1.0/map.xml.dist @@ -2043,11 +2043,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index 3b1475564..8967b47e9 100644 --- a/etc/ee-to-ee/1.14.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.14.0.0/map.xml.dist @@ -2043,11 +2043,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index 3b1475564..8967b47e9 100644 --- a/etc/ee-to-ee/1.14.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.14.0.1/map.xml.dist @@ -2043,11 +2043,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index e80db964e..610e55ee8 100644 --- a/etc/ee-to-ee/1.14.1.0/map.xml.dist +++ b/etc/ee-to-ee/1.14.1.0/map.xml.dist @@ -2045,11 +2045,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index b96fecbf9..4a9d702e0 100644 --- a/etc/ee-to-ee/1.14.2.0/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.0/map.xml.dist @@ -2082,11 +2082,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index b96fecbf9..4a9d702e0 100644 --- a/etc/ee-to-ee/1.14.2.1/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.1/map.xml.dist @@ -2082,11 +2082,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index b275d3df9..dabf0c417 100644 --- a/etc/ee-to-ee/1.14.2.2/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.2/map.xml.dist @@ -2088,11 +2088,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index b275d3df9..dabf0c417 100644 --- a/etc/ee-to-ee/1.14.2.3/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.3/map.xml.dist @@ -2088,11 +2088,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active 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 index b275d3df9..dabf0c417 100644 --- a/etc/ee-to-ee/1.14.2.4/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.4/map.xml.dist @@ -2088,11 +2088,21 @@ cataloginventory_stock.website_id - + + + cataloginventory_stock_item.website_id - + + + + + + cataloginventory_stock_status.website_id + + + rating.is_active From e16cba7694bc0d37202c0d085531c739bfdebcef Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Fri, 13 May 2016 17:19:03 +0300 Subject: [PATCH 16/71] MAGETWO-52694: Cannot open a product on storefront after migration --- etc/ce-to-ce/1.6.0.0/config.xml.dist | 9 ++ etc/ce-to-ce/1.6.1.0/config.xml.dist | 9 ++ etc/ce-to-ce/1.6.2.0/config.xml.dist | 9 ++ etc/ce-to-ce/1.7.0.0/config.xml.dist | 4 + etc/ce-to-ce/1.7.0.1/config.xml.dist | 4 + etc/ce-to-ce/1.7.0.2/config.xml.dist | 4 + etc/ce-to-ce/1.8.0.0/config.xml.dist | 4 + etc/ce-to-ce/1.8.1.0/config.xml.dist | 4 + etc/ce-to-ce/1.9.0.0/config.xml.dist | 4 + etc/ce-to-ce/1.9.0.1/config.xml.dist | 4 + etc/ce-to-ce/1.9.1.0/config.xml.dist | 4 + etc/ce-to-ce/1.9.1.1/config.xml.dist | 4 + etc/ce-to-ce/1.9.2.0/config.xml.dist | 4 + etc/ce-to-ce/1.9.2.1/config.xml.dist | 5 + etc/ce-to-ce/1.9.2.2/config.xml.dist | 4 + etc/ce-to-ce/1.9.2.3/config.xml.dist | 4 + etc/ce-to-ce/1.9.2.4/config.xml.dist | 4 + etc/ce-to-ee/1.6.0.0/config.xml.dist | 9 ++ etc/ce-to-ee/1.6.1.0/config.xml.dist | 9 ++ etc/ce-to-ee/1.6.2.0/config.xml.dist | 9 ++ etc/ce-to-ee/1.7.0.0/config.xml.dist | 4 + etc/ce-to-ee/1.7.0.1/config.xml.dist | 4 + etc/ce-to-ee/1.7.0.2/config.xml.dist | 4 + etc/ce-to-ee/1.8.0.0/config.xml.dist | 4 + etc/ce-to-ee/1.8.1.0/config.xml.dist | 4 + etc/ce-to-ee/1.9.0.0/config.xml.dist | 4 + etc/ce-to-ee/1.9.0.1/config.xml.dist | 4 + etc/ce-to-ee/1.9.1.0/config.xml.dist | 4 + etc/ce-to-ee/1.9.1.1/config.xml.dist | 4 + etc/ce-to-ee/1.9.2.0/config.xml.dist | 4 + etc/ce-to-ee/1.9.2.1/config.xml.dist | 4 + etc/ce-to-ee/1.9.2.2/config.xml.dist | 4 + etc/ce-to-ee/1.9.2.3/config.xml.dist | 4 + etc/ce-to-ee/1.9.2.4/config.xml.dist | 4 + etc/ee-to-ee/1.11.0.0/config.xml.dist | 9 ++ etc/ee-to-ee/1.11.0.1/config.xml.dist | 9 ++ etc/ee-to-ee/1.11.0.2/config.xml.dist | 9 ++ etc/ee-to-ee/1.11.1.0/config.xml.dist | 9 ++ etc/ee-to-ee/1.11.2.0/config.xml.dist | 9 ++ etc/ee-to-ee/1.12.0.0/config.xml.dist | 4 + etc/ee-to-ee/1.12.0.1/config.xml.dist | 4 + etc/ee-to-ee/1.12.0.2/config.xml.dist | 4 + etc/ee-to-ee/1.13.0.0/config.xml.dist | 4 + etc/ee-to-ee/1.13.0.1/config.xml.dist | 4 + etc/ee-to-ee/1.13.0.2/config.xml.dist | 4 + etc/ee-to-ee/1.13.1.0/config.xml.dist | 4 + etc/ee-to-ee/1.14.0.0/config.xml.dist | 4 + etc/ee-to-ee/1.14.0.1/config.xml.dist | 4 + etc/ee-to-ee/1.14.1.0/config.xml.dist | 4 + etc/ee-to-ee/1.14.2.0/config.xml.dist | 4 + etc/ee-to-ee/1.14.2.1/config.xml.dist | 4 + etc/ee-to-ee/1.14.2.2/config.xml.dist | 4 + etc/ee-to-ee/1.14.2.3/config.xml.dist | 4 + etc/ee-to-ee/1.14.2.4/config.xml.dist | 4 + src/Migration/Step/Eav/Volume.php | 6 +- src/Migration/Step/PostProcessing/Data.php | 128 ++++++++++++++++++ src/Migration/Step/PostProcessing/Helper.php | 113 ++++++++++++++++ .../Step/PostProcessing/Integrity.php | 112 +++++++++++++++ 58 files changed, 626 insertions(+), 5 deletions(-) create mode 100644 src/Migration/Step/PostProcessing/Data.php create mode 100644 src/Migration/Step/PostProcessing/Helper.php create mode 100644 src/Migration/Step/PostProcessing/Integrity.php 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 index 15c4b93c7..491abfd6b 100644 --- a/etc/ce-to-ce/1.6.0.0/config.xml.dist +++ b/etc/ce-to-ce/1.6.0.0/config.xml.dist @@ -58,11 +58,20 @@ Migration\Step\OrderGrids\Data Migration\Step\OrderGrids\Volume + + Migration\Step\TierPrice\Integrity + Migration\Step\TierPrice\Data + Migration\Step\TierPrice\Volume + Migration\Step\SalesIncrement\Integrity Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + 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 index 2b73ce1a4..dace3decb 100644 --- a/etc/ce-to-ce/1.6.1.0/config.xml.dist +++ b/etc/ce-to-ce/1.6.1.0/config.xml.dist @@ -58,11 +58,20 @@ Migration\Step\OrderGrids\Data Migration\Step\OrderGrids\Volume + + Migration\Step\TierPrice\Integrity + Migration\Step\TierPrice\Data + Migration\Step\TierPrice\Volume + Migration\Step\SalesIncrement\Integrity Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + 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 index 1ef9fb329..8ca2c737e 100644 --- a/etc/ce-to-ce/1.6.2.0/config.xml.dist +++ b/etc/ce-to-ce/1.6.2.0/config.xml.dist @@ -58,11 +58,20 @@ Migration\Step\OrderGrids\Data Migration\Step\OrderGrids\Volume + + Migration\Step\TierPrice\Integrity + Migration\Step\TierPrice\Data + Migration\Step\TierPrice\Volume + Migration\Step\SalesIncrement\Integrity Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + 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 index 661f7096d..cf9767d14 100644 --- a/etc/ce-to-ce/1.7.0.0/config.xml.dist +++ b/etc/ce-to-ce/1.7.0.0/config.xml.dist @@ -68,6 +68,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + 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 index 50639da6c..a2edd7031 100644 --- a/etc/ce-to-ce/1.7.0.1/config.xml.dist +++ b/etc/ce-to-ce/1.7.0.1/config.xml.dist @@ -68,6 +68,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + 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 index e2ec41d59..e91f2b470 100644 --- a/etc/ce-to-ce/1.7.0.2/config.xml.dist +++ b/etc/ce-to-ce/1.7.0.2/config.xml.dist @@ -68,6 +68,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + 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 index 4e6bc11d6..5e08e5de9 100644 --- a/etc/ce-to-ce/1.8.0.0/config.xml.dist +++ b/etc/ce-to-ce/1.8.0.0/config.xml.dist @@ -68,6 +68,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + 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 index ca68b40f3..177ea6ff4 100644 --- a/etc/ce-to-ce/1.8.1.0/config.xml.dist +++ b/etc/ce-to-ce/1.8.1.0/config.xml.dist @@ -68,6 +68,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + 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 index 8cfef5591..6ffa0d06f 100644 --- a/etc/ce-to-ce/1.9.0.0/config.xml.dist +++ b/etc/ce-to-ce/1.9.0.0/config.xml.dist @@ -68,6 +68,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + 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 index 0d3089737..71db65c8d 100644 --- a/etc/ce-to-ce/1.9.0.1/config.xml.dist +++ b/etc/ce-to-ce/1.9.0.1/config.xml.dist @@ -68,6 +68,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + 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 index e2f7e5c44..895a507a3 100644 --- a/etc/ce-to-ce/1.9.1.0/config.xml.dist +++ b/etc/ce-to-ce/1.9.1.0/config.xml.dist @@ -68,6 +68,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + 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 index e2ffe4a8a..611bae378 100644 --- a/etc/ce-to-ce/1.9.1.1/config.xml.dist +++ b/etc/ce-to-ce/1.9.1.1/config.xml.dist @@ -68,6 +68,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + 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 index cb067fda8..d60ec5f2f 100644 --- a/etc/ce-to-ce/1.9.2.0/config.xml.dist +++ b/etc/ce-to-ce/1.9.2.0/config.xml.dist @@ -68,6 +68,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + 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 index 2c1b7c852..623052100 100644 --- a/etc/ce-to-ce/1.9.2.1/config.xml.dist +++ b/etc/ce-to-ce/1.9.2.1/config.xml.dist @@ -68,6 +68,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + @@ -128,6 +132,7 @@ migration.log %percent%% [%bar%] Remaining Time: %remaining% 1 + ce-to-ce 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 index 0358152e7..2830c8f86 100644 --- a/etc/ce-to-ce/1.9.2.2/config.xml.dist +++ b/etc/ce-to-ce/1.9.2.2/config.xml.dist @@ -68,6 +68,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ce-to-ce/1.9.2.3/config.xml.dist b/etc/ce-to-ce/1.9.2.3/config.xml.dist index 055a8c90c..22912c3c7 100644 --- a/etc/ce-to-ce/1.9.2.3/config.xml.dist +++ b/etc/ce-to-ce/1.9.2.3/config.xml.dist @@ -68,6 +68,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ce-to-ce/1.9.2.4/config.xml.dist b/etc/ce-to-ce/1.9.2.4/config.xml.dist index fca92966f..a4b9c4589 100644 --- a/etc/ce-to-ce/1.9.2.4/config.xml.dist +++ b/etc/ce-to-ce/1.9.2.4/config.xml.dist @@ -68,6 +68,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ce-to-ee/1.6.0.0/config.xml.dist b/etc/ce-to-ee/1.6.0.0/config.xml.dist index 9d547d0e5..c8ab9651f 100644 --- a/etc/ce-to-ee/1.6.0.0/config.xml.dist +++ b/etc/ce-to-ee/1.6.0.0/config.xml.dist @@ -58,11 +58,20 @@ Migration\Step\OrderGrids\Data Migration\Step\OrderGrids\Volume + + Migration\Step\TierPrice\Integrity + Migration\Step\TierPrice\Data + Migration\Step\TierPrice\Volume + Migration\Step\SalesIncrement\Integrity Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ce-to-ee/1.6.1.0/config.xml.dist b/etc/ce-to-ee/1.6.1.0/config.xml.dist index c47b3af2d..06817f462 100644 --- a/etc/ce-to-ee/1.6.1.0/config.xml.dist +++ b/etc/ce-to-ee/1.6.1.0/config.xml.dist @@ -58,11 +58,20 @@ Migration\Step\OrderGrids\Data Migration\Step\OrderGrids\Volume + + Migration\Step\TierPrice\Integrity + Migration\Step\TierPrice\Data + Migration\Step\TierPrice\Volume + Migration\Step\SalesIncrement\Integrity Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ce-to-ee/1.6.2.0/config.xml.dist b/etc/ce-to-ee/1.6.2.0/config.xml.dist index fbc715bba..36371ad91 100644 --- a/etc/ce-to-ee/1.6.2.0/config.xml.dist +++ b/etc/ce-to-ee/1.6.2.0/config.xml.dist @@ -58,11 +58,20 @@ Migration\Step\OrderGrids\Data Migration\Step\OrderGrids\Volume + + Migration\Step\TierPrice\Integrity + Migration\Step\TierPrice\Data + Migration\Step\TierPrice\Volume + Migration\Step\SalesIncrement\Integrity Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ce-to-ee/1.7.0.0/config.xml.dist b/etc/ce-to-ee/1.7.0.0/config.xml.dist index e01ddb8d9..b51818850 100644 --- a/etc/ce-to-ee/1.7.0.0/config.xml.dist +++ b/etc/ce-to-ee/1.7.0.0/config.xml.dist @@ -68,6 +68,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ce-to-ee/1.7.0.1/config.xml.dist b/etc/ce-to-ee/1.7.0.1/config.xml.dist index 09d485d9a..04f710eb2 100644 --- a/etc/ce-to-ee/1.7.0.1/config.xml.dist +++ b/etc/ce-to-ee/1.7.0.1/config.xml.dist @@ -68,6 +68,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ce-to-ee/1.7.0.2/config.xml.dist b/etc/ce-to-ee/1.7.0.2/config.xml.dist index b72a9b116..80034062d 100644 --- a/etc/ce-to-ee/1.7.0.2/config.xml.dist +++ b/etc/ce-to-ee/1.7.0.2/config.xml.dist @@ -68,6 +68,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ce-to-ee/1.8.0.0/config.xml.dist b/etc/ce-to-ee/1.8.0.0/config.xml.dist index 3ee8f8a27..91456daf5 100644 --- a/etc/ce-to-ee/1.8.0.0/config.xml.dist +++ b/etc/ce-to-ee/1.8.0.0/config.xml.dist @@ -68,6 +68,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ce-to-ee/1.8.1.0/config.xml.dist b/etc/ce-to-ee/1.8.1.0/config.xml.dist index fe43cf6c6..0311b50ff 100644 --- a/etc/ce-to-ee/1.8.1.0/config.xml.dist +++ b/etc/ce-to-ee/1.8.1.0/config.xml.dist @@ -68,6 +68,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ce-to-ee/1.9.0.0/config.xml.dist b/etc/ce-to-ee/1.9.0.0/config.xml.dist index 0c083f130..b3451aec9 100644 --- a/etc/ce-to-ee/1.9.0.0/config.xml.dist +++ b/etc/ce-to-ee/1.9.0.0/config.xml.dist @@ -68,6 +68,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ce-to-ee/1.9.0.1/config.xml.dist b/etc/ce-to-ee/1.9.0.1/config.xml.dist index c7149e3e5..2681114c7 100644 --- a/etc/ce-to-ee/1.9.0.1/config.xml.dist +++ b/etc/ce-to-ee/1.9.0.1/config.xml.dist @@ -68,6 +68,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ce-to-ee/1.9.1.0/config.xml.dist b/etc/ce-to-ee/1.9.1.0/config.xml.dist index c57dd16b8..373313d71 100644 --- a/etc/ce-to-ee/1.9.1.0/config.xml.dist +++ b/etc/ce-to-ee/1.9.1.0/config.xml.dist @@ -68,6 +68,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ce-to-ee/1.9.1.1/config.xml.dist b/etc/ce-to-ee/1.9.1.1/config.xml.dist index 77e1c5984..2a2295547 100644 --- a/etc/ce-to-ee/1.9.1.1/config.xml.dist +++ b/etc/ce-to-ee/1.9.1.1/config.xml.dist @@ -68,6 +68,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ce-to-ee/1.9.2.0/config.xml.dist b/etc/ce-to-ee/1.9.2.0/config.xml.dist index a1996c1ba..8c1b842a1 100644 --- a/etc/ce-to-ee/1.9.2.0/config.xml.dist +++ b/etc/ce-to-ee/1.9.2.0/config.xml.dist @@ -68,6 +68,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ce-to-ee/1.9.2.1/config.xml.dist b/etc/ce-to-ee/1.9.2.1/config.xml.dist index 474a1698d..09b8e5a84 100644 --- a/etc/ce-to-ee/1.9.2.1/config.xml.dist +++ b/etc/ce-to-ee/1.9.2.1/config.xml.dist @@ -68,6 +68,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ce-to-ee/1.9.2.2/config.xml.dist b/etc/ce-to-ee/1.9.2.2/config.xml.dist index 7dab57557..08b8870d3 100644 --- a/etc/ce-to-ee/1.9.2.2/config.xml.dist +++ b/etc/ce-to-ee/1.9.2.2/config.xml.dist @@ -68,6 +68,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ce-to-ee/1.9.2.3/config.xml.dist b/etc/ce-to-ee/1.9.2.3/config.xml.dist index 1d22ef870..cf375ae3e 100644 --- a/etc/ce-to-ee/1.9.2.3/config.xml.dist +++ b/etc/ce-to-ee/1.9.2.3/config.xml.dist @@ -68,6 +68,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ce-to-ee/1.9.2.4/config.xml.dist b/etc/ce-to-ee/1.9.2.4/config.xml.dist index e89543a8b..985ddb3e8 100644 --- a/etc/ce-to-ee/1.9.2.4/config.xml.dist +++ b/etc/ce-to-ee/1.9.2.4/config.xml.dist @@ -68,6 +68,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ee-to-ee/1.11.0.0/config.xml.dist b/etc/ee-to-ee/1.11.0.0/config.xml.dist index a01dfc118..0cc317337 100644 --- a/etc/ee-to-ee/1.11.0.0/config.xml.dist +++ b/etc/ee-to-ee/1.11.0.0/config.xml.dist @@ -68,11 +68,20 @@ Migration\Step\OrderGridsEE\Data Migration\Step\OrderGridsEE\Volume + + Migration\Step\TierPrice\Integrity + Migration\Step\TierPrice\Data + Migration\Step\TierPrice\Volume + Migration\Step\SalesIncrement\Integrity Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ee-to-ee/1.11.0.1/config.xml.dist b/etc/ee-to-ee/1.11.0.1/config.xml.dist index ccd04e19e..82e62db38 100644 --- a/etc/ee-to-ee/1.11.0.1/config.xml.dist +++ b/etc/ee-to-ee/1.11.0.1/config.xml.dist @@ -68,11 +68,20 @@ Migration\Step\OrderGridsEE\Data Migration\Step\OrderGridsEE\Volume + + Migration\Step\TierPrice\Integrity + Migration\Step\TierPrice\Data + Migration\Step\TierPrice\Volume + Migration\Step\SalesIncrement\Integrity Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ee-to-ee/1.11.0.2/config.xml.dist b/etc/ee-to-ee/1.11.0.2/config.xml.dist index 093c4801d..f17fac170 100644 --- a/etc/ee-to-ee/1.11.0.2/config.xml.dist +++ b/etc/ee-to-ee/1.11.0.2/config.xml.dist @@ -68,11 +68,20 @@ Migration\Step\OrderGridsEE\Data Migration\Step\OrderGridsEE\Volume + + Migration\Step\TierPrice\Integrity + Migration\Step\TierPrice\Data + Migration\Step\TierPrice\Volume + Migration\Step\SalesIncrement\Integrity Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ee-to-ee/1.11.1.0/config.xml.dist b/etc/ee-to-ee/1.11.1.0/config.xml.dist index 24c655864..0b383091b 100644 --- a/etc/ee-to-ee/1.11.1.0/config.xml.dist +++ b/etc/ee-to-ee/1.11.1.0/config.xml.dist @@ -68,11 +68,20 @@ Migration\Step\OrderGridsEE\Data Migration\Step\OrderGridsEE\Volume + + Migration\Step\TierPrice\Integrity + Migration\Step\TierPrice\Data + Migration\Step\TierPrice\Volume + Migration\Step\SalesIncrement\Integrity Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ee-to-ee/1.11.2.0/config.xml.dist b/etc/ee-to-ee/1.11.2.0/config.xml.dist index 4120d126d..16446c7c8 100644 --- a/etc/ee-to-ee/1.11.2.0/config.xml.dist +++ b/etc/ee-to-ee/1.11.2.0/config.xml.dist @@ -68,11 +68,20 @@ Migration\Step\OrderGridsEE\Data Migration\Step\OrderGridsEE\Volume + + Migration\Step\TierPrice\Integrity + Migration\Step\TierPrice\Data + Migration\Step\TierPrice\Volume + Migration\Step\SalesIncrement\Integrity Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ee-to-ee/1.12.0.0/config.xml.dist b/etc/ee-to-ee/1.12.0.0/config.xml.dist index da56b23bc..959d2d35b 100644 --- a/etc/ee-to-ee/1.12.0.0/config.xml.dist +++ b/etc/ee-to-ee/1.12.0.0/config.xml.dist @@ -78,6 +78,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ee-to-ee/1.12.0.1/config.xml.dist b/etc/ee-to-ee/1.12.0.1/config.xml.dist index 3d5614dc2..4968b21dd 100644 --- a/etc/ee-to-ee/1.12.0.1/config.xml.dist +++ b/etc/ee-to-ee/1.12.0.1/config.xml.dist @@ -78,6 +78,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ee-to-ee/1.12.0.2/config.xml.dist b/etc/ee-to-ee/1.12.0.2/config.xml.dist index bef152838..5b98696cb 100644 --- a/etc/ee-to-ee/1.12.0.2/config.xml.dist +++ b/etc/ee-to-ee/1.12.0.2/config.xml.dist @@ -78,6 +78,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ee-to-ee/1.13.0.0/config.xml.dist b/etc/ee-to-ee/1.13.0.0/config.xml.dist index 89ce4d419..a54a0984f 100644 --- a/etc/ee-to-ee/1.13.0.0/config.xml.dist +++ b/etc/ee-to-ee/1.13.0.0/config.xml.dist @@ -78,6 +78,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ee-to-ee/1.13.0.1/config.xml.dist b/etc/ee-to-ee/1.13.0.1/config.xml.dist index 84150a9a1..e434aba49 100644 --- a/etc/ee-to-ee/1.13.0.1/config.xml.dist +++ b/etc/ee-to-ee/1.13.0.1/config.xml.dist @@ -78,6 +78,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ee-to-ee/1.13.0.2/config.xml.dist b/etc/ee-to-ee/1.13.0.2/config.xml.dist index 578d637f8..78b935dbe 100644 --- a/etc/ee-to-ee/1.13.0.2/config.xml.dist +++ b/etc/ee-to-ee/1.13.0.2/config.xml.dist @@ -78,6 +78,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ee-to-ee/1.13.1.0/config.xml.dist b/etc/ee-to-ee/1.13.1.0/config.xml.dist index e61c5f3af..0c24f4488 100644 --- a/etc/ee-to-ee/1.13.1.0/config.xml.dist +++ b/etc/ee-to-ee/1.13.1.0/config.xml.dist @@ -78,6 +78,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ee-to-ee/1.14.0.0/config.xml.dist b/etc/ee-to-ee/1.14.0.0/config.xml.dist index 5cac2085c..6b3c62182 100644 --- a/etc/ee-to-ee/1.14.0.0/config.xml.dist +++ b/etc/ee-to-ee/1.14.0.0/config.xml.dist @@ -78,6 +78,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ee-to-ee/1.14.0.1/config.xml.dist b/etc/ee-to-ee/1.14.0.1/config.xml.dist index 14d3f7030..ed7e52c7a 100644 --- a/etc/ee-to-ee/1.14.0.1/config.xml.dist +++ b/etc/ee-to-ee/1.14.0.1/config.xml.dist @@ -78,6 +78,10 @@ Migration\Step\SalesIncrement\Data Migration\Step\SalesIncrement\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ee-to-ee/1.14.1.0/config.xml.dist b/etc/ee-to-ee/1.14.1.0/config.xml.dist index fe13a7b79..03d946856 100644 --- a/etc/ee-to-ee/1.14.1.0/config.xml.dist +++ b/etc/ee-to-ee/1.14.1.0/config.xml.dist @@ -83,6 +83,10 @@ Migration\Step\VisualMerchandiser\Data Migration\Step\VisualMerchandiser\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ee-to-ee/1.14.2.0/config.xml.dist b/etc/ee-to-ee/1.14.2.0/config.xml.dist index a463a76b5..cc4ee3643 100644 --- a/etc/ee-to-ee/1.14.2.0/config.xml.dist +++ b/etc/ee-to-ee/1.14.2.0/config.xml.dist @@ -83,6 +83,10 @@ Migration\Step\VisualMerchandiser\Data Migration\Step\VisualMerchandiser\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ee-to-ee/1.14.2.1/config.xml.dist b/etc/ee-to-ee/1.14.2.1/config.xml.dist index 85f0f2785..4d3cd12a0 100644 --- a/etc/ee-to-ee/1.14.2.1/config.xml.dist +++ b/etc/ee-to-ee/1.14.2.1/config.xml.dist @@ -83,6 +83,10 @@ Migration\Step\VisualMerchandiser\Data Migration\Step\VisualMerchandiser\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ee-to-ee/1.14.2.2/config.xml.dist b/etc/ee-to-ee/1.14.2.2/config.xml.dist index 3832f0c7c..192f446f8 100644 --- a/etc/ee-to-ee/1.14.2.2/config.xml.dist +++ b/etc/ee-to-ee/1.14.2.2/config.xml.dist @@ -83,6 +83,10 @@ Migration\Step\VisualMerchandiser\Data Migration\Step\VisualMerchandiser\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ee-to-ee/1.14.2.3/config.xml.dist b/etc/ee-to-ee/1.14.2.3/config.xml.dist index 56b4648fc..6079293fc 100644 --- a/etc/ee-to-ee/1.14.2.3/config.xml.dist +++ b/etc/ee-to-ee/1.14.2.3/config.xml.dist @@ -83,6 +83,10 @@ Migration\Step\VisualMerchandiser\Data Migration\Step\VisualMerchandiser\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/etc/ee-to-ee/1.14.2.4/config.xml.dist b/etc/ee-to-ee/1.14.2.4/config.xml.dist index dbe21314f..bee2854c3 100644 --- a/etc/ee-to-ee/1.14.2.4/config.xml.dist +++ b/etc/ee-to-ee/1.14.2.4/config.xml.dist @@ -83,6 +83,10 @@ Migration\Step\VisualMerchandiser\Data Migration\Step\VisualMerchandiser\Volume + + Migration\Step\PostProcessing\Integrity + Migration\Step\PostProcessing\Data + diff --git a/src/Migration/Step/Eav/Volume.php b/src/Migration/Step/Eav/Volume.php index 015ef0892..e889a7c8f 100644 --- a/src/Migration/Step/Eav/Volume.php +++ b/src/Migration/Step/Eav/Volume.php @@ -128,11 +128,7 @@ protected function validateCatalogEavAttributes() { foreach ($this->helper->getDestinationRecords('catalog_eav_attribute') as $attribute) { foreach (['frontend_input_renderer'] as $field) { - if ($attribute[$field] !== null - // @Todo: remove this after MAGETWO-51403 completion - && $attribute[$field] != 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\BaseImage' - && !class_exists($attribute[$field] - )) { + if ($attribute[$field] !== null && !class_exists($attribute[$field])) { $this->errors[] = 'Incorrect value: '. $attribute[$field] . ' in: catalog_eav_attribute.' . $field . ' for attribute_id=' . $attribute['attribute_id']; diff --git a/src/Migration/Step/PostProcessing/Data.php b/src/Migration/Step/PostProcessing/Data.php new file mode 100644 index 000000000..9384767bb --- /dev/null +++ b/src/Migration/Step/PostProcessing/Data.php @@ -0,0 +1,128 @@ +source = $source; + $this->destination = $destination; + $this->progress = $progress; + $this->logger = $logger; + $this->helper = $helper; + $this->readerAttributes = $groupsFactory->create('eav_attribute_groups_file'); + } + + /** + * @return bool + */ + public function perform() + { + $this->progress->start($this->getIterationsCount(), LogManager::LOG_LEVEL_INFO); + $this->deleteIgnoredProductAttributeValues(); + $this->progress->finish(LogManager::LOG_LEVEL_INFO); + return true; + } + + /** + * Delete leftovers of ignored product attributes in eav value tables + * + * @return void + */ + protected function deleteIgnoredProductAttributeValues() + { + $attributeIds = $this->getIgnoredProductAttributeIds(); + if (!$attributeIds) { + return ; + } + foreach ($this->helper->getProductDestinationDocumentFields() as $document => $fields) { + $this->progress->advance(LogManager::LOG_LEVEL_INFO); + $this->destination->deleteRecords($document, 'attribute_id', $attributeIds); + } + } + + /** + * @return array + */ + protected function getIgnoredProductAttributeIds() + { + $attributeCodes = array_keys($this->readerAttributes->getGroup('ignore')); + /** @var \Migration\ResourceModel\Adapter\Mysql $adapter */ + $adapter = $this->source->getAdapter(); + $select = $adapter->getSelect()->from( + ['ea' => $this->helper->getEavAttributeDocument()], + ['attribute_id'] + )->where('ea.attribute_code IN (?)', $attributeCodes + )->where('ea.entity_type_id = 4'); + return $select->getAdapter()->fetchCol($select); + } + + /** + * @return int + */ + protected function getIterationsCount() + { + return count(array_keys($this->helper->getProductDestinationDocumentFields())); + } +} diff --git a/src/Migration/Step/PostProcessing/Helper.php b/src/Migration/Step/PostProcessing/Helper.php new file mode 100644 index 000000000..65066b650 --- /dev/null +++ b/src/Migration/Step/PostProcessing/Helper.php @@ -0,0 +1,113 @@ +editionMigrate = $config->getOption('edition_migrate'); + $this->destination = $destination; + $this->map = $mapFactory->create('map_file'); + } + + /** + * @return array + */ + public function getProductDestinationDocumentFields() + { + $entityIdName = (empty($this->editionMigrate) || $this->editionMigrate == Config::EDITION_MIGRATE_CE_TO_CE) + ? 'entity_id' + : 'row_id'; + return [ + $this->getDestinationDocumentName('catalog_product_entity_datetime') => [ + 'value_id', + 'attribute_id', + 'store_id', + $entityIdName, + 'value', + ], + $this->getDestinationDocumentName('catalog_product_entity_decimal') => [ + 'value_id', + 'attribute_id', + 'store_id', + $entityIdName, + 'value', + ], + $this->getDestinationDocumentName('catalog_product_entity_int') => [ + 'value_id', + 'attribute_id', + 'store_id', + $entityIdName, + 'value', + ], + $this->getDestinationDocumentName('catalog_product_entity_text') => [ + 'value_id', + 'attribute_id', + 'store_id', + $entityIdName, + 'value', + ], + $this->getDestinationDocumentName('catalog_product_entity_varchar') => [ + 'value_id', + 'attribute_id', + 'store_id', + $entityIdName, + 'value', + ], + ]; + } + + /** + * @return string + */ + public function getEavAttributeDocument() + { + return $this->getDestinationDocumentName('eav_attribute'); + } + + /** + * @param string $document + * @return string + */ + public function getDestinationDocumentName($document) + { + return $this->destination->addDocumentPrefix($document); + } + +} diff --git a/src/Migration/Step/PostProcessing/Integrity.php b/src/Migration/Step/PostProcessing/Integrity.php new file mode 100644 index 000000000..c486e9d33 --- /dev/null +++ b/src/Migration/Step/PostProcessing/Integrity.php @@ -0,0 +1,112 @@ +helper = $helper; + $this->logger = $logger; + $this->progress = $progress; + $this->source = $source; + $this->destination = $destination; + } + + /** + * {@inheritdoc} + */ + public function perform() + { + $this->progress->start($this->getIterationsCount()); + $this->checkFields($this->helper->getProductDestinationDocumentFields(), MapInterface::TYPE_DEST); + $this->progress->finish(); + return $this->checkForErrors(); + } + + /** + * @param array $tableFields + * @param string $sourceType + * @return void + */ + protected function checkFields($tableFields, $sourceType) + { + foreach ($tableFields as $documentName => $fieldsData) { + $resource = $this->getResourceModel($sourceType); + $document = $resource->getDocument($documentName); + $structure = array_keys($document->getStructure()->getFields()); + + $fieldsDiff = array_diff($fieldsData, $structure); + if (!empty($fieldsDiff)) { + $this->missingDocumentFields[$sourceType][$documentName] = $fieldsDiff; + } + $this->progress->advance(); + } + } + + /** + * @param string $sourceType + * @return ResourceModel\Destination|ResourceModel\Source + */ + protected function getResourceModel($sourceType) + { + $map = [ + MapInterface::TYPE_SOURCE => $this->source, + MapInterface::TYPE_DEST => $this->destination, + ]; + return $map[$sourceType]; + } + + protected function getIterationsCount() + { + return count(array_keys($this->helper->getProductDestinationDocumentFields())); + } +} From 1d5cf91722308869d2bf8d73cd5f3a74e7f40e7e Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Sun, 15 May 2016 16:48:35 +0300 Subject: [PATCH 17/71] MAGETWO-52053: Cannot open an product in admin panel --- src/Migration/Handler/EavAttributeGroup/SetGroupCode.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Migration/Handler/EavAttributeGroup/SetGroupCode.php b/src/Migration/Handler/EavAttributeGroup/SetGroupCode.php index cb2764b2e..d48940cd1 100644 --- a/src/Migration/Handler/EavAttributeGroup/SetGroupCode.php +++ b/src/Migration/Handler/EavAttributeGroup/SetGroupCode.php @@ -62,6 +62,7 @@ public function handle(Record $recordToHandle, Record $oppositeRecord) $newValue = preg_replace('/[^a-z0-9]+/', '-', strtolower($recordToHandle->getValue('attribute_group_name'))); $newValue = ($newValue == 'migration-general') ? 'product-details' : $newValue; + $newValue = ($newValue == 'migration-prices') ? 'advanced-pricing' : $newValue; $recordToHandle->setValue($this->field, $newValue); } From 67e6b5ed87c154d0d83713b125f9086a7d1ce7fb Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Sun, 22 May 2016 15:27:26 +0300 Subject: [PATCH 18/71] MAGETWO-52847: Error on Map step during transferring data --- etc/ce-to-ce/1.6.0.0/map.xml.dist | 3 +++ etc/ce-to-ce/1.6.1.0/map.xml.dist | 3 +++ etc/ce-to-ce/1.6.2.0/map.xml.dist | 3 +++ etc/ce-to-ce/1.7.0.0/map.xml.dist | 3 +++ etc/ce-to-ce/1.7.0.1/map.xml.dist | 3 +++ etc/ce-to-ce/1.7.0.2/map.xml.dist | 3 +++ etc/ce-to-ce/1.8.0.0/map.xml.dist | 3 +++ etc/ce-to-ce/1.8.1.0/map.xml.dist | 3 +++ etc/ce-to-ce/1.9.0.0/map.xml.dist | 3 +++ etc/ce-to-ce/1.9.0.1/map.xml.dist | 3 +++ etc/ce-to-ce/1.9.1.0/map.xml.dist | 3 +++ etc/ce-to-ce/1.9.1.1/map.xml.dist | 3 +++ etc/ce-to-ce/1.9.2.0/map.xml.dist | 3 +++ etc/ce-to-ce/1.9.2.1/map.xml.dist | 3 +++ etc/ce-to-ce/1.9.2.2/map.xml.dist | 3 +++ etc/ce-to-ce/1.9.2.3/map.xml.dist | 3 +++ etc/ce-to-ce/1.9.2.4/map.xml.dist | 3 +++ etc/ce-to-ee/1.6.0.0/map.xml.dist | 3 +++ etc/ce-to-ee/1.6.1.0/map.xml.dist | 3 +++ etc/ce-to-ee/1.6.2.0/map.xml.dist | 3 +++ etc/ce-to-ee/1.7.0.0/map.xml.dist | 3 +++ etc/ce-to-ee/1.7.0.1/map.xml.dist | 3 +++ etc/ce-to-ee/1.7.0.2/map.xml.dist | 3 +++ etc/ce-to-ee/1.8.0.0/map.xml.dist | 3 +++ etc/ce-to-ee/1.8.1.0/map.xml.dist | 3 +++ etc/ce-to-ee/1.9.0.0/map.xml.dist | 3 +++ etc/ce-to-ee/1.9.0.1/map.xml.dist | 3 +++ etc/ce-to-ee/1.9.1.0/map.xml.dist | 3 +++ etc/ce-to-ee/1.9.1.1/map.xml.dist | 3 +++ etc/ce-to-ee/1.9.2.0/map.xml.dist | 3 +++ etc/ce-to-ee/1.9.2.1/map.xml.dist | 3 +++ etc/ce-to-ee/1.9.2.2/map.xml.dist | 3 +++ etc/ce-to-ee/1.9.2.3/map.xml.dist | 3 +++ etc/ce-to-ee/1.9.2.4/map.xml.dist | 3 +++ etc/ee-to-ee/1.11.0.0/map.xml.dist | 3 +++ etc/ee-to-ee/1.11.0.1/map.xml.dist | 3 +++ etc/ee-to-ee/1.11.0.2/map.xml.dist | 3 +++ etc/ee-to-ee/1.11.1.0/map.xml.dist | 3 +++ etc/ee-to-ee/1.11.2.0/map.xml.dist | 3 +++ etc/ee-to-ee/1.12.0.0/map.xml.dist | 3 +++ etc/ee-to-ee/1.12.0.1/map.xml.dist | 3 +++ etc/ee-to-ee/1.12.0.2/map.xml.dist | 3 +++ etc/ee-to-ee/1.13.0.0/map.xml.dist | 3 +++ etc/ee-to-ee/1.13.0.1/map.xml.dist | 3 +++ etc/ee-to-ee/1.13.0.2/map.xml.dist | 3 +++ etc/ee-to-ee/1.13.1.0/map.xml.dist | 3 +++ etc/ee-to-ee/1.14.0.0/map.xml.dist | 3 +++ etc/ee-to-ee/1.14.0.1/map.xml.dist | 3 +++ etc/ee-to-ee/1.14.1.0/map.xml.dist | 3 +++ etc/ee-to-ee/1.14.2.0/map.xml.dist | 3 +++ etc/ee-to-ee/1.14.2.1/map.xml.dist | 3 +++ etc/ee-to-ee/1.14.2.2/map.xml.dist | 3 +++ etc/ee-to-ee/1.14.2.3/map.xml.dist | 3 +++ etc/ee-to-ee/1.14.2.4/map.xml.dist | 3 +++ .../Handler/Gallery/InsertValueToEntity.php | 16 ++++++++++++++-- 55 files changed, 176 insertions(+), 2 deletions(-) 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 index 5a7cb4482..0ca3ae33c 100644 --- a/etc/ce-to-ce/1.6.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.0.0/map.xml.dist @@ -1696,6 +1696,9 @@ catalog_category_product.entity_id + + cms_page.meta_title + quote_payment.cc_exp_month 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 index 5a0e6ecb5..2ed911e7c 100644 --- a/etc/ce-to-ce/1.6.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.1.0/map.xml.dist @@ -1714,6 +1714,9 @@ catalog_category_product.entity_id + + cms_page.meta_title + quote_payment.cc_exp_month 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 index e7803c04c..5002bd211 100644 --- a/etc/ce-to-ce/1.6.2.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.2.0/map.xml.dist @@ -1711,6 +1711,9 @@ catalog_category_product.entity_id + + cms_page.meta_title + quote_payment.cc_exp_month 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 index 6c58ca70d..6170ed702 100644 --- a/etc/ce-to-ce/1.7.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.0/map.xml.dist @@ -1563,6 +1563,9 @@ catalog_category_product.entity_id + + cms_page.meta_title + quote_payment.cc_exp_month 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 index 6c58ca70d..6170ed702 100644 --- a/etc/ce-to-ce/1.7.0.1/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.1/map.xml.dist @@ -1563,6 +1563,9 @@ catalog_category_product.entity_id + + cms_page.meta_title + quote_payment.cc_exp_month 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 index 6c58ca70d..6170ed702 100644 --- a/etc/ce-to-ce/1.7.0.2/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.2/map.xml.dist @@ -1563,6 +1563,9 @@ catalog_category_product.entity_id + + cms_page.meta_title + quote_payment.cc_exp_month 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 index acd27e87d..7d4cf4ff7 100644 --- a/etc/ce-to-ce/1.8.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.8.0.0/map.xml.dist @@ -1541,6 +1541,9 @@ catalog_category_product.entity_id + + cms_page.meta_title + quote_payment.cc_exp_month 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 index 7db571487..e753385cb 100644 --- a/etc/ce-to-ce/1.8.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.8.1.0/map.xml.dist @@ -1538,6 +1538,9 @@ catalog_category_product.entity_id + + cms_page.meta_title + quote_payment.cc_exp_month 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 index 0403f5115..1f0982d3a 100644 --- a/etc/ce-to-ce/1.9.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.0.0/map.xml.dist @@ -1547,6 +1547,9 @@ catalog_category_product.entity_id + + cms_page.meta_title + quote_payment.cc_exp_month 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 index 0403f5115..1f0982d3a 100644 --- a/etc/ce-to-ce/1.9.0.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.0.1/map.xml.dist @@ -1547,6 +1547,9 @@ catalog_category_product.entity_id + + cms_page.meta_title + quote_payment.cc_exp_month 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 index ca5c95445..4689688e6 100644 --- a/etc/ce-to-ce/1.9.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.1.0/map.xml.dist @@ -1529,6 +1529,9 @@ catalog_category_product.entity_id + + cms_page.meta_title + quote_payment.cc_exp_month 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 index ca5c95445..4689688e6 100644 --- a/etc/ce-to-ce/1.9.1.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.1.1/map.xml.dist @@ -1529,6 +1529,9 @@ catalog_category_product.entity_id + + cms_page.meta_title + quote_payment.cc_exp_month 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 index 52f04f3d3..82ff1f131 100644 --- a/etc/ce-to-ce/1.9.2.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.0/map.xml.dist @@ -1543,6 +1543,9 @@ catalog_category_product.entity_id + + cms_page.meta_title + quote_payment.cc_exp_month 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 index 52f04f3d3..82ff1f131 100644 --- a/etc/ce-to-ce/1.9.2.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.1/map.xml.dist @@ -1543,6 +1543,9 @@ catalog_category_product.entity_id + + cms_page.meta_title + quote_payment.cc_exp_month diff --git a/etc/ce-to-ce/1.9.2.2/map.xml.dist b/etc/ce-to-ce/1.9.2.2/map.xml.dist index c729e63f4..64a72ab26 100644 --- a/etc/ce-to-ce/1.9.2.2/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.2/map.xml.dist @@ -1549,6 +1549,9 @@ catalog_category_product.entity_id + + cms_page.meta_title + quote_payment.cc_exp_month diff --git a/etc/ce-to-ce/1.9.2.3/map.xml.dist b/etc/ce-to-ce/1.9.2.3/map.xml.dist index c729e63f4..64a72ab26 100644 --- a/etc/ce-to-ce/1.9.2.3/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.3/map.xml.dist @@ -1549,6 +1549,9 @@ catalog_category_product.entity_id + + cms_page.meta_title + quote_payment.cc_exp_month diff --git a/etc/ce-to-ce/1.9.2.4/map.xml.dist b/etc/ce-to-ce/1.9.2.4/map.xml.dist index c729e63f4..64a72ab26 100644 --- a/etc/ce-to-ce/1.9.2.4/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.4/map.xml.dist @@ -1549,6 +1549,9 @@ catalog_category_product.entity_id + + cms_page.meta_title + quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.6.0.0/map.xml.dist b/etc/ce-to-ee/1.6.0.0/map.xml.dist index cc9aeabf0..557be9bff 100644 --- a/etc/ce-to-ee/1.6.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.6.0.0/map.xml.dist @@ -2881,6 +2881,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.6.1.0/map.xml.dist b/etc/ce-to-ee/1.6.1.0/map.xml.dist index b9c9be3b1..e341d78b7 100644 --- a/etc/ce-to-ee/1.6.1.0/map.xml.dist +++ b/etc/ce-to-ee/1.6.1.0/map.xml.dist @@ -2908,6 +2908,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.6.2.0/map.xml.dist b/etc/ce-to-ee/1.6.2.0/map.xml.dist index 6babdcfff..c346bcdb0 100644 --- a/etc/ce-to-ee/1.6.2.0/map.xml.dist +++ b/etc/ce-to-ee/1.6.2.0/map.xml.dist @@ -2905,6 +2905,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.7.0.0/map.xml.dist b/etc/ce-to-ee/1.7.0.0/map.xml.dist index 483fd3938..13272d5e1 100644 --- a/etc/ce-to-ee/1.7.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.7.0.0/map.xml.dist @@ -2712,6 +2712,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.7.0.1/map.xml.dist b/etc/ce-to-ee/1.7.0.1/map.xml.dist index 483fd3938..13272d5e1 100644 --- a/etc/ce-to-ee/1.7.0.1/map.xml.dist +++ b/etc/ce-to-ee/1.7.0.1/map.xml.dist @@ -2712,6 +2712,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.7.0.2/map.xml.dist b/etc/ce-to-ee/1.7.0.2/map.xml.dist index 483fd3938..13272d5e1 100644 --- a/etc/ce-to-ee/1.7.0.2/map.xml.dist +++ b/etc/ce-to-ee/1.7.0.2/map.xml.dist @@ -2712,6 +2712,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.8.0.0/map.xml.dist b/etc/ce-to-ee/1.8.0.0/map.xml.dist index 5a4d9a414..0dd5ab4e5 100644 --- a/etc/ce-to-ee/1.8.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.8.0.0/map.xml.dist @@ -2690,6 +2690,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.8.1.0/map.xml.dist b/etc/ce-to-ee/1.8.1.0/map.xml.dist index 9cf26326f..8a2b5b21e 100644 --- a/etc/ce-to-ee/1.8.1.0/map.xml.dist +++ b/etc/ce-to-ee/1.8.1.0/map.xml.dist @@ -2687,6 +2687,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.9.0.0/map.xml.dist b/etc/ce-to-ee/1.9.0.0/map.xml.dist index 84f2addce..dba0b6b00 100644 --- a/etc/ce-to-ee/1.9.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.9.0.0/map.xml.dist @@ -2690,6 +2690,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.9.0.1/map.xml.dist b/etc/ce-to-ee/1.9.0.1/map.xml.dist index 5a4d9a414..0dd5ab4e5 100644 --- a/etc/ce-to-ee/1.9.0.1/map.xml.dist +++ b/etc/ce-to-ee/1.9.0.1/map.xml.dist @@ -2690,6 +2690,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.9.1.0/map.xml.dist b/etc/ce-to-ee/1.9.1.0/map.xml.dist index e6bad7a41..52176d5fb 100644 --- a/etc/ce-to-ee/1.9.1.0/map.xml.dist +++ b/etc/ce-to-ee/1.9.1.0/map.xml.dist @@ -2672,6 +2672,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.9.1.1/map.xml.dist b/etc/ce-to-ee/1.9.1.1/map.xml.dist index e6bad7a41..52176d5fb 100644 --- a/etc/ce-to-ee/1.9.1.1/map.xml.dist +++ b/etc/ce-to-ee/1.9.1.1/map.xml.dist @@ -2672,6 +2672,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.9.2.0/map.xml.dist b/etc/ce-to-ee/1.9.2.0/map.xml.dist index 2f305ea1c..47aa52840 100644 --- a/etc/ce-to-ee/1.9.2.0/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.0/map.xml.dist @@ -2692,6 +2692,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.9.2.1/map.xml.dist b/etc/ce-to-ee/1.9.2.1/map.xml.dist index 2f305ea1c..47aa52840 100644 --- a/etc/ce-to-ee/1.9.2.1/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.1/map.xml.dist @@ -2692,6 +2692,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.9.2.2/map.xml.dist b/etc/ce-to-ee/1.9.2.2/map.xml.dist index 80c9e0144..0d2423445 100644 --- a/etc/ce-to-ee/1.9.2.2/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.2/map.xml.dist @@ -2698,6 +2698,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.9.2.3/map.xml.dist b/etc/ce-to-ee/1.9.2.3/map.xml.dist index 80c9e0144..0d2423445 100644 --- a/etc/ce-to-ee/1.9.2.3/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.3/map.xml.dist @@ -2698,6 +2698,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.9.2.4/map.xml.dist b/etc/ce-to-ee/1.9.2.4/map.xml.dist index 80c9e0144..0d2423445 100644 --- a/etc/ce-to-ee/1.9.2.4/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.4/map.xml.dist @@ -2698,6 +2698,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month 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 index d6c1e7373..0888c246f 100644 --- a/etc/ee-to-ee/1.11.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.0/map.xml.dist @@ -2591,6 +2591,9 @@ quote_payment.cc_exp_month + + cms_page.meta_title + weee_tax.state 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 index cc33286bf..a2f9a17cf 100644 --- a/etc/ee-to-ee/1.11.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.1/map.xml.dist @@ -2591,6 +2591,9 @@ quote_payment.cc_exp_month + + cms_page.meta_title + weee_tax.state 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 index cc33286bf..a2f9a17cf 100644 --- a/etc/ee-to-ee/1.11.0.2/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.2/map.xml.dist @@ -2591,6 +2591,9 @@ quote_payment.cc_exp_month + + cms_page.meta_title + weee_tax.state 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 index 5c4ee8be8..502e92f6f 100644 --- a/etc/ee-to-ee/1.11.1.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.1.0/map.xml.dist @@ -2564,6 +2564,9 @@ quote_payment.cc_exp_month + + cms_page.meta_title + weee_tax.state 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 index d8dd430e4..d7abdbfe4 100644 --- a/etc/ee-to-ee/1.11.2.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.2.0/map.xml.dist @@ -2561,6 +2561,9 @@ quote_payment.cc_exp_month + + cms_page.meta_title + weee_tax.state 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 index 4370a85de..8be94ff00 100644 --- a/etc/ee-to-ee/1.12.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.0/map.xml.dist @@ -2444,6 +2444,9 @@ salesrule.row_id + + cms_page.meta_title + weee_tax.state 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 index 40365685a..f64eeec42 100644 --- a/etc/ee-to-ee/1.12.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.1/map.xml.dist @@ -2444,6 +2444,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month 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 index 40365685a..f64eeec42 100644 --- a/etc/ee-to-ee/1.12.0.2/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.2/map.xml.dist @@ -2444,6 +2444,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month 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 index 99fd2c288..f9def247b 100644 --- a/etc/ee-to-ee/1.13.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.13.0.0/map.xml.dist @@ -2359,6 +2359,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month 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 index 99fd2c288..f9def247b 100644 --- a/etc/ee-to-ee/1.13.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.13.0.1/map.xml.dist @@ -2359,6 +2359,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month 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 index 99fd2c288..f9def247b 100644 --- a/etc/ee-to-ee/1.13.0.2/map.xml.dist +++ b/etc/ee-to-ee/1.13.0.2/map.xml.dist @@ -2359,6 +2359,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month 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 index f95096dd3..113c354bc 100644 --- a/etc/ee-to-ee/1.13.1.0/map.xml.dist +++ b/etc/ee-to-ee/1.13.1.0/map.xml.dist @@ -2371,6 +2371,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month 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 index 8967b47e9..5979fbb7f 100644 --- a/etc/ee-to-ee/1.14.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.14.0.0/map.xml.dist @@ -2362,6 +2362,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month 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 index 8967b47e9..5979fbb7f 100644 --- a/etc/ee-to-ee/1.14.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.14.0.1/map.xml.dist @@ -2362,6 +2362,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month 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 index 610e55ee8..06b8d8a05 100644 --- a/etc/ee-to-ee/1.14.1.0/map.xml.dist +++ b/etc/ee-to-ee/1.14.1.0/map.xml.dist @@ -2364,6 +2364,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month 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 index 4a9d702e0..e9dda618b 100644 --- a/etc/ee-to-ee/1.14.2.0/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.0/map.xml.dist @@ -2401,6 +2401,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month 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 index 4a9d702e0..e9dda618b 100644 --- a/etc/ee-to-ee/1.14.2.1/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.1/map.xml.dist @@ -2401,6 +2401,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month 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 index dabf0c417..01325a3f4 100644 --- a/etc/ee-to-ee/1.14.2.2/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.2/map.xml.dist @@ -2407,6 +2407,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month 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 index dabf0c417..01325a3f4 100644 --- a/etc/ee-to-ee/1.14.2.3/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.3/map.xml.dist @@ -2407,6 +2407,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month 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 index dabf0c417..01325a3f4 100644 --- a/etc/ee-to-ee/1.14.2.4/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.4/map.xml.dist @@ -2407,6 +2407,9 @@ salesrule.row_id + + cms_page.meta_title + quote_payment.cc_exp_month diff --git a/src/Migration/Handler/Gallery/InsertValueToEntity.php b/src/Migration/Handler/Gallery/InsertValueToEntity.php index 9b72d7734..f6d762606 100644 --- a/src/Migration/Handler/Gallery/InsertValueToEntity.php +++ b/src/Migration/Handler/Gallery/InsertValueToEntity.php @@ -8,6 +8,7 @@ use Migration\Handler\AbstractHandler; use Migration\ResourceModel\Destination; use Migration\ResourceModel\Record; +use Migration\Config; /** * Class InsertValueToEntity @@ -29,13 +30,21 @@ class InsertValueToEntity extends AbstractHandler */ protected $entityField = 'entity_id'; + /** + * @var string + */ + protected $editionMigrate = ''; + /** * @param Destination $destination + * @param Config $config */ public function __construct( - Destination $destination + Destination $destination, + Config $config ) { $this->destination = $destination; + $this->editionMigrate = $config->getOption('edition_migrate'); } /** @@ -44,8 +53,11 @@ public function __construct( public function handle(Record $recordToHandle, Record $oppositeRecord) { $this->validate($recordToHandle); + $entityIdName = (empty($this->editionMigrate) || $this->editionMigrate == Config::EDITION_MIGRATE_CE_TO_CE) + ? $this->entityField + : 'row_id'; $record['value_id'] = $recordToHandle->getValue($this->field); - $record['entity_id'] = $recordToHandle->getValue($this->entityField); + $record[$entityIdName] = $recordToHandle->getValue($this->entityField); $this->destination->saveRecords($this->valueToEntityDocument, [$record]); } } From ccf2a20540641485dce76f5d5bb8a0f87d02ce7c Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Sun, 22 May 2016 15:28:42 +0300 Subject: [PATCH 19/71] MAGETWO-52877: Error on ConfigurablePrices and VisualMerchandiser steps during transferring data --- ...visual_merchandiser_attribute_groups.xml.dist | 2 +- src/Migration/Step/ConfigurablePrices/Data.php | 16 ++++++++++++++-- src/Migration/Step/VisualMerchandiser/Helper.php | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/etc/ee-to-ee/visual_merchandiser_attribute_groups.xml.dist b/etc/ee-to-ee/visual_merchandiser_attribute_groups.xml.dist index f8ffa7550..0cbce079d 100644 --- a/etc/ee-to-ee/visual_merchandiser_attribute_groups.xml.dist +++ b/etc/ee-to-ee/visual_merchandiser_attribute_groups.xml.dist @@ -13,7 +13,7 @@ value_id attribute_id store_id - entity_id + row_id value \ No newline at end of file diff --git a/src/Migration/Step/ConfigurablePrices/Data.php b/src/Migration/Step/ConfigurablePrices/Data.php index eab996dff..801093395 100644 --- a/src/Migration/Step/ConfigurablePrices/Data.php +++ b/src/Migration/Step/ConfigurablePrices/Data.php @@ -13,6 +13,7 @@ use Migration\Logger\Manager as LogManager; use Migration\Logger\Logger; use Migration\ResourceModel\Adapter\Mysql; +use Migration\Config; /** * Class Data @@ -54,6 +55,11 @@ class Data implements StageInterface */ protected $helper; + /** + * @var string + */ + protected $editionMigrate = ''; + /** * @param ProgressBar\LogLevelProcessor $progress * @param ResourceModel\Source $source @@ -61,6 +67,7 @@ class Data implements StageInterface * @param ResourceModel\RecordFactory $recordFactory * @param Logger $logger * @param Helper $helper + * @param Config $config */ public function __construct( ProgressBar\LogLevelProcessor $progress, @@ -68,7 +75,8 @@ public function __construct( ResourceModel\Destination $destination, ResourceModel\RecordFactory $recordFactory, Logger $logger, - \Migration\Step\ConfigurablePrices\Helper $helper + \Migration\Step\ConfigurablePrices\Helper $helper, + Config $config ) { $this->source = $source; $this->sourceAdapter = $this->source->getAdapter(); @@ -77,6 +85,7 @@ public function __construct( $this->recordFactory = $recordFactory; $this->logger = $logger; $this->helper = $helper; + $this->editionMigrate = $config->getOption('edition_migrate'); } /** @@ -145,6 +154,9 @@ protected function getRecords($sourceDocumentName, \Magento\Framework\DB\Select */ protected function getConfigurablePrice() { + $entityIdName = (empty($this->editionMigrate) || $this->editionMigrate == Config::EDITION_MIGRATE_CE_TO_CE) + ? 'entity_id' + : 'row_id'; $priceAttributeId = $this->getPriceAttributeId(); $entitiesExpr = new \Zend_Db_Expr( 'select product_id from ' . $this->source->addDocumentPrefix('catalog_product_super_attribute') @@ -173,7 +185,7 @@ protected function getConfigurablePrice() ->joinInner( ['supl' => $this->source->addDocumentPrefix('catalog_product_super_link')], 'mt.entity_id = supl.parent_id', - ['entity_id' =>'product_id'] + [$entityIdName => 'product_id'] ) ->joinInner( ['pint' => $this->source->addDocumentPrefix('catalog_product_entity_int')], diff --git a/src/Migration/Step/VisualMerchandiser/Helper.php b/src/Migration/Step/VisualMerchandiser/Helper.php index e9a85241f..fec1d95b2 100644 --- a/src/Migration/Step/VisualMerchandiser/Helper.php +++ b/src/Migration/Step/VisualMerchandiser/Helper.php @@ -119,7 +119,7 @@ public function updateAttributeData($recordData) $attributeCodes = array_keys($this->readerAttributes->getGroup($this->entityName)); $sourceData['attribute_id'] = $this->eavAttributes['catalog_category']['automatic_sorting']['attribute_id']; - $sourceData['entity_id'] = $recordData['category_id']; + $sourceData['row_id'] = $recordData['category_id']; $sourceData['store_id'] = self::DEFAULT_STORE_ID; $sourceData['value'] = (array_key_exists($recordData['automatic_sort'], $this->attributeMapping)) ? $this->attributeMapping[$recordData['automatic_sort']] : From 1b310101697b7871e95f8aea9e424719505e037e Mon Sep 17 00:00:00 2001 From: Ruslan Kostiv Date: Tue, 24 May 2016 17:34:47 +0300 Subject: [PATCH 20/71] MAGETWO-52256: Cannot open storefront after migration --- src/Migration/Handler/Sequence.php | 22 ++++++ .../Migration/Handler/SequenceTest.php | 69 +++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 tests/unit/testsuite/Migration/Handler/SequenceTest.php diff --git a/src/Migration/Handler/Sequence.php b/src/Migration/Handler/Sequence.php index 54dcdc59c..346086f17 100644 --- a/src/Migration/Handler/Sequence.php +++ b/src/Migration/Handler/Sequence.php @@ -28,6 +28,26 @@ class Sequence extends AbstractHandler implements HandlerInterface */ protected $sequenceTablesCleaned = []; + /** + * @var string + */ + private $createdVersionField = 'created_in'; + + /** + * @var string + */ + private $updatedVersionField = 'updated_in'; + + /** + * @var int + */ + private $minVersion = 1; + + /** + * @var int + */ + private $maxVersion = 2147483647; + /** * @param string $table */ @@ -51,5 +71,7 @@ public function handle(Record $recordToHandle, Record $oppositeRecord) if ($id && $this->table) { $this->destination->saveRecords($this->table, [['sequence_value' => $id]]); } + $oppositeRecord->setValue($this->createdVersionField, $this->minVersion); + $oppositeRecord->setValue($this->updatedVersionField, $this->maxVersion); } } diff --git a/tests/unit/testsuite/Migration/Handler/SequenceTest.php b/tests/unit/testsuite/Migration/Handler/SequenceTest.php new file mode 100644 index 000000000..c014fef49 --- /dev/null +++ b/tests/unit/testsuite/Migration/Handler/SequenceTest.php @@ -0,0 +1,69 @@ +getMockBuilder('Migration\ResourceModel\Record') + ->setMethods(['getValue', 'setValue', 'getFields']) + ->disableOriginalConstructor() + ->getMock(); + + $record->expects($this->any())->method('getFields')->willReturn([$fieldName]); + $record->expects($this->any())->method('getValue')->with($fieldName)->willReturn($id); + $record->expects($this->any())->method('setValue')->with($fieldName, $id); + + /** @var \Migration\ResourceModel\Record|\PHPUnit_Framework_MockObject_MockObject $record2 */ + $record2 = $this->getMockBuilder('Migration\ResourceModel\Record') + ->setMethods(['setValue']) + ->disableOriginalConstructor() + ->getMock(); + + $record2->expects($this->any())->method('setValue')->willReturn($createdVersionField, $version); + + /** @var \Migration\ResourceModel\Destination|\PHPUnit_Framework_MockObject_MockObject $destination */ + $destination = $this->getMockBuilder('Migration\ResourceModel\Destination') + ->setMethods(['clearDocument', 'saveRecords']) + ->disableOriginalConstructor() + ->getMock(); + + $destination->expects($this->any())->method('clearDocument')->with($table); + $destination->expects($this->any())->method('saveRecords')->with($table, [['sequence_value' => $id]]) + ->willReturnSelf(); + + $handler = new Sequence($table, $destination); + $handler->setField($fieldName); + $handler->handle($record, $record2); + } + + /** + * @return array + */ + public function dataProviderTables() + { + return [ + ['table' => 'tablename', 'id' => 1], + ['table' => '', 'id' => 1], + ['table' => 'tablename', 'id' => 0], + ['table' => '', 'id' => 0], + ]; + } +} From b718f3d3536a25a2eada1650e11ae657dd8e4200 Mon Sep 17 00:00:00 2001 From: Ruslan Kostiv Date: Fri, 27 May 2016 15:22:25 +0300 Subject: [PATCH 21/71] MAGETWO-53391: Cannot open category on srorefront after migration --- etc/ee-to-ee/visual_merchandiser_attribute_groups.xml.dist | 3 --- etc/ee-to-ee/visual_merchandiser_document_groups.xml.dist | 3 --- 2 files changed, 6 deletions(-) diff --git a/etc/ee-to-ee/visual_merchandiser_attribute_groups.xml.dist b/etc/ee-to-ee/visual_merchandiser_attribute_groups.xml.dist index 0cbce079d..7d74631f2 100644 --- a/etc/ee-to-ee/visual_merchandiser_attribute_groups.xml.dist +++ b/etc/ee-to-ee/visual_merchandiser_attribute_groups.xml.dist @@ -6,9 +6,6 @@ */ --> - - automatic_sorting - value_id attribute_id diff --git a/etc/ee-to-ee/visual_merchandiser_document_groups.xml.dist b/etc/ee-to-ee/visual_merchandiser_document_groups.xml.dist index 064397db4..4f6ad0041 100644 --- a/etc/ee-to-ee/visual_merchandiser_document_groups.xml.dist +++ b/etc/ee-to-ee/visual_merchandiser_document_groups.xml.dist @@ -16,7 +16,4 @@ catalog_category_entity catalog_category_entity_varchar - - automatic_sort - \ No newline at end of file From 11e165eebe5b3d5cb984b43128e84fd56faa04e6 Mon Sep 17 00:00:00 2001 From: Yurii Hryhoriev Date: Tue, 31 May 2016 15:40:12 +0300 Subject: [PATCH 22/71] MAGETWO-53392: Cannot open product in admin panel after migration --- .../EavAttributeGroup/SetGroupCode.php | 1 + src/Migration/Step/Eav/Data.php | 180 ++++++++++++++++++ src/Migration/Step/Eav/Helper.php | 15 ++ src/Migration/Step/Eav/InitialData.php | 26 +++ src/Migration/Step/Eav/Volume.php | 5 +- 5 files changed, 226 insertions(+), 1 deletion(-) diff --git a/src/Migration/Handler/EavAttributeGroup/SetGroupCode.php b/src/Migration/Handler/EavAttributeGroup/SetGroupCode.php index d48940cd1..7f5178c90 100644 --- a/src/Migration/Handler/EavAttributeGroup/SetGroupCode.php +++ b/src/Migration/Handler/EavAttributeGroup/SetGroupCode.php @@ -63,6 +63,7 @@ public function handle(Record $recordToHandle, Record $oppositeRecord) $newValue = preg_replace('/[^a-z0-9]+/', '-', strtolower($recordToHandle->getValue('attribute_group_name'))); $newValue = ($newValue == 'migration-general') ? 'product-details' : $newValue; $newValue = ($newValue == 'migration-prices') ? 'advanced-pricing' : $newValue; + $newValue = ($newValue == 'migration-design') ? 'design' : $newValue; $recordToHandle->setValue($this->field, $newValue); } diff --git a/src/Migration/Step/Eav/Data.php b/src/Migration/Step/Eav/Data.php index c9b196ca9..3516ee5f4 100644 --- a/src/Migration/Step/Eav/Data.php +++ b/src/Migration/Step/Eav/Data.php @@ -199,6 +199,9 @@ protected function migrateAttributeSetsAndGroups() $recordsToSave->addRecord($destinationRecord); } } + + $recordsToSave = $this->adjustAttributeSetsAndGroups($recordsToSave, $documentName); + $this->destination->clearDocument($destinationDocument->getName()); $this->saveRecords($destinationDocument, $recordsToSave); if ($documentName == 'eav_attribute_set') { @@ -210,6 +213,57 @@ protected function migrateAttributeSetsAndGroups() } } + /** + * @param Record\Collection $recordsToSave + * @param string $documentName + * @return Record\Collection + */ + protected function adjustAttributeSetsAndGroups($recordsToSave, $documentName) + { + if ('eav_attribute_group' == $documentName) { + $entityTypes = $this->initialData->getEntityTypes('dest'); + $typeIdOfCatalogProduct = array_key_exists('catalog_product', $entityTypes) ? + $entityTypes['catalog_product']['entity_type_id'] : null; + + if ($typeIdOfCatalogProduct) { + $eavAttributeSetRecords = $this->source->getRecords( + 'eav_attribute_set', 0, $this->source->getRecordsCount('eav_attribute_set') + ); + $catalogProductSetIds = []; + foreach ($eavAttributeSetRecords as $record) { + if ($typeIdOfCatalogProduct === $record['entity_type_id']) { + $catalogProductSetIds[] = $record['attribute_set_id']; + } + } + + $addedGroups = []; + $destinationDocument = $this->destination->getDocument( + $this->map->getDocumentMap($documentName, MapInterface::TYPE_SOURCE) + ); + foreach ($catalogProductSetIds as $id) { + $destinationRecord = $this->factory->create( + [ + 'document' => $destinationDocument, + 'data' => [ + 'attribute_group_id' => null, + 'attribute_set_id' => $id, + 'attribute_group_name' => 'Schedule Design Update', + 'sort_order' => '55', + 'default_id' => '0', + 'attribute_group_code' => 'schedule-design-update', + 'tab_group_code' => 'advanced', + ] + ] + ); + $addedGroups[] = $destinationRecord; + $recordsToSave->addRecord($destinationRecord); + } + $this->helper->setAddedGroups($addedGroups); + } + } + return $recordsToSave; + } + /** * Migrate eav_attribute * @return void @@ -302,10 +356,136 @@ protected function migrateEntityAttributes() $destinationRecord = $this->factory->create(['document' => $destinationDocument, 'data' => $record]); $recordsToSave->addRecord($destinationRecord); } + + $recordsToSave = $this->adjustEntityAttributes($recordsToSave); + $this->destination->clearDocument($destinationDocument->getName()); $this->saveRecords($destinationDocument, $recordsToSave); } + /** + * @param Record\Collection $recordsToSave + * @return Record\Collection + * @throws \Migration\Exception + */ + public function adjustEntityAttributes($recordsToSave) + { + $entityTypes = $this->initialData->getEntityTypes('dest'); + $typeIdOfCatalogProduct = array_key_exists('catalog_product', $entityTypes) ? + $entityTypes['catalog_product']['entity_type_id'] : null; + + if (!$typeIdOfCatalogProduct) { + return $recordsToSave; + } + + $catalogProductSetIds = []; + $catalogProductDefaultSetId = null; + $migratedSets = $this->helper->getDestinationRecords('eav_attribute_set'); + foreach ($migratedSets as $record) { + if ($typeIdOfCatalogProduct === $record['entity_type_id']) { + $catalogProductSetIds[] = $record['attribute_set_id']; + if ('Default' == $record['attribute_set_name']) { + $catalogProductDefaultSetId = $record['attribute_set_id']; + } + } + } + + if (!$catalogProductDefaultSetId || !$catalogProductSetIds) { + return $recordsToSave; + } + + $scheduleGroupsMigrated = []; + $migratedGroups = $this->helper->getDestinationRecords('eav_attribute_group'); + foreach ($migratedGroups as $group) { + if ('schedule-design-update' == $group['attribute_group_code'] && + $catalogProductDefaultSetId != $group['attribute_set_id'] + ) { + $scheduleGroupsMigrated[] = $group; + } + } + + $customDesignAttributeId = null; + foreach ($this->helper->getDestinationRecords('eav_attribute') as $record) { + if ('custom_design' == $record['attribute_code'] && + $typeIdOfCatalogProduct == $record['entity_type_id'] + ) { + $customDesignAttributeId = $record['attribute_id']; + break; + } + } + + if (!$customDesignAttributeId) { + return $recordsToSave; + } + + $sourceDocName = 'eav_entity_attribute'; + $destinationDocument = $this->destination->getDocument( + $this->map->getDocumentMap($sourceDocName, MapInterface::TYPE_SOURCE) + ); + $this->destination->backupDocument($destinationDocument->getName()); + $newRecordsToSave = $destinationDocument->getRecords(); + + foreach ($recordsToSave as $v) { + /** @var Record $v */ + if (in_array($v->getValue('attribute_set_id'), $catalogProductSetIds) && + $v->getValue('attribute_id') == $customDesignAttributeId + ) { + $unset[] = $v; + continue; + } + $newRecordsToSave->addRecord($v); + } + + + $customLayoutAttribute = null; + foreach ($this->helper->getDestinationRecords('eav_attribute') as $record) { + if ('custom_layout' == $record['attribute_code'] + ) { + $customLayoutAttribute = $record; + break; + } + } + if (!$customLayoutAttribute) { + return $recordsToSave; + } + + $recordsToSave = $newRecordsToSave; + + $sourceDocument = $this->source->getDocument('eav_entity_attribute'); + foreach ($scheduleGroupsMigrated as $group) { + $param = [ + 'entity_attribute_id' => null, + 'entity_type_id' => $typeIdOfCatalogProduct, + 'attribute_set_id' => $group['attribute_set_id'], + 'attribute_group_id' => $group['attribute_group_id'], + 'attribute_id' => $customDesignAttributeId, + 'sort_order' => 40, + ]; + $destinationRecord = $this->factory->create([ + 'document' => $sourceDocument, + 'data' => $param + ]); + /** Adding custom_design */ + $recordsToSave->addRecord($destinationRecord); + + $param = [ + 'entity_attribute_id' => null, + 'entity_type_id' => $typeIdOfCatalogProduct, + 'attribute_set_id' => $group['attribute_set_id'], + 'attribute_group_id' => $group['attribute_group_id'], + 'attribute_id' => $customLayoutAttribute['attribute_id'], + 'sort_order' => 50, + ]; + $destinationRecord = $this->factory->create([ + 'document' => $sourceDocument, + 'data' => $param + ]); + /** Adding custom_layout */ + $recordsToSave->addRecord($destinationRecord); + } + return $recordsToSave; + } + /** * Migrate EAV tables which in result must have all unique records from both source and destination documents * @return void diff --git a/src/Migration/Step/Eav/Helper.php b/src/Migration/Step/Eav/Helper.php index 52ea23fcb..fa05235d9 100644 --- a/src/Migration/Step/Eav/Helper.php +++ b/src/Migration/Step/Eav/Helper.php @@ -40,6 +40,11 @@ class Helper */ protected $readerGroups; + /** + * @var \Migration\ResourceModel\Record[] + */ + protected $addedGroups ; + /** * @param MapFactory $mapFactory * @param Source $source @@ -157,4 +162,14 @@ public function deleteBackups() } } } + + public function getAddedGroups() + { + return $this->addedGroups; + } + + public function setAddedGroups(array $addedGroups) + { + $this->addedGroups = $addedGroups; + } } diff --git a/src/Migration/Step/Eav/InitialData.php b/src/Migration/Step/Eav/InitialData.php index a0b0a70c3..53c271b56 100644 --- a/src/Migration/Step/Eav/InitialData.php +++ b/src/Migration/Step/Eav/InitialData.php @@ -31,6 +31,11 @@ class InitialData */ protected $attributeGroups; + /** + * @var array; + */ + protected $entityTypes; + /** * @var Source */ @@ -74,6 +79,17 @@ public function init() $this->initAttributeSets(); $this->initAttributeGroups(); $this->initAttributes(); + $this->initEntityTypes(); + } + + protected function initEntityTypes() + { + if ($this->entityTypes === null) { + $destinationRecords = $this->helper->getDestinationRecords('eav_entity_type', ['entity_type_code']); + foreach ($destinationRecords as $id => $record) { + $this->entityTypes['dest'][$id] = $record; + } + } } /** @@ -123,6 +139,16 @@ protected function initAttributeGroups() ); } + /** + * @codeCoverageIgnore + * @param string $type + * @return mixed + */ + public function getEntityTypes($type) + { + return $this->entityTypes[$type]; + } + /** * @codeCoverageIgnoreStart * @param string $type diff --git a/src/Migration/Step/Eav/Volume.php b/src/Migration/Step/Eav/Volume.php index e889a7c8f..f884bffcd 100644 --- a/src/Migration/Step/Eav/Volume.php +++ b/src/Migration/Step/Eav/Volume.php @@ -149,8 +149,11 @@ public function validateAttributeSetsAndGroups() } $sourceRecords = $this->helper->getSourceRecordsCount('eav_attribute_group'); + $addedRecords = count($this->helper->getAddedGroups()); $initialDestRecords = count($this->initialData->getAttributeGroups('dest')); - if ($this->helper->getDestinationRecordsCount('eav_attribute_group') != $sourceRecords + $initialDestRecords) { + if ($this->helper->getDestinationRecordsCount('eav_attribute_group') != + $sourceRecords + $addedRecords + $initialDestRecords + ) { $this->errors[] = 'Mismatch of entities in the document: eav_attribute_group'; } } From 3c59360d1bac7a877231978e0277584b5d7665d7 Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Mon, 6 Jun 2016 09:29:54 +0300 Subject: [PATCH 23/71] MAGETWO-53392: Cannot open product in admin panel after migration --- src/Migration/Step/Eav/Data.php | 195 +++++++-------------- src/Migration/Step/Eav/Helper.php | 61 +++++++ src/Migration/Step/Eav/InitialData.php | 10 +- src/Migration/Step/PostProcessing/Data.php | 2 +- 4 files changed, 135 insertions(+), 133 deletions(-) diff --git a/src/Migration/Step/Eav/Data.php b/src/Migration/Step/Eav/Data.php index 3516ee5f4..ac038fba2 100644 --- a/src/Migration/Step/Eav/Data.php +++ b/src/Migration/Step/Eav/Data.php @@ -26,6 +26,8 @@ */ class Data implements StageInterface, RollbackInterface { + const ENTITY_TYPE_ID_CATALOG_PRODUCT = 4; + /** * @var array; */ @@ -198,9 +200,9 @@ protected function migrateAttributeSetsAndGroups() ); $recordsToSave->addRecord($destinationRecord); } + $recordsToSave = $this->addScheduleDesignToAttributeGroups($recordsToSave, $documentName); } - $recordsToSave = $this->adjustAttributeSetsAndGroups($recordsToSave, $documentName); $this->destination->clearDocument($destinationDocument->getName()); $this->saveRecords($destinationDocument, $recordsToSave); @@ -214,53 +216,47 @@ protected function migrateAttributeSetsAndGroups() } /** + * Add Schedule Design to attribute groups of Magento 1 + * * @param Record\Collection $recordsToSave * @param string $documentName * @return Record\Collection */ - protected function adjustAttributeSetsAndGroups($recordsToSave, $documentName) + protected function addScheduleDesignToAttributeGroups($recordsToSave, $documentName) { - if ('eav_attribute_group' == $documentName) { - $entityTypes = $this->initialData->getEntityTypes('dest'); - $typeIdOfCatalogProduct = array_key_exists('catalog_product', $entityTypes) ? - $entityTypes['catalog_product']['entity_type_id'] : null; - - if ($typeIdOfCatalogProduct) { - $eavAttributeSetRecords = $this->source->getRecords( - 'eav_attribute_set', 0, $this->source->getRecordsCount('eav_attribute_set') - ); - $catalogProductSetIds = []; - foreach ($eavAttributeSetRecords as $record) { - if ($typeIdOfCatalogProduct === $record['entity_type_id']) { - $catalogProductSetIds[] = $record['attribute_set_id']; - } - } - - $addedGroups = []; - $destinationDocument = $this->destination->getDocument( - $this->map->getDocumentMap($documentName, MapInterface::TYPE_SOURCE) - ); - foreach ($catalogProductSetIds as $id) { - $destinationRecord = $this->factory->create( - [ - 'document' => $destinationDocument, - 'data' => [ - 'attribute_group_id' => null, - 'attribute_set_id' => $id, - 'attribute_group_name' => 'Schedule Design Update', - 'sort_order' => '55', - 'default_id' => '0', - 'attribute_group_code' => 'schedule-design-update', - 'tab_group_code' => 'advanced', - ] - ] - ); - $addedGroups[] = $destinationRecord; - $recordsToSave->addRecord($destinationRecord); - } - $this->helper->setAddedGroups($addedGroups); - } + /** @var \Magento\Framework\DB\Select $select */ + $select = $this->source->getAdapter()->getSelect(); + $select->from( + ['eas' => $this->source->addDocumentPrefix('eav_attribute_set')], + ['attribute_set_id'] + )->where( + 'entity_type_id = ?', self::ENTITY_TYPE_ID_CATALOG_PRODUCT + ); + $catalogProductSetIds = $select->getAdapter()->fetchCol($select); + $addedGroups = []; + $destinationDocument = $this->destination->getDocument( + $this->map->getDocumentMap($documentName, MapInterface::TYPE_SOURCE) + ); + foreach ($catalogProductSetIds as $id) { + $destinationRecord = $this->factory->create( + [ + 'document' => $destinationDocument, + 'data' => [ + 'attribute_group_id' => null, + 'attribute_set_id' => $id, + 'attribute_group_name' => 'Schedule Design Update', + 'sort_order' => '55', + 'default_id' => '0', + 'attribute_group_code' => 'schedule-design-update', + 'tab_group_code' => 'advanced', + ] + ] + ); + $addedGroups[] = $destinationRecord; + $recordsToSave->addRecord($destinationRecord); } + $this->helper->setAddedGroups($addedGroups); + return $recordsToSave; } @@ -357,132 +353,69 @@ protected function migrateEntityAttributes() $recordsToSave->addRecord($destinationRecord); } - $recordsToSave = $this->adjustEntityAttributes($recordsToSave); + $recordsToSave = $this->processDesignEntityAttributes($recordsToSave); $this->destination->clearDocument($destinationDocument->getName()); $this->saveRecords($destinationDocument, $recordsToSave); } /** + * Move design attributes to schedule-design-update attribute groups + * * @param Record\Collection $recordsToSave * @return Record\Collection * @throws \Migration\Exception */ - public function adjustEntityAttributes($recordsToSave) + public function processDesignEntityAttributes($recordsToSave) { - $entityTypes = $this->initialData->getEntityTypes('dest'); - $typeIdOfCatalogProduct = array_key_exists('catalog_product', $entityTypes) ? - $entityTypes['catalog_product']['entity_type_id'] : null; - - if (!$typeIdOfCatalogProduct) { - return $recordsToSave; - } - - $catalogProductSetIds = []; - $catalogProductDefaultSetId = null; - $migratedSets = $this->helper->getDestinationRecords('eav_attribute_set'); - foreach ($migratedSets as $record) { - if ($typeIdOfCatalogProduct === $record['entity_type_id']) { - $catalogProductSetIds[] = $record['attribute_set_id']; - if ('Default' == $record['attribute_set_name']) { - $catalogProductDefaultSetId = $record['attribute_set_id']; - } - } - } - - if (!$catalogProductDefaultSetId || !$catalogProductSetIds) { - return $recordsToSave; - } - - $scheduleGroupsMigrated = []; - $migratedGroups = $this->helper->getDestinationRecords('eav_attribute_group'); - foreach ($migratedGroups as $group) { - if ('schedule-design-update' == $group['attribute_group_code'] && - $catalogProductDefaultSetId != $group['attribute_set_id'] - ) { - $scheduleGroupsMigrated[] = $group; - } - } - - $customDesignAttributeId = null; - foreach ($this->helper->getDestinationRecords('eav_attribute') as $record) { - if ('custom_design' == $record['attribute_code'] && - $typeIdOfCatalogProduct == $record['entity_type_id'] - ) { - $customDesignAttributeId = $record['attribute_id']; - break; - } - } - - if (!$customDesignAttributeId) { - return $recordsToSave; - } - - $sourceDocName = 'eav_entity_attribute'; - $destinationDocument = $this->destination->getDocument( - $this->map->getDocumentMap($sourceDocName, MapInterface::TYPE_SOURCE) + $data = $this->helper->getDesignAttributeAndGroupsData(); + $entityAttributeDocument = $this->destination->getDocument( + $this->map->getDocumentMap('eav_entity_attribute', MapInterface::TYPE_SOURCE) ); - $this->destination->backupDocument($destinationDocument->getName()); - $newRecordsToSave = $destinationDocument->getRecords(); - - foreach ($recordsToSave as $v) { - /** @var Record $v */ - if (in_array($v->getValue('attribute_set_id'), $catalogProductSetIds) && - $v->getValue('attribute_id') == $customDesignAttributeId + $recordsToSaveFiltered = $entityAttributeDocument->getRecords(); + foreach ($recordsToSave as $record) { + /** @var Record $record */ + if (in_array($record->getValue('attribute_set_id'), $data['catalogProductSetIds']) && + $record->getValue('attribute_id') == $data['customDesignAttributeId'] ) { - $unset[] = $v; continue; } - $newRecordsToSave->addRecord($v); + $recordsToSaveFiltered->addRecord($record); } + $recordsToSave = $recordsToSaveFiltered; - - $customLayoutAttribute = null; - foreach ($this->helper->getDestinationRecords('eav_attribute') as $record) { - if ('custom_layout' == $record['attribute_code'] - ) { - $customLayoutAttribute = $record; - break; - } - } - if (!$customLayoutAttribute) { - return $recordsToSave; - } - - $recordsToSave = $newRecordsToSave; - - $sourceDocument = $this->source->getDocument('eav_entity_attribute'); - foreach ($scheduleGroupsMigrated as $group) { - $param = [ + foreach ($data['scheduleGroupsMigrated'] as $group) { + $dataRecord = [ 'entity_attribute_id' => null, - 'entity_type_id' => $typeIdOfCatalogProduct, + 'entity_type_id' => $data['entityTypeIdCatalogProduct'], 'attribute_set_id' => $group['attribute_set_id'], 'attribute_group_id' => $group['attribute_group_id'], - 'attribute_id' => $customDesignAttributeId, + 'attribute_id' => $data['customDesignAttributeId'], 'sort_order' => 40, ]; $destinationRecord = $this->factory->create([ - 'document' => $sourceDocument, - 'data' => $param + 'document' => $entityAttributeDocument, + 'data' => $dataRecord ]); /** Adding custom_design */ $recordsToSave->addRecord($destinationRecord); - $param = [ + $dataRecord = [ 'entity_attribute_id' => null, - 'entity_type_id' => $typeIdOfCatalogProduct, + 'entity_type_id' => $data['entityTypeIdCatalogProduct'], 'attribute_set_id' => $group['attribute_set_id'], 'attribute_group_id' => $group['attribute_group_id'], - 'attribute_id' => $customLayoutAttribute['attribute_id'], + 'attribute_id' => $data['customLayoutAttributeId'], 'sort_order' => 50, ]; $destinationRecord = $this->factory->create([ - 'document' => $sourceDocument, - 'data' => $param + 'document' => $entityAttributeDocument, + 'data' => $dataRecord ]); /** Adding custom_layout */ $recordsToSave->addRecord($destinationRecord); } + return $recordsToSave; } diff --git a/src/Migration/Step/Eav/Helper.php b/src/Migration/Step/Eav/Helper.php index fa05235d9..7922a72a8 100644 --- a/src/Migration/Step/Eav/Helper.php +++ b/src/Migration/Step/Eav/Helper.php @@ -163,13 +163,74 @@ public function deleteBackups() } } + /** + * @return \Migration\ResourceModel\Record[] + */ public function getAddedGroups() { return $this->addedGroups; } + /** + * @param array $addedGroups + */ public function setAddedGroups(array $addedGroups) { $this->addedGroups = $addedGroups; } + + /** + * @return array + */ + public function getDesignAttributeAndGroupsData() + { + $catalogProductSetIds = []; + $scheduleGroupsMigrated = []; + $catalogProductDefaultSetId = null; + $entityTypeIdCatalogProduct = null; + $customLayoutAttributeId = null; + $customDesignAttributeId = null; + + foreach ($this->getDestinationRecords('eav_entity_type', ['entity_type_code']) as $id => $record) { + if ($id == 'catalog_product') { + $entityTypeIdCatalogProduct = $record['entity_type_id']; + break; + } + } + foreach ($this->getDestinationRecords('eav_attribute_set') as $record) { + if ($entityTypeIdCatalogProduct === $record['entity_type_id']) { + $catalogProductSetIds[] = $record['attribute_set_id']; + if ('Default' == $record['attribute_set_name']) { + $catalogProductDefaultSetId = $record['attribute_set_id']; + } + } + } + foreach ($this->getDestinationRecords('eav_attribute_group') as $group) { + if ('schedule-design-update' == $group['attribute_group_code'] && + $catalogProductDefaultSetId != $group['attribute_set_id'] + ) { + $scheduleGroupsMigrated[] = $group; + } + } + foreach ($this->getDestinationRecords('eav_attribute') as $record) { + if ($record['entity_type_id'] == $entityTypeIdCatalogProduct) { + switch ($record['attribute_code']) { + case 'custom_layout': + $customLayoutAttributeId = $record['attribute_id']; + break; + case 'custom_design': + $customDesignAttributeId = $record['attribute_id']; + break; + } + } + } + + return [ + 'scheduleGroupsMigrated' => $scheduleGroupsMigrated, + 'catalogProductSetIds' => $catalogProductSetIds, + 'customLayoutAttributeId' => $customLayoutAttributeId, + 'customDesignAttributeId' => $customDesignAttributeId, + 'entityTypeIdCatalogProduct' => $entityTypeIdCatalogProduct + ]; + } } diff --git a/src/Migration/Step/Eav/InitialData.php b/src/Migration/Step/Eav/InitialData.php index 53c271b56..555a89cb6 100644 --- a/src/Migration/Step/Eav/InitialData.php +++ b/src/Migration/Step/Eav/InitialData.php @@ -72,6 +72,7 @@ public function __construct(MapFactory $mapFactory, Source $source, Destination /** * Load EAV data before migration + * * @return void */ public function init() @@ -82,6 +83,11 @@ public function init() $this->initEntityTypes(); } + /** + * Load all entity types + * + * @return void + */ protected function initEntityTypes() { if ($this->entityTypes === null) { @@ -94,6 +100,7 @@ protected function initEntityTypes() /** * Load all attributes from source and destination + * * @return void */ protected function initAttributes() @@ -129,6 +136,7 @@ protected function initAttributeSets() /** * Load attribute group data before migration + * * @return void */ protected function initAttributeGroups() @@ -142,7 +150,7 @@ protected function initAttributeGroups() /** * @codeCoverageIgnore * @param string $type - * @return mixed + * @return array */ public function getEntityTypes($type) { diff --git a/src/Migration/Step/PostProcessing/Data.php b/src/Migration/Step/PostProcessing/Data.php index 9384767bb..2936b5400 100644 --- a/src/Migration/Step/PostProcessing/Data.php +++ b/src/Migration/Step/PostProcessing/Data.php @@ -86,7 +86,7 @@ public function perform() } /** - * Delete leftovers of ignored product attributes in eav value tables + * Delete remains of ignored product attributes in eav value tables * * @return void */ From d9235e3ed9df36a8e0a4badd7a92b1c7b552073c Mon Sep 17 00:00:00 2001 From: Yurii Hryhoriev Date: Mon, 6 Jun 2016 15:51:14 +0300 Subject: [PATCH 24/71] MAGETWO-53392: Cannot open product in admin panel after migration - fix for creating new product after migration --- src/Migration/Step/Eav/Data.php | 2 +- src/Migration/Step/Eav/Helper.php | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Migration/Step/Eav/Data.php b/src/Migration/Step/Eav/Data.php index ac038fba2..a45319503 100644 --- a/src/Migration/Step/Eav/Data.php +++ b/src/Migration/Step/Eav/Data.php @@ -375,7 +375,7 @@ public function processDesignEntityAttributes($recordsToSave) $recordsToSaveFiltered = $entityAttributeDocument->getRecords(); foreach ($recordsToSave as $record) { /** @var Record $record */ - if (in_array($record->getValue('attribute_set_id'), $data['catalogProductSetIds']) && + if (in_array($record->getValue('attribute_set_id'), $data['catalogProductSetIdsMigrated']) && $record->getValue('attribute_id') == $data['customDesignAttributeId'] ) { continue; diff --git a/src/Migration/Step/Eav/Helper.php b/src/Migration/Step/Eav/Helper.php index 7922a72a8..f20c45b65 100644 --- a/src/Migration/Step/Eav/Helper.php +++ b/src/Migration/Step/Eav/Helper.php @@ -184,9 +184,9 @@ public function setAddedGroups(array $addedGroups) */ public function getDesignAttributeAndGroupsData() { - $catalogProductSetIds = []; $scheduleGroupsMigrated = []; - $catalogProductDefaultSetId = null; + $catalogProductSetIdsMigrated = []; + $catalogProductSetIdDefault = null; $entityTypeIdCatalogProduct = null; $customLayoutAttributeId = null; $customDesignAttributeId = null; @@ -199,15 +199,16 @@ public function getDesignAttributeAndGroupsData() } foreach ($this->getDestinationRecords('eav_attribute_set') as $record) { if ($entityTypeIdCatalogProduct === $record['entity_type_id']) { - $catalogProductSetIds[] = $record['attribute_set_id']; if ('Default' == $record['attribute_set_name']) { - $catalogProductDefaultSetId = $record['attribute_set_id']; + $catalogProductSetIdDefault = $record['attribute_set_id']; + } else { + $catalogProductSetIdsMigrated[] = $record['attribute_set_id']; } } } foreach ($this->getDestinationRecords('eav_attribute_group') as $group) { if ('schedule-design-update' == $group['attribute_group_code'] && - $catalogProductDefaultSetId != $group['attribute_set_id'] + $catalogProductSetIdDefault != $group['attribute_set_id'] ) { $scheduleGroupsMigrated[] = $group; } @@ -227,7 +228,7 @@ public function getDesignAttributeAndGroupsData() return [ 'scheduleGroupsMigrated' => $scheduleGroupsMigrated, - 'catalogProductSetIds' => $catalogProductSetIds, + 'catalogProductSetIdsMigrated' => $catalogProductSetIdsMigrated, 'customLayoutAttributeId' => $customLayoutAttributeId, 'customDesignAttributeId' => $customDesignAttributeId, 'entityTypeIdCatalogProduct' => $entityTypeIdCatalogProduct From d60995ce54bce8f85d4d1dc67864426809d1d675 Mon Sep 17 00:00:00 2001 From: Ruslan Kostiv Date: Tue, 7 Jun 2016 13:06:47 +0300 Subject: [PATCH 25/71] MAGETWO-52294: Cannot save migrated customer in admin panel --- etc/ce-to-ce/map-eav.xml.dist | 8 +++++++- src/Migration/Handler/SetValueAttributeCondition.php | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/etc/ce-to-ce/map-eav.xml.dist b/etc/ce-to-ce/map-eav.xml.dist index cef596a48..91c295266 100644 --- a/etc/ce-to-ce/map-eav.xml.dist +++ b/etc/ce-to-ce/map-eav.xml.dist @@ -88,7 +88,13 @@ - + + customer_eav_attribute.input_filter + + + + + eav_entity_type.entity_model diff --git a/src/Migration/Handler/SetValueAttributeCondition.php b/src/Migration/Handler/SetValueAttributeCondition.php index 56170df50..7bd50b05b 100644 --- a/src/Migration/Handler/SetValueAttributeCondition.php +++ b/src/Migration/Handler/SetValueAttributeCondition.php @@ -58,6 +58,9 @@ public function handle(Record $recordToHandle, Record $oppositeRecord) { $this->validate($recordToHandle); if ($this->checkAttributeIdCode($recordToHandle->getValue('attribute_id'), $this->attributeCode)) { + if ('null' === $this->value) { + $this->value = null; + } $recordToHandle->setValue($this->field, $this->value); } } From 4dd5835428bf6e47beee4201935c0d86c639cdc3 Mon Sep 17 00:00:00 2001 From: Ruslan Kostiv Date: Tue, 7 Jun 2016 13:22:54 +0300 Subject: [PATCH 26/71] MAGETWO-52294: Cannot save migrated customer in admin panel --- etc/ce-to-ee/map-eav.xml.dist | 8 +++++++- etc/ee-to-ee/map-eav.xml.dist | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/etc/ce-to-ee/map-eav.xml.dist b/etc/ce-to-ee/map-eav.xml.dist index 87be3f6de..d8e441656 100644 --- a/etc/ce-to-ee/map-eav.xml.dist +++ b/etc/ce-to-ee/map-eav.xml.dist @@ -88,7 +88,13 @@ - + + customer_eav_attribute.input_filter + + + + + eav_entity_type.entity_model diff --git a/etc/ee-to-ee/map-eav.xml.dist b/etc/ee-to-ee/map-eav.xml.dist index 22ee6d632..fa844dcb7 100644 --- a/etc/ee-to-ee/map-eav.xml.dist +++ b/etc/ee-to-ee/map-eav.xml.dist @@ -93,7 +93,13 @@ - + + customer_eav_attribute.input_filter + + + + + eav_entity_type.entity_model From aebd3c73624ce490ec5105877cb836eab88633f5 Mon Sep 17 00:00:00 2001 From: Ruslan Kostiv Date: Wed, 8 Jun 2016 13:24:50 +0300 Subject: [PATCH 27/71] MAGETWO-53996: Migrated Bundle product opens with Exception --- etc/ce-to-ce/map-eav.xml.dist | 4 ++++ etc/ce-to-ee/map-eav.xml.dist | 4 ++++ etc/ee-to-ee/map-eav.xml.dist | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/etc/ce-to-ce/map-eav.xml.dist b/etc/ce-to-ce/map-eav.xml.dist index cef596a48..7da39e892 100644 --- a/etc/ce-to-ce/map-eav.xml.dist +++ b/etc/ce-to-ce/map-eav.xml.dist @@ -33,6 +33,10 @@ + + eav_attribute.frontend_input + + eav_attribute.is_required diff --git a/etc/ce-to-ee/map-eav.xml.dist b/etc/ce-to-ee/map-eav.xml.dist index 87be3f6de..7666e3f6f 100644 --- a/etc/ce-to-ee/map-eav.xml.dist +++ b/etc/ce-to-ee/map-eav.xml.dist @@ -33,6 +33,10 @@ + + eav_attribute.frontend_input + + eav_attribute.is_required diff --git a/etc/ee-to-ee/map-eav.xml.dist b/etc/ee-to-ee/map-eav.xml.dist index 22ee6d632..2c65a6bbe 100644 --- a/etc/ee-to-ee/map-eav.xml.dist +++ b/etc/ee-to-ee/map-eav.xml.dist @@ -38,6 +38,10 @@ + + eav_attribute.frontend_input + + eav_attribute.is_required From 395a835d89ee3321b32c53de365f4553e6d9b9da Mon Sep 17 00:00:00 2001 From: Ruslan Kostiv Date: Thu, 9 Jun 2016 14:31:53 +0300 Subject: [PATCH 28/71] MAGETWO-53996: Migrated Bundle product opens with Exception --- etc/ce-to-ce/map-eav.xml.dist | 6 ------ etc/ce-to-ee/map-eav.xml.dist | 6 ------ etc/ee-to-ee/map-eav.xml.dist | 6 ------ 3 files changed, 18 deletions(-) diff --git a/etc/ce-to-ce/map-eav.xml.dist b/etc/ce-to-ce/map-eav.xml.dist index 7da39e892..452fd10ef 100644 --- a/etc/ce-to-ce/map-eav.xml.dist +++ b/etc/ce-to-ce/map-eav.xml.dist @@ -27,12 +27,6 @@ eav_attribute.frontend_model - - eav_attribute.frontend_input - - - - eav_attribute.frontend_input diff --git a/etc/ce-to-ee/map-eav.xml.dist b/etc/ce-to-ee/map-eav.xml.dist index 7666e3f6f..ececf53b1 100644 --- a/etc/ce-to-ee/map-eav.xml.dist +++ b/etc/ce-to-ee/map-eav.xml.dist @@ -27,12 +27,6 @@ eav_attribute.frontend_model - - eav_attribute.frontend_input - - - - eav_attribute.frontend_input diff --git a/etc/ee-to-ee/map-eav.xml.dist b/etc/ee-to-ee/map-eav.xml.dist index 2c65a6bbe..15e08c4a5 100644 --- a/etc/ee-to-ee/map-eav.xml.dist +++ b/etc/ee-to-ee/map-eav.xml.dist @@ -32,12 +32,6 @@ eav_attribute.frontend_model - - eav_attribute.frontend_input - - - - eav_attribute.frontend_input From 945cf70481a1661f4cac944f34c5f84900ad185b Mon Sep 17 00:00:00 2001 From: Ruslan Kostiv Date: Thu, 9 Jun 2016 20:07:10 +0300 Subject: [PATCH 29/71] MAGETWO-52882: Cannot create RMA after migration --- etc/ce-to-ce/map-eav.xml.dist | 4 +- etc/ce-to-ee/map-eav.xml.dist | 4 +- etc/ee-to-ee/map-eav.xml.dist | 4 +- src/Migration/Step/Eav/Volume.php | 101 ++++++++++++------ .../Migration/Step/Eav/VolumeTest.php | 22 +++- 5 files changed, 94 insertions(+), 41 deletions(-) diff --git a/etc/ce-to-ce/map-eav.xml.dist b/etc/ce-to-ce/map-eav.xml.dist index 91c295266..6359a9c61 100644 --- a/etc/ce-to-ce/map-eav.xml.dist +++ b/etc/ce-to-ce/map-eav.xml.dist @@ -123,7 +123,9 @@ eav_entity_type.increment_model - + + + eav_entity_type.additional_attribute_table diff --git a/etc/ce-to-ee/map-eav.xml.dist b/etc/ce-to-ee/map-eav.xml.dist index d8e441656..1f1f2dcd8 100644 --- a/etc/ce-to-ee/map-eav.xml.dist +++ b/etc/ce-to-ee/map-eav.xml.dist @@ -123,7 +123,9 @@ eav_entity_type.increment_model - + + + eav_entity_type.additional_attribute_table diff --git a/etc/ee-to-ee/map-eav.xml.dist b/etc/ee-to-ee/map-eav.xml.dist index fa844dcb7..861dac182 100644 --- a/etc/ee-to-ee/map-eav.xml.dist +++ b/etc/ee-to-ee/map-eav.xml.dist @@ -129,7 +129,9 @@ eav_entity_type.increment_model - + + + eav_entity_type.additional_attribute_table diff --git a/src/Migration/Step/Eav/Volume.php b/src/Migration/Step/Eav/Volume.php index f884bffcd..ca38f364d 100644 --- a/src/Migration/Step/Eav/Volume.php +++ b/src/Migration/Step/Eav/Volume.php @@ -35,6 +35,31 @@ class Volume extends AbstractVolume */ protected $groups; + /** + * Eav Attributes that can be validated + * @var array + */ + private $eavAttributesForValidation = [ + 'eav_attribute' => [ + 'attribute_model', + 'backend_model', + 'frontend_model', + 'source_model', + ], + 'catalog_eav_attribute' => [ + 'frontend_input_renderer', + ], + 'customer_eav_attribute' => [ + 'data_model', + ], + 'eav_entity_type' => [ + 'entity_model', + 'attribute_model', + 'increment_model', + 'entity_attribute_collection', + ] + ]; + /** * @param Helper $helper * @param InitialData $initialData @@ -77,63 +102,71 @@ public function perform() */ protected function validateAttributes() { - $this->validateEavAttributes(); - $this->validateCatalogEavAttributes(); - $this->validateCustomerEavAttributes(); + $this->validateDestinationEavTable('eav_attribute', ['checkAttributesMismatch']); + $this->validateDestinationEavTable('catalog_eav_attribute'); + $this->validateDestinationEavTable('customer_eav_attribute'); + $this->validateDestinationEavTable('eav_entity_type'); } /** + * @param string $tableName + * @param array $conditions * @return void */ - protected function validateEavAttributes() + private function validateDestinationEavTable($tableName, array $conditions = []) { - $sourceAttrbutes = $this->initialData->getAttributes('source'); - foreach ($this->helper->getDestinationRecords('eav_attribute') as $attribute) { - if (isset($sourceAttrbutes[$attribute['attribute_id']]) - && $sourceAttrbutes[$attribute['attribute_id']]['attribute_code'] != $attribute['attribute_code'] - ) { - $this->errors[] = 'Source and Destination attributes mismatch. Attribute id: ' - . $attribute['attribute_id']; - } - foreach (['attribute_model', 'backend_model', 'frontend_model', 'source_model'] as $field) { + if (!isset($this->eavAttributesForValidation[$tableName])) { + $this->errors[] = 'Table ' . $tableName . ' can not be validated. Fields must be set.'; + return; + } + + $tableFields = $this->eavAttributesForValidation[$tableName]; + $destinationRecords = $this->helper->getDestinationRecords($tableName); + + foreach ($destinationRecords as $attribute) { + foreach ($tableFields as $field) { if ($attribute[$field] !== null && !class_exists($attribute[$field])) { - $this->errors[] = 'Incorrect value: '. $attribute[$field] - .' in: eav_attribute.' . $field - .' for attribute_code=' . $attribute['attribute_code']; + $this->errors[] = sprintf( + 'Class %s does not exist but mentioned in: %s.%s for %s=%s', + $attribute[$field], $tableName, $field, key($attribute), current($attribute) + ); } } + + if (!empty($conditions)) { + $this->validateCustomConditions($conditions); + } } } /** + * @param array $attribute + * @param array $conditions * @return void */ - protected function validateCustomerEavAttributes() - { - foreach ($this->helper->getDestinationRecords('customer_eav_attribute') as $attribute) { - foreach (['data_model'] as $field) { - if ($attribute[$field] !== null && !class_exists($attribute[$field])) { - $this->errors[] = 'Incorrect value: customer_eav_attribute.' . $field - . ' for attribute_id=' . $attribute['attribute_id']; - } + private function validateCustomConditions(array $attribute, array $conditions) { + foreach ($conditions as $condition) { + if (method_exists($this, $condition)) { + $this->$condition($attribute); } } } /** - * @return void + * @param $attribute */ - protected function validateCatalogEavAttributes() + private function checkAttributesMismatch($attribute) { - foreach ($this->helper->getDestinationRecords('catalog_eav_attribute') as $attribute) { - foreach (['frontend_input_renderer'] as $field) { - if ($attribute[$field] !== null && !class_exists($attribute[$field])) { - $this->errors[] = 'Incorrect value: '. $attribute[$field] - . ' in: catalog_eav_attribute.' . $field - . ' for attribute_id=' . $attribute['attribute_id']; - } - } + $sourceAttributes = $this->initialData->getAttributes('source'); + + if (isset($sourceAttributes[$attribute['attribute_id']]) + && ($sourceAttributes[$attribute['attribute_id']]['attribute_code'] != $attribute['attribute_code']) + ) { + $this->errors[] = sprintf( + 'Source and Destination attributes mismatch. Attribute id:%s', + $attribute['attribute_id'] + ); } } diff --git a/tests/unit/testsuite/Migration/Step/Eav/VolumeTest.php b/tests/unit/testsuite/Migration/Step/Eav/VolumeTest.php index 840fecce3..16222f981 100644 --- a/tests/unit/testsuite/Migration/Step/Eav/VolumeTest.php +++ b/tests/unit/testsuite/Migration/Step/Eav/VolumeTest.php @@ -101,7 +101,10 @@ public function testPerform() 'frontend_model' => null, 'source_model' => null, 'frontend_input_renderer' => null, - 'data_model' => null + 'data_model' => null, + 'entity_model' => null, + 'increment_model' => null, + 'entity_attribute_collection' => null, ], 'eav_attribute_2' => [ 'attribute_id' => '2', @@ -111,7 +114,10 @@ public function testPerform() 'frontend_model' => null, 'source_model' => null, 'frontend_input_renderer' => null, - 'data_model' => null + 'data_model' => null, + 'entity_model' => null, + 'increment_model' => null, + 'entity_attribute_collection' => null, ] ]; $this->progress->expects($this->once())->method('start'); @@ -156,7 +162,11 @@ public function testPerformWithError() 'frontend_model' => 1, 'source_model' => 1, 'frontend_input_renderer' => 1, - 'data_model' => 1], + 'data_model' => 1, + 'entity_model' => null, + 'increment_model' => null, + 'entity_attribute_collection' => null, + ], 'eav_attribute_2' => [ 'attribute_id' => '2', 'attribute_code' => 'attribute_code_2', @@ -165,7 +175,11 @@ public function testPerformWithError() 'frontend_model' => 1, 'source_model' => 1, 'frontend_input_renderer' => 1, - 'data_model' => 1] + 'data_model' => 1, + 'entity_model' => null, + 'increment_model' => null, + 'entity_attribute_collection' => null, + ], ]; $this->progress->expects($this->once())->method('start'); $this->progress->expects($this->once())->method('finish'); From 48a7c70452eeeae6eaa63ac453c49c61e2f04aa9 Mon Sep 17 00:00:00 2001 From: Ruslan Kostiv Date: Sat, 11 Jun 2016 16:54:09 +0300 Subject: [PATCH 30/71] MAGETWO-52882: Cannot create RMA after migration --- src/Migration/Step/Eav/Volume.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Migration/Step/Eav/Volume.php b/src/Migration/Step/Eav/Volume.php index ca38f364d..eab52c302 100644 --- a/src/Migration/Step/Eav/Volume.php +++ b/src/Migration/Step/Eav/Volume.php @@ -135,7 +135,7 @@ private function validateDestinationEavTable($tableName, array $conditions = []) } if (!empty($conditions)) { - $this->validateCustomConditions($conditions); + $this->validateCustomConditions($attribute, $conditions); } } } From 97fe0160f1037e948bbff6144fab1c706117a442 Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Sat, 11 Jun 2016 17:47:23 +0300 Subject: [PATCH 31/71] MAGETWO-52882: Cannot create RMA after migration --- src/Migration/Step/Eav/Volume.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Migration/Step/Eav/Volume.php b/src/Migration/Step/Eav/Volume.php index eab52c302..ff13a963b 100644 --- a/src/Migration/Step/Eav/Volume.php +++ b/src/Migration/Step/Eav/Volume.php @@ -113,9 +113,8 @@ protected function validateAttributes() * @param array $conditions * @return void */ - private function validateDestinationEavTable($tableName, array $conditions = []) + protected function validateDestinationEavTable($tableName, array $conditions = []) { - if (!isset($this->eavAttributesForValidation[$tableName])) { $this->errors[] = 'Table ' . $tableName . ' can not be validated. Fields must be set.'; return; @@ -133,7 +132,6 @@ private function validateDestinationEavTable($tableName, array $conditions = []) ); } } - if (!empty($conditions)) { $this->validateCustomConditions($attribute, $conditions); } @@ -145,7 +143,8 @@ private function validateDestinationEavTable($tableName, array $conditions = []) * @param array $conditions * @return void */ - private function validateCustomConditions(array $attribute, array $conditions) { + protected function validateCustomConditions(array $attribute, array $conditions) + { foreach ($conditions as $condition) { if (method_exists($this, $condition)) { $this->$condition($attribute); @@ -155,8 +154,9 @@ private function validateCustomConditions(array $attribute, array $conditions) { /** * @param $attribute + * @return void */ - private function checkAttributesMismatch($attribute) + protected function checkAttributesMismatch($attribute) { $sourceAttributes = $this->initialData->getAttributes('source'); @@ -173,7 +173,7 @@ private function checkAttributesMismatch($attribute) /** * @return void */ - public function validateAttributeSetsAndGroups() + protected function validateAttributeSetsAndGroups() { $sourceRecords = $this->helper->getSourceRecordsCount('eav_attribute_set'); $initialDestRecords = count($this->initialData->getAttributeSets('dest')); From 4e6b2c424f74062b609156efb4b344e26869c7e9 Mon Sep 17 00:00:00 2001 From: Yurii Hryhoriev Date: Mon, 13 Jun 2016 11:44:56 +0300 Subject: [PATCH 32/71] MAGETWO-52158: [GitHub] Wrong URL addresses for products and categories #59 --- etc/ce-to-ce/1.6.0.0/map.xml.dist | 10 ++ etc/ce-to-ce/1.6.1.0/map.xml.dist | 10 ++ etc/ce-to-ce/1.6.2.0/map.xml.dist | 10 ++ etc/ce-to-ce/1.7.0.0/map.xml.dist | 10 ++ etc/ce-to-ce/1.7.0.1/map.xml.dist | 10 ++ etc/ce-to-ce/1.7.0.2/map.xml.dist | 10 ++ etc/ce-to-ce/1.8.0.0/map.xml.dist | 10 ++ etc/ce-to-ce/1.8.1.0/map.xml.dist | 10 ++ etc/ce-to-ce/1.9.0.0/map.xml.dist | 10 ++ etc/ce-to-ce/1.9.0.1/map.xml.dist | 10 ++ etc/ce-to-ce/1.9.1.0/map.xml.dist | 10 ++ etc/ce-to-ce/1.9.1.1/map.xml.dist | 10 ++ etc/ce-to-ce/1.9.2.0/map.xml.dist | 10 ++ etc/ce-to-ce/1.9.2.1/map.xml.dist | 10 ++ etc/ce-to-ce/1.9.2.2/map.xml.dist | 10 ++ etc/ce-to-ce/1.9.2.3/map.xml.dist | 10 ++ etc/ce-to-ce/1.9.2.4/map.xml.dist | 10 ++ src/Migration/Handler/TruncateSuffix.php | 137 +++++++++++++++++++++++ src/Migration/RecordTransformer.php | 9 +- 19 files changed, 312 insertions(+), 4 deletions(-) create mode 100644 src/Migration/Handler/TruncateSuffix.php 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 index 0ca3ae33c..0ffdf9890 100644 --- a/etc/ce-to-ce/1.6.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.0.0/map.xml.dist @@ -820,6 +820,11 @@ + + + + + catalog_product_entity_varchar.value @@ -827,6 +832,11 @@ + + + + + cms_page.root_template 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 index 2ed911e7c..51b96d382 100644 --- a/etc/ce-to-ce/1.6.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.1.0/map.xml.dist @@ -808,6 +808,11 @@ + + + + + catalog_product_entity_varchar.value @@ -815,6 +820,11 @@ + + + + + cms_page.root_template 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 index 5002bd211..0ee539b4e 100644 --- a/etc/ce-to-ce/1.6.2.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.2.0/map.xml.dist @@ -808,6 +808,11 @@ + + + + + catalog_product_entity_varchar.value @@ -815,6 +820,11 @@ + + + + + cms_page.root_template 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 index 6170ed702..9b1b01e00 100644 --- a/etc/ce-to-ce/1.7.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.0/map.xml.dist @@ -817,6 +817,11 @@ + + + + + catalog_product_entity_varchar.value @@ -824,6 +829,11 @@ + + + + + cms_page.root_template 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 index 6170ed702..9b1b01e00 100644 --- a/etc/ce-to-ce/1.7.0.1/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.1/map.xml.dist @@ -817,6 +817,11 @@ + + + + + catalog_product_entity_varchar.value @@ -824,6 +829,11 @@ + + + + + cms_page.root_template 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 index 6170ed702..9b1b01e00 100644 --- a/etc/ce-to-ce/1.7.0.2/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.2/map.xml.dist @@ -817,6 +817,11 @@ + + + + + catalog_product_entity_varchar.value @@ -824,6 +829,11 @@ + + + + + cms_page.root_template 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 index 7d4cf4ff7..736e1190d 100644 --- a/etc/ce-to-ce/1.8.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.8.0.0/map.xml.dist @@ -817,6 +817,11 @@ + + + + + catalog_product_entity_varchar.value @@ -824,6 +829,11 @@ + + + + + cms_page.root_template 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 index e753385cb..ed16a8edf 100644 --- a/etc/ce-to-ce/1.8.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.8.1.0/map.xml.dist @@ -814,6 +814,11 @@ + + + + + catalog_product_entity_varchar.value @@ -821,6 +826,11 @@ + + + + + cms_page.root_template 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 index 1f0982d3a..35a270946 100644 --- a/etc/ce-to-ce/1.9.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.0.0/map.xml.dist @@ -817,6 +817,11 @@ + + + + + catalog_product_entity_varchar.value @@ -824,6 +829,11 @@ + + + + + cms_page.root_template 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 index 1f0982d3a..35a270946 100644 --- a/etc/ce-to-ce/1.9.0.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.0.1/map.xml.dist @@ -817,6 +817,11 @@ + + + + + catalog_product_entity_varchar.value @@ -824,6 +829,11 @@ + + + + + cms_page.root_template 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 index 4689688e6..1268b3c96 100644 --- a/etc/ce-to-ce/1.9.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.1.0/map.xml.dist @@ -799,6 +799,11 @@ + + + + + catalog_product_entity_varchar.value @@ -806,6 +811,11 @@ + + + + + cms_page.root_template 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 index 4689688e6..1268b3c96 100644 --- a/etc/ce-to-ce/1.9.1.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.1.1/map.xml.dist @@ -799,6 +799,11 @@ + + + + + catalog_product_entity_varchar.value @@ -806,6 +811,11 @@ + + + + + cms_page.root_template 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 index 82ff1f131..ca693c673 100644 --- a/etc/ce-to-ce/1.9.2.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.0/map.xml.dist @@ -799,6 +799,11 @@ + + + + + catalog_product_entity_varchar.value @@ -806,6 +811,11 @@ + + + + + cms_page.root_template 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 index 82ff1f131..ca693c673 100644 --- a/etc/ce-to-ce/1.9.2.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.1/map.xml.dist @@ -799,6 +799,11 @@ + + + + + catalog_product_entity_varchar.value @@ -806,6 +811,11 @@ + + + + + cms_page.root_template diff --git a/etc/ce-to-ce/1.9.2.2/map.xml.dist b/etc/ce-to-ce/1.9.2.2/map.xml.dist index 64a72ab26..f55c7ab2f 100644 --- a/etc/ce-to-ce/1.9.2.2/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.2/map.xml.dist @@ -805,6 +805,11 @@ + + + + + catalog_product_entity_varchar.value @@ -812,6 +817,11 @@ + + + + + cms_page.root_template diff --git a/etc/ce-to-ce/1.9.2.3/map.xml.dist b/etc/ce-to-ce/1.9.2.3/map.xml.dist index 64a72ab26..f55c7ab2f 100644 --- a/etc/ce-to-ce/1.9.2.3/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.3/map.xml.dist @@ -805,6 +805,11 @@ + + + + + catalog_product_entity_varchar.value @@ -812,6 +817,11 @@ + + + + + cms_page.root_template diff --git a/etc/ce-to-ce/1.9.2.4/map.xml.dist b/etc/ce-to-ce/1.9.2.4/map.xml.dist index 64a72ab26..f55c7ab2f 100644 --- a/etc/ce-to-ce/1.9.2.4/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.4/map.xml.dist @@ -805,6 +805,11 @@ + + + + + catalog_product_entity_varchar.value @@ -812,6 +817,11 @@ + + + + + cms_page.root_template diff --git a/src/Migration/Handler/TruncateSuffix.php b/src/Migration/Handler/TruncateSuffix.php new file mode 100644 index 000000000..f7cf4ed44 --- /dev/null +++ b/src/Migration/Handler/TruncateSuffix.php @@ -0,0 +1,137 @@ +canStart = $config->getSource()['type'] == DatabaseStage::SOURCE_TYPE; + if ($this->canStart) { + $this->source = $source; + $this->suffixPath = $suffixPath; + $attributeCodes = rtrim($attributeCodes, ']'); + $attributeCodes = ltrim($attributeCodes, '['); + $this->attributeCodes = explode(',', $attributeCodes); + $this->entityTypeCode = $entityTypeCode; + } + } + + /** + * @inheritdoc + */ + public function handle(Record $recordToHandle, Record $oppositeRecord) + { + + if (!$this->canStart || $this->getSuffix() == '') { + return; + } + $attributeIds = $this->getAttributeIds(); + if (in_array($recordToHandle->getValue('attribute_id'), $attributeIds)) { + $suffix = '~' . preg_quote($this->getSuffix()) . '$~'; + $value = $recordToHandle->getValue($this->field); + $value = preg_replace($suffix, '', $value); + $recordToHandle->setValue($this->field, $value); + } + } + + /** + * @return array + */ + protected function getAttributeIds() + { + if (null === $this->attributeIds) { + /** @var Mysql $adapter */ + $adapter = $this->source->getAdapter(); + $query = $adapter->getSelect()->from( + ['ea' => $this->source->addDocumentPrefix('eav_attribute')], + ['ea.attribute_id'] + )->join( + ['eet' => $this->source->addDocumentPrefix('eav_entity_type')], + 'ea.entity_type_id = eet.entity_type_id', + [] + ) + ->where('ea.attribute_code IN (?)', $this->attributeCodes) + ->where('eet.entity_type_code = ?', $this->entityTypeCode); + $this->attributeIds = array_column($query->getAdapter()->fetchAll($query), 'attribute_id'); + } + return $this->attributeIds; + } + + /** + * @return string + */ + protected function getSuffix() + { + if (null === $this->suffix) { + /** @var Mysql $adapter */ + $adapter = $this->source->getAdapter(); + $query = $adapter->getSelect()->from($this->source->addDocumentPrefix('core_config_data'), ['value']) + ->where('path = ?', $this->suffixPath) + ->limit(1); + $this->suffix = $query->getAdapter()->fetchOne($query) !== false ?: self::DEFAULT_SUFFIX; + } + return $this->suffix; + } +} diff --git a/src/Migration/RecordTransformer.php b/src/Migration/RecordTransformer.php index 56c90ce57..2a7ddfdac 100644 --- a/src/Migration/RecordTransformer.php +++ b/src/Migration/RecordTransformer.php @@ -96,10 +96,11 @@ protected function initHandlerManager($type = MapInterface::TYPE_SOURCE) $handlerManager = $this->handlerManagerFactory->create(); $fields = $document->getStructure()->getFields(); foreach (array_keys($fields) as $field) { - $handlerManager->initHandler( - $field, - $this->mapReader->getHandlerConfig($document->getName(), $field, $type) - ); + $handlerConfig = $this->mapReader->getHandlerConfig($document->getName(), $field, $type); + if (!empty($handlerConfig)) { + $handlerKey = md5($field . $handlerConfig['class']); + $handlerManager->initHandler($field, $handlerConfig, $handlerKey); + } } return $handlerManager; } From 5007c61b54239b1db407da262dd652f5e47201d2 Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Mon, 13 Jun 2016 13:23:06 +0300 Subject: [PATCH 33/71] MAGETWO-51382: integrity check errors --- etc/ce-to-ce/1.7.0.2/map.xml.dist | 84 +++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) 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 index 6170ed702..112f632a5 100644 --- a/etc/ce-to-ce/1.7.0.2/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.2/map.xml.dist @@ -509,6 +509,15 @@ catalog_product_entity_tier_price + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1038,6 +1047,81 @@ catalogsearch_query.synonym_for + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month From ace0ba1d08240cfc45155eb21c0a8e4eab0c1e9d Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Mon, 13 Jun 2016 13:24:01 +0300 Subject: [PATCH 34/71] MAGETWO-51383: error on Url Rewrite Step --- src/Migration/Step/UrlRewrite/Version191to2000.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Migration/Step/UrlRewrite/Version191to2000.php b/src/Migration/Step/UrlRewrite/Version191to2000.php index 9b39dd29e..5b874bd2f 100644 --- a/src/Migration/Step/UrlRewrite/Version191to2000.php +++ b/src/Migration/Step/UrlRewrite/Version191to2000.php @@ -338,6 +338,8 @@ protected function selectCmsPageRewrites() ['cps' => $this->source->addDocumentPrefix($this->cmsPageStoreTableName)], 'cps.page_id = cp.page_id', [] + )->where( + 'cp.is_active = 1' )->group(['request_path', 'cps.store_id']); return $select; From f74dd7b145920dcf66f8316232ca436c38838a7a Mon Sep 17 00:00:00 2001 From: Yurii Hryhoriev Date: Mon, 13 Jun 2016 14:50:19 +0300 Subject: [PATCH 35/71] MAGETWO-51381: Adapt Data Migration Tool to stores with its initial version before 1.6 ce and 1.11 ee --- src/Migration/Handler/TruncateSuffix.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Migration/Handler/TruncateSuffix.php b/src/Migration/Handler/TruncateSuffix.php index f7cf4ed44..aa25a8215 100644 --- a/src/Migration/Handler/TruncateSuffix.php +++ b/src/Migration/Handler/TruncateSuffix.php @@ -83,7 +83,6 @@ public function __construct(Config $config, Source $source, $suffixPath, $attrib */ public function handle(Record $recordToHandle, Record $oppositeRecord) { - if (!$this->canStart || $this->getSuffix() == '') { return; } From 513417ddd549db46f4cb98c61cbfdec295f14dea Mon Sep 17 00:00:00 2001 From: Yurii Hryhoriev Date: Mon, 13 Jun 2016 15:09:23 +0300 Subject: [PATCH 36/71] MAGETWO-51381: Adapt Data Migration Tool to stores with its initial version before 1.6 ce and 1.11 ee --- src/Migration/Handler/TruncateSuffix.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Migration/Handler/TruncateSuffix.php b/src/Migration/Handler/TruncateSuffix.php index aa25a8215..79c8fba2d 100644 --- a/src/Migration/Handler/TruncateSuffix.php +++ b/src/Migration/Handler/TruncateSuffix.php @@ -113,7 +113,7 @@ protected function getAttributeIds() ) ->where('ea.attribute_code IN (?)', $this->attributeCodes) ->where('eet.entity_type_code = ?', $this->entityTypeCode); - $this->attributeIds = array_column($query->getAdapter()->fetchAll($query), 'attribute_id'); + $this->attributeIds = $query->getAdapter()->fetchCol($query); } return $this->attributeIds; } From 356400b66aaf3f4c78bb35005932cbd7a94c59cb Mon Sep 17 00:00:00 2001 From: Ruslan Kostiv Date: Mon, 13 Jun 2016 18:21:13 +0300 Subject: [PATCH 37/71] MAGETWO-52882: Cannot create RMA after migration --- src/Migration/Step/Eav/Volume.php | 44 ++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/src/Migration/Step/Eav/Volume.php b/src/Migration/Step/Eav/Volume.php index ff13a963b..f9a5334ea 100644 --- a/src/Migration/Step/Eav/Volume.php +++ b/src/Migration/Step/Eav/Volume.php @@ -9,6 +9,7 @@ use Migration\Logger\Logger; use Migration\App\ProgressBar; use Migration\Reader\GroupsFactory; +use Migration\ResourceModel\Destination; /** * Class Volume @@ -35,6 +36,16 @@ class Volume extends AbstractVolume */ protected $groups; + /** + * @var Destination + */ + protected $destination; + + /** + * @var array + */ + protected $tableKeys; + /** * Eav Attributes that can be validated * @var array @@ -66,18 +77,21 @@ class Volume extends AbstractVolume * @param Logger $logger * @param ProgressBar\LogLevelProcessor $progress * @param GroupsFactory $groupsFactory + * @param Destination $destination */ public function __construct( Helper $helper, InitialData $initialData, Logger $logger, ProgressBar\LogLevelProcessor $progress, - GroupsFactory $groupsFactory + GroupsFactory $groupsFactory, + Destination $destination ) { $this->initialData = $initialData; $this->helper = $helper; $this->progress = $progress; $this->groups = $groupsFactory->create('eav_document_groups_file'); + $this->destination = $destination; parent::__construct($logger); } @@ -123,12 +137,14 @@ protected function validateDestinationEavTable($tableName, array $conditions = [ $tableFields = $this->eavAttributesForValidation[$tableName]; $destinationRecords = $this->helper->getDestinationRecords($tableName); + $primaryKeyName = $this->getPrimaryKeyName($tableName); + foreach ($destinationRecords as $attribute) { foreach ($tableFields as $field) { - if ($attribute[$field] !== null && !class_exists($attribute[$field])) { + if (!empty($attribute[$field]) && !class_exists($attribute[$field])) { $this->errors[] = sprintf( 'Class %s does not exist but mentioned in: %s.%s for %s=%s', - $attribute[$field], $tableName, $field, key($attribute), current($attribute) + $attribute[$field], $tableName, $field, $primaryKeyName, $attribute[$primaryKeyName] ); } } @@ -190,4 +206,26 @@ protected function validateAttributeSetsAndGroups() $this->errors[] = 'Mismatch of entities in the document: eav_attribute_group'; } } + + /** + * @param string $documentName + * @return mixed + */ + protected function getPrimaryKeyName($documentName) + { + if (isset($this->tableKeys[$documentName])) { + return $this->tableKeys[$documentName]; + } + + $this->tableKeys[$documentName] = null; + $destinationFields = $this->destination->getDocument($documentName)->getStructure()->getFields(); + foreach ($destinationFields as $params) { + if ($params['PRIMARY']) { + $this->tableKeys[$documentName] = $params['COLUMN_NAME']; + break; + } + } + + return $this->tableKeys[$documentName]; + } } From 8dbddd1b0892888a736a8dbdd00774b97cc0cfa0 Mon Sep 17 00:00:00 2001 From: Yurii Hryhoriev Date: Tue, 14 Jun 2016 10:59:42 +0300 Subject: [PATCH 38/71] MAGETWO-52158: [GitHub] Wrong URL addresses for products and categories #59 --- etc/ce-to-ce/1.6.0.0/map.xml.dist | 6 ++++++ etc/ce-to-ce/1.6.1.0/map.xml.dist | 6 ++++++ etc/ce-to-ce/1.6.2.0/map.xml.dist | 6 ++++++ etc/ce-to-ce/1.7.0.0/map.xml.dist | 6 ++++++ etc/ce-to-ce/1.7.0.1/map.xml.dist | 6 ++++++ etc/ce-to-ce/1.7.0.2/map.xml.dist | 6 ++++++ etc/ce-to-ce/1.8.0.0/map.xml.dist | 6 ++++++ etc/ce-to-ce/1.8.1.0/map.xml.dist | 6 ++++++ etc/ce-to-ce/1.9.0.0/map.xml.dist | 6 ++++++ etc/ce-to-ce/1.9.0.1/map.xml.dist | 6 ++++++ etc/ce-to-ce/1.9.1.0/map.xml.dist | 6 ++++++ etc/ce-to-ce/1.9.1.1/map.xml.dist | 6 ++++++ etc/ce-to-ce/1.9.2.0/map.xml.dist | 6 ++++++ etc/ce-to-ce/1.9.2.1/map.xml.dist | 6 ++++++ etc/ce-to-ce/1.9.2.2/map.xml.dist | 6 ++++++ etc/ce-to-ce/1.9.2.3/map.xml.dist | 6 ++++++ etc/ce-to-ce/1.9.2.4/map.xml.dist | 6 ++++++ etc/ce-to-ee/1.6.0.0/map.xml.dist | 16 ++++++++++++++++ etc/ce-to-ee/1.6.1.0/map.xml.dist | 16 ++++++++++++++++ etc/ce-to-ee/1.6.2.0/map.xml.dist | 16 ++++++++++++++++ etc/ce-to-ee/1.7.0.0/map.xml.dist | 16 ++++++++++++++++ etc/ce-to-ee/1.7.0.1/map.xml.dist | 16 ++++++++++++++++ etc/ce-to-ee/1.7.0.2/map.xml.dist | 16 ++++++++++++++++ etc/ce-to-ee/1.8.0.0/map.xml.dist | 16 ++++++++++++++++ etc/ce-to-ee/1.8.1.0/map.xml.dist | 16 ++++++++++++++++ etc/ce-to-ee/1.9.0.0/map.xml.dist | 16 ++++++++++++++++ etc/ce-to-ee/1.9.0.1/map.xml.dist | 16 ++++++++++++++++ etc/ce-to-ee/1.9.1.0/map.xml.dist | 16 ++++++++++++++++ etc/ce-to-ee/1.9.1.1/map.xml.dist | 16 ++++++++++++++++ etc/ce-to-ee/1.9.2.0/map.xml.dist | 16 ++++++++++++++++ etc/ce-to-ee/1.9.2.1/map.xml.dist | 16 ++++++++++++++++ etc/ce-to-ee/1.9.2.2/map.xml.dist | 16 ++++++++++++++++ etc/ce-to-ee/1.9.2.3/map.xml.dist | 16 ++++++++++++++++ etc/ce-to-ee/1.9.2.4/map.xml.dist | 16 ++++++++++++++++ etc/ee-to-ee/1.11.0.0/map.xml.dist | 16 ++++++++++++++++ etc/ee-to-ee/1.11.0.1/map.xml.dist | 16 ++++++++++++++++ etc/ee-to-ee/1.11.0.2/map.xml.dist | 16 ++++++++++++++++ etc/ee-to-ee/1.11.1.0/map.xml.dist | 16 ++++++++++++++++ etc/ee-to-ee/1.11.2.0/map.xml.dist | 16 ++++++++++++++++ etc/ee-to-ee/1.12.0.0/map.xml.dist | 16 ++++++++++++++++ etc/ee-to-ee/1.12.0.1/map.xml.dist | 16 ++++++++++++++++ etc/ee-to-ee/1.12.0.2/map.xml.dist | 16 ++++++++++++++++ 42 files changed, 502 insertions(+) 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 index 0ffdf9890..1f9a49c41 100644 --- a/etc/ce-to-ce/1.6.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.0.0/map.xml.dist @@ -820,6 +820,9 @@ + + + catalog_category_entity_varchar.value @@ -832,6 +835,9 @@ + + + catalog_product_entity_varchar.value 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 index 51b96d382..5db3b0d53 100644 --- a/etc/ce-to-ce/1.6.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.1.0/map.xml.dist @@ -808,6 +808,9 @@ + + + catalog_category_entity_varchar.value @@ -820,6 +823,9 @@ + + + catalog_product_entity_varchar.value 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 index 0ee539b4e..b7ca8e309 100644 --- a/etc/ce-to-ce/1.6.2.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.2.0/map.xml.dist @@ -808,6 +808,9 @@ + + + catalog_category_entity_varchar.value @@ -820,6 +823,9 @@ + + + catalog_product_entity_varchar.value 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 index 9b1b01e00..334fdcf67 100644 --- a/etc/ce-to-ce/1.7.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.0/map.xml.dist @@ -817,6 +817,9 @@ + + + catalog_category_entity_varchar.value @@ -829,6 +832,9 @@ + + + catalog_product_entity_varchar.value 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 index 9b1b01e00..334fdcf67 100644 --- a/etc/ce-to-ce/1.7.0.1/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.1/map.xml.dist @@ -817,6 +817,9 @@ + + + catalog_category_entity_varchar.value @@ -829,6 +832,9 @@ + + + catalog_product_entity_varchar.value 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 index 9b1b01e00..334fdcf67 100644 --- a/etc/ce-to-ce/1.7.0.2/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.2/map.xml.dist @@ -817,6 +817,9 @@ + + + catalog_category_entity_varchar.value @@ -829,6 +832,9 @@ + + + catalog_product_entity_varchar.value 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 index 736e1190d..4161f808a 100644 --- a/etc/ce-to-ce/1.8.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.8.0.0/map.xml.dist @@ -817,6 +817,9 @@ + + + catalog_category_entity_varchar.value @@ -829,6 +832,9 @@ + + + catalog_product_entity_varchar.value 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 index ed16a8edf..d01e6e015 100644 --- a/etc/ce-to-ce/1.8.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.8.1.0/map.xml.dist @@ -814,6 +814,9 @@ + + + catalog_category_entity_varchar.value @@ -826,6 +829,9 @@ + + + catalog_product_entity_varchar.value 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 index 35a270946..b5a881037 100644 --- a/etc/ce-to-ce/1.9.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.0.0/map.xml.dist @@ -817,6 +817,9 @@ + + + catalog_category_entity_varchar.value @@ -829,6 +832,9 @@ + + + catalog_product_entity_varchar.value 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 index 35a270946..b5a881037 100644 --- a/etc/ce-to-ce/1.9.0.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.0.1/map.xml.dist @@ -817,6 +817,9 @@ + + + catalog_category_entity_varchar.value @@ -829,6 +832,9 @@ + + + catalog_product_entity_varchar.value 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 index 1268b3c96..3ee3d4dd1 100644 --- a/etc/ce-to-ce/1.9.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.1.0/map.xml.dist @@ -799,6 +799,9 @@ + + + catalog_category_entity_varchar.value @@ -811,6 +814,9 @@ + + + catalog_product_entity_varchar.value 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 index 1268b3c96..3ee3d4dd1 100644 --- a/etc/ce-to-ce/1.9.1.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.1.1/map.xml.dist @@ -799,6 +799,9 @@ + + + catalog_category_entity_varchar.value @@ -811,6 +814,9 @@ + + + catalog_product_entity_varchar.value 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 index ca693c673..8da5406c4 100644 --- a/etc/ce-to-ce/1.9.2.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.0/map.xml.dist @@ -799,6 +799,9 @@ + + + catalog_category_entity_varchar.value @@ -811,6 +814,9 @@ + + + catalog_product_entity_varchar.value 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 index ca693c673..8da5406c4 100644 --- a/etc/ce-to-ce/1.9.2.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.1/map.xml.dist @@ -799,6 +799,9 @@ + + + catalog_category_entity_varchar.value @@ -811,6 +814,9 @@ + + + catalog_product_entity_varchar.value diff --git a/etc/ce-to-ce/1.9.2.2/map.xml.dist b/etc/ce-to-ce/1.9.2.2/map.xml.dist index f55c7ab2f..fa7f9ebd5 100644 --- a/etc/ce-to-ce/1.9.2.2/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.2/map.xml.dist @@ -805,6 +805,9 @@ + + + catalog_category_entity_varchar.value @@ -817,6 +820,9 @@ + + + catalog_product_entity_varchar.value diff --git a/etc/ce-to-ce/1.9.2.3/map.xml.dist b/etc/ce-to-ce/1.9.2.3/map.xml.dist index f55c7ab2f..fa7f9ebd5 100644 --- a/etc/ce-to-ce/1.9.2.3/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.3/map.xml.dist @@ -805,6 +805,9 @@ + + + catalog_category_entity_varchar.value @@ -817,6 +820,9 @@ + + + catalog_product_entity_varchar.value diff --git a/etc/ce-to-ce/1.9.2.4/map.xml.dist b/etc/ce-to-ce/1.9.2.4/map.xml.dist index f55c7ab2f..fa7f9ebd5 100644 --- a/etc/ce-to-ce/1.9.2.4/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.4/map.xml.dist @@ -805,6 +805,9 @@ + + + catalog_category_entity_varchar.value @@ -817,6 +820,9 @@ + + + catalog_product_entity_varchar.value diff --git a/etc/ce-to-ee/1.6.0.0/map.xml.dist b/etc/ce-to-ee/1.6.0.0/map.xml.dist index 557be9bff..3832019dd 100644 --- a/etc/ce-to-ee/1.6.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.6.0.0/map.xml.dist @@ -909,6 +909,14 @@ + + catalog_category_entity_varchar.value + + + + + + catalog_product_entity_varchar.value @@ -916,6 +924,14 @@ + + catalog_product_entity_varchar.value + + + + + + cms_page.root_template diff --git a/etc/ce-to-ee/1.6.1.0/map.xml.dist b/etc/ce-to-ee/1.6.1.0/map.xml.dist index e341d78b7..0a0ddc6e1 100644 --- a/etc/ce-to-ee/1.6.1.0/map.xml.dist +++ b/etc/ce-to-ee/1.6.1.0/map.xml.dist @@ -897,6 +897,14 @@ + + catalog_category_entity_varchar.value + + + + + + catalog_product_entity_varchar.value @@ -904,6 +912,14 @@ + + catalog_product_entity_varchar.value + + + + + + cms_page.root_template diff --git a/etc/ce-to-ee/1.6.2.0/map.xml.dist b/etc/ce-to-ee/1.6.2.0/map.xml.dist index c346bcdb0..004ee7b07 100644 --- a/etc/ce-to-ee/1.6.2.0/map.xml.dist +++ b/etc/ce-to-ee/1.6.2.0/map.xml.dist @@ -897,6 +897,14 @@ + + catalog_category_entity_varchar.value + + + + + + catalog_product_entity_varchar.value @@ -904,6 +912,14 @@ + + catalog_product_entity_varchar.value + + + + + + cms_page.root_template diff --git a/etc/ce-to-ee/1.7.0.0/map.xml.dist b/etc/ce-to-ee/1.7.0.0/map.xml.dist index 13272d5e1..5894162c4 100644 --- a/etc/ce-to-ee/1.7.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.7.0.0/map.xml.dist @@ -894,6 +894,14 @@ + + catalog_category_entity_varchar.value + + + + + + catalog_product_entity_varchar.value @@ -901,6 +909,14 @@ + + catalog_product_entity_varchar.value + + + + + + cms_page.root_template diff --git a/etc/ce-to-ee/1.7.0.1/map.xml.dist b/etc/ce-to-ee/1.7.0.1/map.xml.dist index 13272d5e1..5894162c4 100644 --- a/etc/ce-to-ee/1.7.0.1/map.xml.dist +++ b/etc/ce-to-ee/1.7.0.1/map.xml.dist @@ -894,6 +894,14 @@ + + catalog_category_entity_varchar.value + + + + + + catalog_product_entity_varchar.value @@ -901,6 +909,14 @@ + + catalog_product_entity_varchar.value + + + + + + cms_page.root_template diff --git a/etc/ce-to-ee/1.7.0.2/map.xml.dist b/etc/ce-to-ee/1.7.0.2/map.xml.dist index 13272d5e1..5894162c4 100644 --- a/etc/ce-to-ee/1.7.0.2/map.xml.dist +++ b/etc/ce-to-ee/1.7.0.2/map.xml.dist @@ -894,6 +894,14 @@ + + catalog_category_entity_varchar.value + + + + + + catalog_product_entity_varchar.value @@ -901,6 +909,14 @@ + + catalog_product_entity_varchar.value + + + + + + cms_page.root_template diff --git a/etc/ce-to-ee/1.8.0.0/map.xml.dist b/etc/ce-to-ee/1.8.0.0/map.xml.dist index 0dd5ab4e5..1b3180362 100644 --- a/etc/ce-to-ee/1.8.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.8.0.0/map.xml.dist @@ -894,6 +894,14 @@ + + catalog_category_entity_varchar.value + + + + + + catalog_product_entity_varchar.value @@ -901,6 +909,14 @@ + + catalog_product_entity_varchar.value + + + + + + cms_page.root_template diff --git a/etc/ce-to-ee/1.8.1.0/map.xml.dist b/etc/ce-to-ee/1.8.1.0/map.xml.dist index 8a2b5b21e..77b375078 100644 --- a/etc/ce-to-ee/1.8.1.0/map.xml.dist +++ b/etc/ce-to-ee/1.8.1.0/map.xml.dist @@ -891,6 +891,14 @@ + + catalog_category_entity_varchar.value + + + + + + catalog_product_entity_varchar.value @@ -898,6 +906,14 @@ + + catalog_product_entity_varchar.value + + + + + + cms_page.root_template diff --git a/etc/ce-to-ee/1.9.0.0/map.xml.dist b/etc/ce-to-ee/1.9.0.0/map.xml.dist index dba0b6b00..5c13bb324 100644 --- a/etc/ce-to-ee/1.9.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.9.0.0/map.xml.dist @@ -894,6 +894,14 @@ + + catalog_category_entity_varchar.value + + + + + + catalog_product_entity_varchar.value @@ -901,6 +909,14 @@ + + catalog_product_entity_varchar.value + + + + + + cms_page.root_template diff --git a/etc/ce-to-ee/1.9.0.1/map.xml.dist b/etc/ce-to-ee/1.9.0.1/map.xml.dist index 0dd5ab4e5..1b3180362 100644 --- a/etc/ce-to-ee/1.9.0.1/map.xml.dist +++ b/etc/ce-to-ee/1.9.0.1/map.xml.dist @@ -894,6 +894,14 @@ + + catalog_category_entity_varchar.value + + + + + + catalog_product_entity_varchar.value @@ -901,6 +909,14 @@ + + catalog_product_entity_varchar.value + + + + + + cms_page.root_template diff --git a/etc/ce-to-ee/1.9.1.0/map.xml.dist b/etc/ce-to-ee/1.9.1.0/map.xml.dist index 52176d5fb..2cf4c815a 100644 --- a/etc/ce-to-ee/1.9.1.0/map.xml.dist +++ b/etc/ce-to-ee/1.9.1.0/map.xml.dist @@ -876,6 +876,14 @@ + + catalog_category_entity_varchar.value + + + + + + catalog_product_entity_varchar.value @@ -883,6 +891,14 @@ + + catalog_product_entity_varchar.value + + + + + + cms_page.root_template diff --git a/etc/ce-to-ee/1.9.1.1/map.xml.dist b/etc/ce-to-ee/1.9.1.1/map.xml.dist index 52176d5fb..2cf4c815a 100644 --- a/etc/ce-to-ee/1.9.1.1/map.xml.dist +++ b/etc/ce-to-ee/1.9.1.1/map.xml.dist @@ -876,6 +876,14 @@ + + catalog_category_entity_varchar.value + + + + + + catalog_product_entity_varchar.value @@ -883,6 +891,14 @@ + + catalog_product_entity_varchar.value + + + + + + cms_page.root_template diff --git a/etc/ce-to-ee/1.9.2.0/map.xml.dist b/etc/ce-to-ee/1.9.2.0/map.xml.dist index 47aa52840..ae3930b23 100644 --- a/etc/ce-to-ee/1.9.2.0/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.0/map.xml.dist @@ -876,6 +876,14 @@ + + catalog_category_entity_varchar.value + + + + + + catalog_product_entity_varchar.value @@ -883,6 +891,14 @@ + + catalog_product_entity_varchar.value + + + + + + cms_page.root_template diff --git a/etc/ce-to-ee/1.9.2.1/map.xml.dist b/etc/ce-to-ee/1.9.2.1/map.xml.dist index 47aa52840..ae3930b23 100644 --- a/etc/ce-to-ee/1.9.2.1/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.1/map.xml.dist @@ -876,6 +876,14 @@ + + catalog_category_entity_varchar.value + + + + + + catalog_product_entity_varchar.value @@ -883,6 +891,14 @@ + + catalog_product_entity_varchar.value + + + + + + cms_page.root_template diff --git a/etc/ce-to-ee/1.9.2.2/map.xml.dist b/etc/ce-to-ee/1.9.2.2/map.xml.dist index 0d2423445..12270c3ac 100644 --- a/etc/ce-to-ee/1.9.2.2/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.2/map.xml.dist @@ -882,6 +882,14 @@ + + catalog_category_entity_varchar.value + + + + + + catalog_product_entity_varchar.value @@ -889,6 +897,14 @@ + + catalog_product_entity_varchar.value + + + + + + cms_page.root_template diff --git a/etc/ce-to-ee/1.9.2.3/map.xml.dist b/etc/ce-to-ee/1.9.2.3/map.xml.dist index 0d2423445..12270c3ac 100644 --- a/etc/ce-to-ee/1.9.2.3/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.3/map.xml.dist @@ -882,6 +882,14 @@ + + catalog_category_entity_varchar.value + + + + + + catalog_product_entity_varchar.value @@ -889,6 +897,14 @@ + + catalog_product_entity_varchar.value + + + + + + cms_page.root_template diff --git a/etc/ce-to-ee/1.9.2.4/map.xml.dist b/etc/ce-to-ee/1.9.2.4/map.xml.dist index 0d2423445..12270c3ac 100644 --- a/etc/ce-to-ee/1.9.2.4/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.4/map.xml.dist @@ -882,6 +882,14 @@ + + catalog_category_entity_varchar.value + + + + + + catalog_product_entity_varchar.value @@ -889,6 +897,14 @@ + + catalog_product_entity_varchar.value + + + + + + cms_page.root_template 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 index 0888c246f..a1d48ae11 100644 --- a/etc/ee-to-ee/1.11.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.0/map.xml.dist @@ -1271,6 +1271,14 @@ + + catalog_category_entity_varchar.value + + + + + + catalog_product_entity_varchar.value @@ -1278,6 +1286,14 @@ + + catalog_product_entity_varchar.value + + + + + + cms_page.root_template 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 index a2f9a17cf..74be6b789 100644 --- a/etc/ee-to-ee/1.11.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.1/map.xml.dist @@ -1271,6 +1271,14 @@ + + catalog_category_entity_varchar.value + + + + + + catalog_product_entity_varchar.value @@ -1278,6 +1286,14 @@ + + catalog_product_entity_varchar.value + + + + + + cms_page.root_template 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 index a2f9a17cf..74be6b789 100644 --- a/etc/ee-to-ee/1.11.0.2/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.2/map.xml.dist @@ -1271,6 +1271,14 @@ + + catalog_category_entity_varchar.value + + + + + + catalog_product_entity_varchar.value @@ -1278,6 +1286,14 @@ + + catalog_product_entity_varchar.value + + + + + + cms_page.root_template 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 index 502e92f6f..b26c07453 100644 --- a/etc/ee-to-ee/1.11.1.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.1.0/map.xml.dist @@ -1271,6 +1271,14 @@ + + catalog_category_entity_varchar.value + + + + + + catalog_product_entity_varchar.value @@ -1278,6 +1286,14 @@ + + catalog_product_entity_varchar.value + + + + + + cms_page.root_template 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 index d7abdbfe4..e33724eed 100644 --- a/etc/ee-to-ee/1.11.2.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.2.0/map.xml.dist @@ -1271,6 +1271,14 @@ + + catalog_category_entity_varchar.value + + + + + + catalog_product_entity_varchar.value @@ -1278,6 +1286,14 @@ + + catalog_product_entity_varchar.value + + + + + + cms_page.root_template 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 index 8be94ff00..e098ecc04 100644 --- a/etc/ee-to-ee/1.12.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.0/map.xml.dist @@ -1269,6 +1269,14 @@ + + catalog_category_entity_varchar.value + + + + + + catalog_product_entity_varchar.value @@ -1276,6 +1284,14 @@ + + catalog_product_entity_varchar.value + + + + + + cms_page.root_template 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 index f64eeec42..877b7dab8 100644 --- a/etc/ee-to-ee/1.12.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.1/map.xml.dist @@ -1269,6 +1269,14 @@ + + catalog_category_entity_varchar.value + + + + + + catalog_product_entity_varchar.value @@ -1276,6 +1284,14 @@ + + catalog_product_entity_varchar.value + + + + + + cms_page.root_template 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 index f64eeec42..877b7dab8 100644 --- a/etc/ee-to-ee/1.12.0.2/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.2/map.xml.dist @@ -1269,6 +1269,14 @@ + + catalog_category_entity_varchar.value + + + + + + catalog_product_entity_varchar.value @@ -1276,6 +1284,14 @@ + + catalog_product_entity_varchar.value + + + + + + cms_page.root_template From 543873a1fd95980fede6c30f47430faac5ae46f4 Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Tue, 14 Jun 2016 12:52:12 +0300 Subject: [PATCH 39/71] MAGETWO-52158: [GitHub] Wrong URL addresses for products and categories #59 --- src/Migration/Handler/TruncateSuffix.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Migration/Handler/TruncateSuffix.php b/src/Migration/Handler/TruncateSuffix.php index 79c8fba2d..7c7bc2456 100644 --- a/src/Migration/Handler/TruncateSuffix.php +++ b/src/Migration/Handler/TruncateSuffix.php @@ -129,7 +129,8 @@ protected function getSuffix() $query = $adapter->getSelect()->from($this->source->addDocumentPrefix('core_config_data'), ['value']) ->where('path = ?', $this->suffixPath) ->limit(1); - $this->suffix = $query->getAdapter()->fetchOne($query) !== false ?: self::DEFAULT_SUFFIX; + $result = $query->getAdapter()->fetchOne($query); + $this->suffix = $result !== false ? $result : self::DEFAULT_SUFFIX; } return $this->suffix; } From acb7392f76beb81bb62a5ece30cf879ea2c400b6 Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Thu, 16 Jun 2016 14:04:39 +0300 Subject: [PATCH 40/71] MAGETWO-54366: Error Column not found on Admin > Products > Catalog page --- etc/ce-to-ce/eav-document-groups.xml.dist | 2 +- etc/ce-to-ee/eav-document-groups.xml.dist | 2 +- etc/ee-to-ee/eav-document-groups.xml.dist | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/ce-to-ce/eav-document-groups.xml.dist b/etc/ce-to-ce/eav-document-groups.xml.dist index 23ba4b336..c4940cbd6 100644 --- a/etc/ce-to-ce/eav-document-groups.xml.dist +++ b/etc/ce-to-ce/eav-document-groups.xml.dist @@ -18,6 +18,6 @@ catalog_eav_attribute customer_eav_attribute - eav_entity_type + eav_entity_type diff --git a/etc/ce-to-ee/eav-document-groups.xml.dist b/etc/ce-to-ee/eav-document-groups.xml.dist index 23ba4b336..c4940cbd6 100644 --- a/etc/ce-to-ee/eav-document-groups.xml.dist +++ b/etc/ce-to-ee/eav-document-groups.xml.dist @@ -18,6 +18,6 @@ catalog_eav_attribute customer_eav_attribute - eav_entity_type + eav_entity_type diff --git a/etc/ee-to-ee/eav-document-groups.xml.dist b/etc/ee-to-ee/eav-document-groups.xml.dist index 597481a1f..dbfcc9089 100644 --- a/etc/ee-to-ee/eav-document-groups.xml.dist +++ b/etc/ee-to-ee/eav-document-groups.xml.dist @@ -19,7 +19,7 @@ catalog_eav_attribute customer_eav_attribute - eav_entity_type + eav_entity_type enterprise_rma_item_eav_attribute From d6c1995ba4ec46d530c86456b6374d5847133b1d Mon Sep 17 00:00:00 2001 From: Ruslan Kostiv Date: Thu, 16 Jun 2016 16:12:01 +0300 Subject: [PATCH 41/71] MAGETWO-51382: integrity check errors --- etc/ce-to-ce/1.6.0.0/map.xml.dist | 75 ++++++++++++++++++++++ etc/ce-to-ce/1.6.1.0/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ce/1.6.2.0/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ce/1.7.0.0/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ce/1.7.0.1/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ce/1.8.0.0/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ce/1.8.1.0/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ce/1.9.0.0/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ce/1.9.0.1/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ce/1.9.1.0/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ce/1.9.1.1/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ce/1.9.2.0/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ce/1.9.2.1/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ce/1.9.2.2/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ce/1.9.2.3/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ce/1.9.2.4/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ee/1.6.0.0/map.xml.dist | 75 ++++++++++++++++++++++ etc/ce-to-ee/1.6.1.0/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ee/1.6.2.0/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ee/1.7.0.0/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ee/1.7.0.1/map.xml.dist | 100 ++++++++++++++++++++++++----- etc/ce-to-ee/1.7.0.2/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ee/1.8.0.0/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ee/1.8.1.0/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ee/1.9.0.0/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ee/1.9.0.1/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ee/1.9.1.0/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ee/1.9.1.1/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ee/1.9.2.0/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ee/1.9.2.1/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ee/1.9.2.2/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ee/1.9.2.3/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ce-to-ee/1.9.2.4/map.xml.dist | 84 ++++++++++++++++++++++++ etc/ee-to-ee/1.11.0.0/map.xml.dist | 75 ++++++++++++++++++++++ etc/ee-to-ee/1.11.0.1/map.xml.dist | 75 ++++++++++++++++++++++ etc/ee-to-ee/1.11.0.2/map.xml.dist | 75 ++++++++++++++++++++++ etc/ee-to-ee/1.11.1.0/map.xml.dist | 75 ++++++++++++++++++++++ etc/ee-to-ee/1.11.2.0/map.xml.dist | 75 ++++++++++++++++++++++ etc/ee-to-ee/1.12.0.0/map.xml.dist | 75 ++++++++++++++++++++++ etc/ee-to-ee/1.12.0.1/map.xml.dist | 75 ++++++++++++++++++++++ etc/ee-to-ee/1.12.0.2/map.xml.dist | 75 ++++++++++++++++++++++ etc/ee-to-ee/1.13.0.0/map.xml.dist | 75 ++++++++++++++++++++++ etc/ee-to-ee/1.13.0.1/map.xml.dist | 75 ++++++++++++++++++++++ etc/ee-to-ee/1.13.0.2/map.xml.dist | 75 ++++++++++++++++++++++ etc/ee-to-ee/1.13.1.0/map.xml.dist | 75 ++++++++++++++++++++++ etc/ee-to-ee/1.14.0.0/map.xml.dist | 75 ++++++++++++++++++++++ etc/ee-to-ee/1.14.0.1/map.xml.dist | 75 ++++++++++++++++++++++ etc/ee-to-ee/1.14.1.0/map.xml.dist | 75 ++++++++++++++++++++++ etc/ee-to-ee/1.14.2.0/map.xml.dist | 75 ++++++++++++++++++++++ etc/ee-to-ee/1.14.2.1/map.xml.dist | 75 ++++++++++++++++++++++ etc/ee-to-ee/1.14.2.2/map.xml.dist | 75 ++++++++++++++++++++++ etc/ee-to-ee/1.14.2.3/map.xml.dist | 75 ++++++++++++++++++++++ etc/ee-to-ee/1.14.2.4/map.xml.dist | 75 ++++++++++++++++++++++ 53 files changed, 4254 insertions(+), 16 deletions(-) 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 index 1f9a49c41..e57dd1a42 100644 --- a/etc/ce-to-ce/1.6.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.0.0/map.xml.dist @@ -1082,6 +1082,81 @@ catalogsearch_query.synonym_for + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index 5db3b0d53..f8a615726 100644 --- a/etc/ce-to-ce/1.6.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.1.0/map.xml.dist @@ -500,6 +500,15 @@ strikeiron_tax_rate + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1085,6 +1094,81 @@ catalogsearch_query.synonym_for + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index b7ca8e309..d43b05c02 100644 --- a/etc/ce-to-ce/1.6.2.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.2.0/map.xml.dist @@ -500,6 +500,15 @@ strikeiron_tax_rate + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1085,6 +1094,81 @@ catalogsearch_query.synonym_for + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index 334fdcf67..dc1466e28 100644 --- a/etc/ce-to-ce/1.7.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.0/map.xml.dist @@ -509,6 +509,15 @@ catalog_product_entity_tier_price + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1054,6 +1063,81 @@ catalogsearch_query.synonym_for + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index 334fdcf67..dc1466e28 100644 --- a/etc/ce-to-ce/1.7.0.1/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.1/map.xml.dist @@ -509,6 +509,15 @@ catalog_product_entity_tier_price + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1054,6 +1063,81 @@ catalogsearch_query.synonym_for + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index 4161f808a..4aac5c9c0 100644 --- a/etc/ce-to-ce/1.8.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.8.0.0/map.xml.dist @@ -509,6 +509,15 @@ catalog_product_entity_tier_price + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1054,6 +1063,81 @@ catalogsearch_query.synonym_for + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index d01e6e015..e6dc52251 100644 --- a/etc/ce-to-ce/1.8.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.8.1.0/map.xml.dist @@ -506,6 +506,15 @@ catalog_product_entity_tier_price + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1051,6 +1060,81 @@ catalogsearch_query.synonym_for + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index b5a881037..10a3be2b7 100644 --- a/etc/ce-to-ce/1.9.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.0.0/map.xml.dist @@ -509,6 +509,15 @@ catalog_product_entity_tier_price + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1054,6 +1063,81 @@ catalogsearch_query.synonym_for + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index b5a881037..10a3be2b7 100644 --- a/etc/ce-to-ce/1.9.0.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.0.1/map.xml.dist @@ -509,6 +509,15 @@ catalog_product_entity_tier_price + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1054,6 +1063,81 @@ catalogsearch_query.synonym_for + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index 3ee3d4dd1..342afe502 100644 --- a/etc/ce-to-ce/1.9.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.1.0/map.xml.dist @@ -491,6 +491,15 @@ catalog_product_entity_tier_price + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1036,6 +1045,81 @@ catalogsearch_query.synonym_for + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index 3ee3d4dd1..342afe502 100644 --- a/etc/ce-to-ce/1.9.1.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.1.1/map.xml.dist @@ -491,6 +491,15 @@ catalog_product_entity_tier_price + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1036,6 +1045,81 @@ catalogsearch_query.synonym_for + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index 8da5406c4..d1a557eca 100644 --- a/etc/ce-to-ce/1.9.2.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.0/map.xml.dist @@ -491,6 +491,15 @@ catalog_product_entity_tier_price + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1044,6 +1053,81 @@ catalogsearch_query.synonym_for + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index 8da5406c4..d1a557eca 100644 --- a/etc/ce-to-ce/1.9.2.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.1/map.xml.dist @@ -491,6 +491,15 @@ catalog_product_entity_tier_price + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1044,6 +1053,81 @@ catalogsearch_query.synonym_for + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month diff --git a/etc/ce-to-ce/1.9.2.2/map.xml.dist b/etc/ce-to-ce/1.9.2.2/map.xml.dist index fa7f9ebd5..884d32397 100644 --- a/etc/ce-to-ce/1.9.2.2/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.2/map.xml.dist @@ -497,6 +497,15 @@ permission_variable + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1050,6 +1059,81 @@ catalogsearch_query.synonym_for + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month diff --git a/etc/ce-to-ce/1.9.2.3/map.xml.dist b/etc/ce-to-ce/1.9.2.3/map.xml.dist index fa7f9ebd5..884d32397 100644 --- a/etc/ce-to-ce/1.9.2.3/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.3/map.xml.dist @@ -497,6 +497,15 @@ permission_variable + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1050,6 +1059,81 @@ catalogsearch_query.synonym_for + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month diff --git a/etc/ce-to-ce/1.9.2.4/map.xml.dist b/etc/ce-to-ce/1.9.2.4/map.xml.dist index fa7f9ebd5..884d32397 100644 --- a/etc/ce-to-ce/1.9.2.4/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.4/map.xml.dist @@ -497,6 +497,15 @@ permission_variable + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1050,6 +1059,81 @@ catalogsearch_query.synonym_for + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.6.0.0/map.xml.dist b/etc/ce-to-ee/1.6.0.0/map.xml.dist index 3832019dd..bc3c7f6fb 100644 --- a/etc/ce-to-ee/1.6.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.6.0.0/map.xml.dist @@ -1202,6 +1202,81 @@ catalogsearch_query.synonym_for + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.6.1.0/map.xml.dist b/etc/ce-to-ee/1.6.1.0/map.xml.dist index 0a0ddc6e1..8a01e2a1a 100644 --- a/etc/ce-to-ee/1.6.1.0/map.xml.dist +++ b/etc/ce-to-ee/1.6.1.0/map.xml.dist @@ -512,6 +512,15 @@ core_website + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1205,6 +1214,81 @@ catalogrule_product.sub_discount_amount + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.6.2.0/map.xml.dist b/etc/ce-to-ee/1.6.2.0/map.xml.dist index 004ee7b07..602a2183b 100644 --- a/etc/ce-to-ee/1.6.2.0/map.xml.dist +++ b/etc/ce-to-ee/1.6.2.0/map.xml.dist @@ -512,6 +512,15 @@ core_website + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1205,6 +1214,81 @@ catalogrule_product.sub_discount_amount + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.7.0.0/map.xml.dist b/etc/ce-to-ee/1.7.0.0/map.xml.dist index 5894162c4..8acd249bc 100644 --- a/etc/ce-to-ee/1.7.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.7.0.0/map.xml.dist @@ -509,6 +509,15 @@ catalog_product_entity_tier_price + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1162,6 +1171,81 @@ catalogrule_product.sub_discount_amount + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.7.0.1/map.xml.dist b/etc/ce-to-ee/1.7.0.1/map.xml.dist index 5894162c4..93e84da96 100644 --- a/etc/ce-to-ee/1.7.0.1/map.xml.dist +++ b/etc/ce-to-ee/1.7.0.1/map.xml.dist @@ -509,6 +509,15 @@ catalog_product_entity_tier_price + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -894,14 +903,6 @@ - - catalog_category_entity_varchar.value - - - - - - catalog_product_entity_varchar.value @@ -909,14 +910,6 @@ - - catalog_product_entity_varchar.value - - - - - - cms_page.root_template @@ -1162,6 +1155,81 @@ catalogrule_product.sub_discount_amount + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.7.0.2/map.xml.dist b/etc/ce-to-ee/1.7.0.2/map.xml.dist index 5894162c4..8acd249bc 100644 --- a/etc/ce-to-ee/1.7.0.2/map.xml.dist +++ b/etc/ce-to-ee/1.7.0.2/map.xml.dist @@ -509,6 +509,15 @@ catalog_product_entity_tier_price + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1162,6 +1171,81 @@ catalogrule_product.sub_discount_amount + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.8.0.0/map.xml.dist b/etc/ce-to-ee/1.8.0.0/map.xml.dist index 1b3180362..490b3d48c 100644 --- a/etc/ce-to-ee/1.8.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.8.0.0/map.xml.dist @@ -509,6 +509,15 @@ catalog_product_entity_tier_price + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1162,6 +1171,81 @@ catalogrule_product.sub_discount_amount + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.8.1.0/map.xml.dist b/etc/ce-to-ee/1.8.1.0/map.xml.dist index 77b375078..bd8c49bb2 100644 --- a/etc/ce-to-ee/1.8.1.0/map.xml.dist +++ b/etc/ce-to-ee/1.8.1.0/map.xml.dist @@ -506,6 +506,15 @@ catalog_product_entity_tier_price + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1159,6 +1168,81 @@ catalogrule_product.sub_discount_amount + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.9.0.0/map.xml.dist b/etc/ce-to-ee/1.9.0.0/map.xml.dist index 5c13bb324..f035943b6 100644 --- a/etc/ce-to-ee/1.9.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.9.0.0/map.xml.dist @@ -509,6 +509,15 @@ catalog_product_entity_tier_price + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1162,6 +1171,81 @@ catalogrule_product.sub_discount_amount + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.9.0.1/map.xml.dist b/etc/ce-to-ee/1.9.0.1/map.xml.dist index 1b3180362..490b3d48c 100644 --- a/etc/ce-to-ee/1.9.0.1/map.xml.dist +++ b/etc/ce-to-ee/1.9.0.1/map.xml.dist @@ -509,6 +509,15 @@ catalog_product_entity_tier_price + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1162,6 +1171,81 @@ catalogrule_product.sub_discount_amount + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.9.1.0/map.xml.dist b/etc/ce-to-ee/1.9.1.0/map.xml.dist index 2cf4c815a..32be333d1 100644 --- a/etc/ce-to-ee/1.9.1.0/map.xml.dist +++ b/etc/ce-to-ee/1.9.1.0/map.xml.dist @@ -491,6 +491,15 @@ catalog_product_entity_tier_price + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1144,6 +1153,81 @@ catalogrule_product.sub_discount_amount + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.9.1.1/map.xml.dist b/etc/ce-to-ee/1.9.1.1/map.xml.dist index 2cf4c815a..32be333d1 100644 --- a/etc/ce-to-ee/1.9.1.1/map.xml.dist +++ b/etc/ce-to-ee/1.9.1.1/map.xml.dist @@ -491,6 +491,15 @@ catalog_product_entity_tier_price + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1144,6 +1153,81 @@ catalogrule_product.sub_discount_amount + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.9.2.0/map.xml.dist b/etc/ce-to-ee/1.9.2.0/map.xml.dist index ae3930b23..e97ca05ed 100644 --- a/etc/ce-to-ee/1.9.2.0/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.0/map.xml.dist @@ -491,6 +491,15 @@ catalog_product_entity_tier_price + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1152,6 +1161,81 @@ catalogrule_product.sub_discount_amount + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.9.2.1/map.xml.dist b/etc/ce-to-ee/1.9.2.1/map.xml.dist index ae3930b23..e97ca05ed 100644 --- a/etc/ce-to-ee/1.9.2.1/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.1/map.xml.dist @@ -491,6 +491,15 @@ catalog_product_entity_tier_price + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1152,6 +1161,81 @@ catalogrule_product.sub_discount_amount + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.9.2.2/map.xml.dist b/etc/ce-to-ee/1.9.2.2/map.xml.dist index 12270c3ac..336423a85 100644 --- a/etc/ce-to-ee/1.9.2.2/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.2/map.xml.dist @@ -497,6 +497,15 @@ permission_variable + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1158,6 +1167,81 @@ catalogrule_product.sub_discount_amount + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.9.2.3/map.xml.dist b/etc/ce-to-ee/1.9.2.3/map.xml.dist index 12270c3ac..336423a85 100644 --- a/etc/ce-to-ee/1.9.2.3/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.3/map.xml.dist @@ -497,6 +497,15 @@ permission_variable + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1158,6 +1167,81 @@ catalogrule_product.sub_discount_amount + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month diff --git a/etc/ce-to-ee/1.9.2.4/map.xml.dist b/etc/ce-to-ee/1.9.2.4/map.xml.dist index 12270c3ac..336423a85 100644 --- a/etc/ce-to-ee/1.9.2.4/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.4/map.xml.dist @@ -497,6 +497,15 @@ permission_variable + + googlebase_attributes + + + googlebase_items + + + googlebase_types + catalogsearch_query search_query @@ -1158,6 +1167,81 @@ catalogrule_product.sub_discount_amount + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index a1d48ae11..3ee8256e8 100644 --- a/etc/ee-to-ee/1.11.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.0/map.xml.dist @@ -1640,6 +1640,81 @@ cms_page.under_version_control + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index 74be6b789..3bea1e5a5 100644 --- a/etc/ee-to-ee/1.11.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.1/map.xml.dist @@ -1640,6 +1640,81 @@ cms_page.under_version_control + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index 74be6b789..3bea1e5a5 100644 --- a/etc/ee-to-ee/1.11.0.2/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.2/map.xml.dist @@ -1640,6 +1640,81 @@ cms_page.under_version_control + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index b26c07453..57311f1c2 100644 --- a/etc/ee-to-ee/1.11.1.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.1.0/map.xml.dist @@ -1640,6 +1640,81 @@ cms_page.under_version_control + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index e33724eed..ca64df908 100644 --- a/etc/ee-to-ee/1.11.2.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.2.0/map.xml.dist @@ -1640,6 +1640,81 @@ cms_page.under_version_control + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index e098ecc04..e6aa32339 100644 --- a/etc/ee-to-ee/1.12.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.0/map.xml.dist @@ -1610,6 +1610,81 @@ cms_page.under_version_control + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index 877b7dab8..738692a97 100644 --- a/etc/ee-to-ee/1.12.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.1/map.xml.dist @@ -1610,6 +1610,81 @@ cms_page.under_version_control + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index 877b7dab8..738692a97 100644 --- a/etc/ee-to-ee/1.12.0.2/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.2/map.xml.dist @@ -1610,6 +1610,81 @@ cms_page.under_version_control + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index f9def247b..f15a1c8a1 100644 --- a/etc/ee-to-ee/1.13.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.13.0.0/map.xml.dist @@ -1594,6 +1594,81 @@ cms_page.under_version_control + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index f9def247b..f15a1c8a1 100644 --- a/etc/ee-to-ee/1.13.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.13.0.1/map.xml.dist @@ -1594,6 +1594,81 @@ cms_page.under_version_control + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index f9def247b..f15a1c8a1 100644 --- a/etc/ee-to-ee/1.13.0.2/map.xml.dist +++ b/etc/ee-to-ee/1.13.0.2/map.xml.dist @@ -1594,6 +1594,81 @@ cms_page.under_version_control + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index 113c354bc..59a44251a 100644 --- a/etc/ee-to-ee/1.13.1.0/map.xml.dist +++ b/etc/ee-to-ee/1.13.1.0/map.xml.dist @@ -1600,6 +1600,81 @@ cms_page.under_version_control + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index 5979fbb7f..c488b785d 100644 --- a/etc/ee-to-ee/1.14.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.14.0.0/map.xml.dist @@ -1600,6 +1600,81 @@ cms_page.under_version_control + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index 5979fbb7f..c488b785d 100644 --- a/etc/ee-to-ee/1.14.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.14.0.1/map.xml.dist @@ -1600,6 +1600,81 @@ cms_page.under_version_control + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index 06b8d8a05..c4d9fad1c 100644 --- a/etc/ee-to-ee/1.14.1.0/map.xml.dist +++ b/etc/ee-to-ee/1.14.1.0/map.xml.dist @@ -1608,6 +1608,81 @@ cms_page.under_version_control + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index e9dda618b..6baa0ff1f 100644 --- a/etc/ee-to-ee/1.14.2.0/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.0/map.xml.dist @@ -1624,6 +1624,81 @@ cms_page.under_version_control + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index e9dda618b..6baa0ff1f 100644 --- a/etc/ee-to-ee/1.14.2.1/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.1/map.xml.dist @@ -1624,6 +1624,81 @@ cms_page.under_version_control + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index 01325a3f4..6310440d0 100644 --- a/etc/ee-to-ee/1.14.2.2/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.2/map.xml.dist @@ -1630,6 +1630,81 @@ cms_page.under_version_control + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index 01325a3f4..6310440d0 100644 --- a/etc/ee-to-ee/1.14.2.3/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.3/map.xml.dist @@ -1630,6 +1630,81 @@ cms_page.under_version_control + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month 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 index 01325a3f4..6310440d0 100644 --- a/etc/ee-to-ee/1.14.2.4/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.4/map.xml.dist @@ -1630,6 +1630,81 @@ cms_page.under_version_control + + sales_flat_invoice.customer_id + + + sales_flat_invoice.invoice_status_id + + + sales_flat_invoice.invoice_type + + + sales_flat_invoice.is_virtual + + + sales_flat_invoice.real_order_id + + + sales_flat_invoice.total_due + + + sales_flat_invoice.total_paid + + + sales_flat_invoice_item.shipment_id + + + sales_flat_order.base_custbalance_amount + + + sales_flat_order.currency_base_id + + + sales_flat_order.currency_code + + + sales_flat_order.currency_rate + + + sales_flat_order.custbalance_amount + + + sales_flat_order.is_hold + + + sales_flat_order.is_multi_payment + + + sales_flat_order.real_order_id + + + sales_flat_order.tax_percent + + + sales_flat_order.tracking_numbers + + + sales_flat_order_address.address_id + + + sales_flat_order_address.gift_message_id + + + sales_flat_order_address.tax_id + + + sales_flat_order_payment.amount + + + sales_flat_order_payment.cc_raw_request + + + sales_flat_order_payment.cc_raw_response + + + sales_flat_order_payment.customer_payment_id + sales_flat_quote_payment.cc_exp_month From eff5cd0a5b993baee938f76a9d694784e48d0fa8 Mon Sep 17 00:00:00 2001 From: Ruslan Kostiv Date: Thu, 16 Jun 2016 16:17:59 +0300 Subject: [PATCH 42/71] MAGETWO-51382: integrity check errors --- etc/ce-to-ee/1.7.0.1/map.xml.dist | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/etc/ce-to-ee/1.7.0.1/map.xml.dist b/etc/ce-to-ee/1.7.0.1/map.xml.dist index 93e84da96..8acd249bc 100644 --- a/etc/ce-to-ee/1.7.0.1/map.xml.dist +++ b/etc/ce-to-ee/1.7.0.1/map.xml.dist @@ -903,6 +903,14 @@ + + catalog_category_entity_varchar.value + + + + + + catalog_product_entity_varchar.value @@ -910,6 +918,14 @@ + + catalog_product_entity_varchar.value + + + + + + cms_page.root_template From 93b299fe4102b6b402aac7cf11f9094dfcd77c9b Mon Sep 17 00:00:00 2001 From: Yurii Hryhoriev Date: Tue, 21 Jun 2016 18:00:49 +0300 Subject: [PATCH 43/71] MAGETWO-54452: Cannot open a product in admin panel --- src/Migration/Step/PostProcessing/Data.php | 38 +++++++++++++--------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/src/Migration/Step/PostProcessing/Data.php b/src/Migration/Step/PostProcessing/Data.php index 2936b5400..308d50b4c 100644 --- a/src/Migration/Step/PostProcessing/Data.php +++ b/src/Migration/Step/PostProcessing/Data.php @@ -80,7 +80,7 @@ public function __construct( public function perform() { $this->progress->start($this->getIterationsCount(), LogManager::LOG_LEVEL_INFO); - $this->deleteIgnoredProductAttributeValues(); + $this->deleteMissingProductAttributeValues(); $this->progress->finish(LogManager::LOG_LEVEL_INFO); return true; } @@ -90,9 +90,9 @@ public function perform() * * @return void */ - protected function deleteIgnoredProductAttributeValues() + protected function deleteMissingProductAttributeValues() { - $attributeIds = $this->getIgnoredProductAttributeIds(); + $attributeIds = $this->getMissingProductAttributeIds(); if (!$attributeIds) { return ; } @@ -102,20 +102,28 @@ protected function deleteIgnoredProductAttributeValues() } } - /** - * @return array - */ - protected function getIgnoredProductAttributeIds() + protected function getMissingProductAttributeIds() { - $attributeCodes = array_keys($this->readerAttributes->getGroup('ignore')); /** @var \Migration\ResourceModel\Adapter\Mysql $adapter */ - $adapter = $this->source->getAdapter(); - $select = $adapter->getSelect()->from( - ['ea' => $this->helper->getEavAttributeDocument()], - ['attribute_id'] - )->where('ea.attribute_code IN (?)', $attributeCodes - )->where('ea.entity_type_id = 4'); - return $select->getAdapter()->fetchCol($select); + $adapter = $this->destination->getAdapter(); + + $selects = []; + foreach ($this->helper->getProductDestinationDocumentFields() as $document => $fields) { + $selects[] = $adapter->getSelect()->from( + ['ea' => $this->helper->getEavAttributeDocument()], + [] + )->joinRight( + ['j' => $document], + 'j.attribute_id = ea.attribute_id', + ['attribute_id'] + )->where( + 'ea.attribute_id IS NULL' + )->group( + 'j.attribute_id' + ); + } + $query = $adapter->getSelect()->union($selects, \Zend_Db_Select::SQL_UNION); + return $query->getAdapter()->fetchCol($query); } /** From e555780f9715cbc7b45bffe55cbf1a341cd05281 Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Wed, 22 Jun 2016 09:23:36 +0300 Subject: [PATCH 44/71] MAGETWO-48593: Adapt Data Migration Tool to Magento 2.1 MLS12 --- src/Migration/Step/Customer/Data.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Migration/Step/Customer/Data.php b/src/Migration/Step/Customer/Data.php index 5b1ba1fd8..0f73f12bc 100644 --- a/src/Migration/Step/Customer/Data.php +++ b/src/Migration/Step/Customer/Data.php @@ -113,6 +113,7 @@ public function perform() $this->progress->start($this->getIterationsCount(), LogManager::LOG_LEVEL_INFO); $sourceDocuments = array_keys($this->readerGroups->getGroup('source_documents')); foreach ($sourceDocuments as $sourceDocName) { + $this->progress->advance(LogManager::LOG_LEVEL_INFO); $sourceDocument = $this->source->getDocument($sourceDocName); $destinationName = $this->map->getDocumentMap($sourceDocName, MapInterface::TYPE_SOURCE); if (!$destinationName) { @@ -155,7 +156,6 @@ public function perform() $recordTransformer->transform($record, $destRecord); $destinationRecords->addRecord($destRecord); } - $this->progress->advance(LogManager::LOG_LEVEL_INFO); $this->progress->advance(LogManager::LOG_LEVEL_DEBUG); $this->helper->updateAttributeData($attributeType, $sourceDocName, $destinationRecords); From aeec5f0ce918d9539dac7abfab661bacc2a2885e Mon Sep 17 00:00:00 2001 From: Yurii Hryhoriev Date: Wed, 22 Jun 2016 10:08:13 +0300 Subject: [PATCH 45/71] MAGETWO-54452: Cannot open a product in admin panel --- src/Migration/Step/PostProcessing/Data.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Migration/Step/PostProcessing/Data.php b/src/Migration/Step/PostProcessing/Data.php index 308d50b4c..580d7fb7c 100644 --- a/src/Migration/Step/PostProcessing/Data.php +++ b/src/Migration/Step/PostProcessing/Data.php @@ -86,7 +86,7 @@ public function perform() } /** - * Delete remains of ignored product attributes in eav value tables + * Deletes product attributes in eav value tables for non existing attributes * * @return void */ @@ -102,6 +102,9 @@ protected function deleteMissingProductAttributeValues() } } + /** + * @return array + */ protected function getMissingProductAttributeIds() { /** @var \Migration\ResourceModel\Adapter\Mysql $adapter */ From 4e3d2fdfd0dec1d8c843bf5bce48609c3e9174c4 Mon Sep 17 00:00:00 2001 From: Yurii Hryhoriev Date: Fri, 24 Jun 2016 17:19:35 +0300 Subject: [PATCH 46/71] MAGETWO-54642: Cannot save product after migration --- src/Migration/Step/Eav/Data.php | 59 +++++++++++++++++++++++--- src/Migration/Step/Eav/Helper.php | 14 +++--- src/Migration/Step/Eav/InitialData.php | 17 +++++--- 3 files changed, 69 insertions(+), 21 deletions(-) diff --git a/src/Migration/Step/Eav/Data.php b/src/Migration/Step/Eav/Data.php index a45319503..1835d7b63 100644 --- a/src/Migration/Step/Eav/Data.php +++ b/src/Migration/Step/Eav/Data.php @@ -203,7 +203,6 @@ protected function migrateAttributeSetsAndGroups() $recordsToSave = $this->addScheduleDesignToAttributeGroups($recordsToSave, $documentName); } - $this->destination->clearDocument($destinationDocument->getName()); $this->saveRecords($destinationDocument, $recordsToSave); if ($documentName == 'eav_attribute_set') { @@ -230,7 +229,8 @@ protected function addScheduleDesignToAttributeGroups($recordsToSave, $documentN ['eas' => $this->source->addDocumentPrefix('eav_attribute_set')], ['attribute_set_id'] )->where( - 'entity_type_id = ?', self::ENTITY_TYPE_ID_CATALOG_PRODUCT + 'entity_type_id = ?', + self::ENTITY_TYPE_ID_CATALOG_PRODUCT ); $catalogProductSetIds = $select->getAdapter()->fetchCol($select); $addedGroups = []; @@ -286,7 +286,8 @@ protected function migrateAttributes() /** @var Record $destinationRecord */ $destinationRecord = $this->factory->create(['document' => $destinationDocument]); - $mappingValue = $this->getMappingValue($sourceRecord, ['entity_type_id', 'attribute_code']); + $entityTypeMappedId = $this->getEntityTypeIdMappedByCode($sourceRecord->getValue('entity_type_id'), true); + $mappingValue = $entityTypeMappedId . '-' . $sourceRecord->getValue('attribute_code'); if (isset($destinationRecords[$mappingValue])) { $destinationRecordData = $destinationRecords[$mappingValue]; unset($destinationRecords[$mappingValue]); @@ -304,6 +305,10 @@ protected function migrateAttributes() /** @var Record $destinationRecord */ $destinationRecord = $this->factory->create(['document' => $destinationDocument, 'data' => $record]); $destinationRecord->setValue('attribute_id', null); + $destinationRecord->setValue( + 'entity_type_id', + $this->getEntityTypeIdMappedByCode($destinationRecord->getValue('entity_type_id'), false) + ); $recordsToSave->addRecord($destinationRecord); } $this->destination->clearDocument($destinationDocument->getName()); @@ -368,7 +373,18 @@ protected function migrateEntityAttributes() */ public function processDesignEntityAttributes($recordsToSave) { - $data = $this->helper->getDesignAttributeAndGroupsData(); + foreach ($this->helper->getDestinationRecords('eav_entity_type') as $record) { + if ('catalog_product' == $record['entity_type_code']) { + $entityTypeIdCatalogProduct = $record['entity_type_id']; + break; + } + } + $entityTypeIdCatalogProductMapped = $this->getEntityTypeIdMappedByCode($entityTypeIdCatalogProduct, false); + $data = $this->helper->getDesignAttributeAndGroupsData( + $entityTypeIdCatalogProduct, + $entityTypeIdCatalogProductMapped + ); + $entityAttributeDocument = $this->destination->getDocument( $this->map->getDocumentMap('eav_entity_attribute', MapInterface::TYPE_SOURCE) ); @@ -387,7 +403,7 @@ public function processDesignEntityAttributes($recordsToSave) foreach ($data['scheduleGroupsMigrated'] as $group) { $dataRecord = [ 'entity_attribute_id' => null, - 'entity_type_id' => $data['entityTypeIdCatalogProduct'], + 'entity_type_id' => $entityTypeIdCatalogProductMapped, 'attribute_set_id' => $group['attribute_set_id'], 'attribute_group_id' => $group['attribute_group_id'], 'attribute_id' => $data['customDesignAttributeId'], @@ -402,7 +418,7 @@ public function processDesignEntityAttributes($recordsToSave) $dataRecord = [ 'entity_attribute_id' => null, - 'entity_type_id' => $data['entityTypeIdCatalogProduct'], + 'entity_type_id' => $entityTypeIdCatalogProductMapped, 'attribute_set_id' => $group['attribute_set_id'], 'attribute_group_id' => $group['attribute_group_id'], 'attribute_id' => $data['customLayoutAttributeId'], @@ -571,12 +587,37 @@ protected function loadNewAttributes() ['entity_type_id', 'attribute_code'] ); foreach ($this->initialData->getAttributes('dest') as $key => $attributeData) { + list($entityTypeId, $attributeCode) = explode('-', $key); + $key = $this->getEntityTypeIdMappedByCode($entityTypeId, false) . '-' . $attributeCode; $this->destAttributeOldNewMap[$attributeData['attribute_id']] = $this->newAttributes[$key]['attribute_id']; } return $this->newAttributes; } + /** + * Returns destination entity type id for correspondent source entity type id and vise versa + * Linking between two values is performed using entity_type_code + * @param int|string $initialEntityTypeId + * @param bool $returnDestId + * @return mixed + */ + protected function getEntityTypeIdMappedByCode($initialEntityTypeId, $returnDestId = true) + { + $id = $initialEntityTypeId; + $entityTypesFrom = $this->initialData->getEntityTypes($returnDestId ? 'source' : 'dest', 'entity_type_id'); + $entityTypesTo = $this->initialData->getEntityTypes($returnDestId ? 'dest' : 'source', 'entity_type_code'); + + if (isset($entityTypesFrom[$initialEntityTypeId])) { + $entityTypeCode = $entityTypesFrom[$initialEntityTypeId]['entity_type_code']; + if (isset($entityTypesTo[$entityTypeCode])) { + $id = $entityTypesTo[$entityTypeCode]['entity_type_id']; + } + } + + return $id; + } + /** * @param int $sourceAttributeId * @return mixed @@ -586,7 +627,11 @@ protected function getDestinationAttributeId($sourceAttributeId) $id = null; $key = null; if (isset($this->initialData->getAttributes('source')[$sourceAttributeId])) { - $key = $this->initialData->getAttributes('source')[$sourceAttributeId]['entity_type_id'] . '-' + $entityTypeId = $this->getEntityTypeIdMappedByCode( + $this->initialData->getAttributes('source')[$sourceAttributeId]['entity_type_id'], + true + ); + $key = $entityTypeId . '-' . $this->initialData->getAttributes('source')[$sourceAttributeId]['attribute_code']; } diff --git a/src/Migration/Step/Eav/Helper.php b/src/Migration/Step/Eav/Helper.php index f20c45b65..cc0c86ec5 100644 --- a/src/Migration/Step/Eav/Helper.php +++ b/src/Migration/Step/Eav/Helper.php @@ -173,6 +173,7 @@ public function getAddedGroups() /** * @param array $addedGroups + * @return void */ public function setAddedGroups(array $addedGroups) { @@ -180,23 +181,18 @@ public function setAddedGroups(array $addedGroups) } /** + * @param int|string $entityTypeIdCatalogProduct + * @param int|string $entityTypeIdCatalogProductMapped * @return array */ - public function getDesignAttributeAndGroupsData() + public function getDesignAttributeAndGroupsData($entityTypeIdCatalogProduct, $entityTypeIdCatalogProductMapped) { $scheduleGroupsMigrated = []; $catalogProductSetIdsMigrated = []; $catalogProductSetIdDefault = null; - $entityTypeIdCatalogProduct = null; $customLayoutAttributeId = null; $customDesignAttributeId = null; - foreach ($this->getDestinationRecords('eav_entity_type', ['entity_type_code']) as $id => $record) { - if ($id == 'catalog_product') { - $entityTypeIdCatalogProduct = $record['entity_type_id']; - break; - } - } foreach ($this->getDestinationRecords('eav_attribute_set') as $record) { if ($entityTypeIdCatalogProduct === $record['entity_type_id']) { if ('Default' == $record['attribute_set_name']) { @@ -214,7 +210,7 @@ public function getDesignAttributeAndGroupsData() } } foreach ($this->getDestinationRecords('eav_attribute') as $record) { - if ($record['entity_type_id'] == $entityTypeIdCatalogProduct) { + if ($record['entity_type_id'] == $entityTypeIdCatalogProductMapped) { switch ($record['attribute_code']) { case 'custom_layout': $customLayoutAttributeId = $record['attribute_id']; diff --git a/src/Migration/Step/Eav/InitialData.php b/src/Migration/Step/Eav/InitialData.php index 555a89cb6..c5dc842d8 100644 --- a/src/Migration/Step/Eav/InitialData.php +++ b/src/Migration/Step/Eav/InitialData.php @@ -91,9 +91,15 @@ public function init() protected function initEntityTypes() { if ($this->entityTypes === null) { - $destinationRecords = $this->helper->getDestinationRecords('eav_entity_type', ['entity_type_code']); - foreach ($destinationRecords as $id => $record) { - $this->entityTypes['dest'][$id] = $record; + $sourceRecords = $this->helper->getSourceRecords('eav_entity_type'); + foreach ($sourceRecords as $record) { + $this->entityTypes['source']['entity_type_id'][$record['entity_type_id']] = $record; + $this->entityTypes['source']['entity_type_code'][$record['entity_type_code']] = $record; + } + $destinationRecords = $this->helper->getDestinationRecords('eav_entity_type'); + foreach ($destinationRecords as $record) { + $this->entityTypes['dest']['entity_type_id'][$record['entity_type_id']] = $record; + $this->entityTypes['dest']['entity_type_code'][$record['entity_type_code']] = $record; } } } @@ -150,11 +156,12 @@ protected function initAttributeGroups() /** * @codeCoverageIgnore * @param string $type + * @param string $keyField * @return array */ - public function getEntityTypes($type) + public function getEntityTypes($type, $keyField = 'entity_type_code') { - return $this->entityTypes[$type]; + return $keyField ? $this->entityTypes[$type][$keyField] : $this->entityTypes[$type]; } /** From 16d4b375748f5da85792b5cc3ad28e2f825b87e3 Mon Sep 17 00:00:00 2001 From: Ruslan Kostiv Date: Fri, 24 Jun 2016 19:36:01 +0300 Subject: [PATCH 47/71] MAGETWO-54466: Cannot open categories from Electronics after migration on Store Front --- etc/ce-to-ce/map-eav.xml.dist | 4 ---- etc/ee-to-ee/map-eav.xml.dist | 4 ---- src/Migration/Reader/Map.php | 15 ++++++++++----- src/Migration/Reader/MapInterface.php | 2 +- src/Migration/RecordTransformer.php | 4 ++-- src/Migration/Step/Map/Data.php | 2 +- tests/unit/testsuite/Migration/Reader/MapTest.php | 14 ++++++++------ 7 files changed, 22 insertions(+), 23 deletions(-) diff --git a/etc/ce-to-ce/map-eav.xml.dist b/etc/ce-to-ce/map-eav.xml.dist index a76f2df3a..3d661d023 100644 --- a/etc/ce-to-ce/map-eav.xml.dist +++ b/etc/ce-to-ce/map-eav.xml.dist @@ -66,10 +66,6 @@ catalog_eav_attribute.is_visible - - catalog_eav_attribute.apply_to - - customer_eav_attribute.input_filter diff --git a/etc/ee-to-ee/map-eav.xml.dist b/etc/ee-to-ee/map-eav.xml.dist index 9321cddea..a23af623f 100644 --- a/etc/ee-to-ee/map-eav.xml.dist +++ b/etc/ee-to-ee/map-eav.xml.dist @@ -71,10 +71,6 @@ catalog_eav_attribute.is_visible - - catalog_eav_attribute.apply_to - - customer_eav_attribute.input_filter diff --git a/src/Migration/Reader/Map.php b/src/Migration/Reader/Map.php index 27cffbbe7..1a39e06e7 100644 --- a/src/Migration/Reader/Map.php +++ b/src/Migration/Reader/Map.php @@ -282,27 +282,32 @@ public function getFieldMap($document, $field, $type) /** * @inheritdoc */ - public function getHandlerConfig($document, $field, $type) + public function getHandlerConfigs($document, $field, $type) { $this->validateType($type); - $config = []; + $configs = []; $nodes = $this->xml->query( sprintf('//%s/field_rules/transform[field/text()="%s.%s"]/handler', $type, $document, $field) ); + /** @var \DOMElement $node */ foreach ($nodes as $node) { - $config['class'] = $node->getAttribute('class'); - $config['params'] = []; + $config = [ + 'class' => $node->getAttribute('class'), + 'params' => [], + ]; /** @var \DOMElement $param */ foreach ($node->childNodes as $param) { if ($param->nodeType == XML_ELEMENT_NODE) { $config['params'][$param->getAttribute('name')] = $param->getAttribute('value'); } } + + $configs[]= $config; } - return $config; + return $configs; } /** diff --git a/src/Migration/Reader/MapInterface.php b/src/Migration/Reader/MapInterface.php index 8f0982b3e..27ded0784 100644 --- a/src/Migration/Reader/MapInterface.php +++ b/src/Migration/Reader/MapInterface.php @@ -72,5 +72,5 @@ public function getFieldMap($document, $field, $type); * @param string $type * @return mixed */ - public function getHandlerConfig($document, $field, $type); + public function getHandlerConfigs($document, $field, $type); } diff --git a/src/Migration/RecordTransformer.php b/src/Migration/RecordTransformer.php index 2a7ddfdac..a169f025f 100644 --- a/src/Migration/RecordTransformer.php +++ b/src/Migration/RecordTransformer.php @@ -96,8 +96,8 @@ protected function initHandlerManager($type = MapInterface::TYPE_SOURCE) $handlerManager = $this->handlerManagerFactory->create(); $fields = $document->getStructure()->getFields(); foreach (array_keys($fields) as $field) { - $handlerConfig = $this->mapReader->getHandlerConfig($document->getName(), $field, $type); - if (!empty($handlerConfig)) { + $handlerConfigs = $this->mapReader->getHandlerConfigs($document->getName(), $field, $type); + foreach ($handlerConfigs as $handlerConfig) { $handlerKey = md5($field . $handlerConfig['class']); $handlerManager->initHandler($field, $handlerConfig, $handlerKey); } diff --git a/src/Migration/Step/Map/Data.php b/src/Migration/Step/Map/Data.php index 33ae249d2..91b7810ba 100644 --- a/src/Migration/Step/Map/Data.php +++ b/src/Migration/Step/Map/Data.php @@ -268,7 +268,7 @@ protected function hasHandlers(Document $document, $type) { $result = false; foreach (array_keys($document->getStructure()->getFields()) as $fieldName) { - $handlerConfig = $this->map->getHandlerConfig($document->getName(), $fieldName, $type); + $handlerConfig = $this->map->getHandlerConfigs($document->getName(), $fieldName, $type); if (!empty($handlerConfig)) { $result = true; break; diff --git a/tests/unit/testsuite/Migration/Reader/MapTest.php b/tests/unit/testsuite/Migration/Reader/MapTest.php index ea046e7ba..196a12d60 100644 --- a/tests/unit/testsuite/Migration/Reader/MapTest.php +++ b/tests/unit/testsuite/Migration/Reader/MapTest.php @@ -130,21 +130,23 @@ public function testGetFieldMapWithException3() /** * @return void */ - public function testGetHandlerConfig() + public function testGetHandlerConfigs() { $handlerConfig = [ - 'class' => '\Migration\Handler\SetValue', - 'params' => [ - 'default_value' => 10 + [ + 'class' => '\Migration\Handler\SetValue', + 'params' => [ + 'default_value' => 10 + ] ] ]; $this->assertEquals( $handlerConfig, - $this->map->getHandlerConfig('source-document', 'field-with-handler', MapInterface::TYPE_SOURCE) + $this->map->getHandlerConfigs('source-document', 'field-with-handler', MapInterface::TYPE_SOURCE) ); - $this->assertEquals([], $this->map->getHandlerConfig( + $this->assertEquals([], $this->map->getHandlerConfigs( 'source-document', 'some-field', MapInterface::TYPE_SOURCE From 57de1c19f2ab9706dddbf494fb19bcdb93a6a618 Mon Sep 17 00:00:00 2001 From: Leonid Poluyanov Date: Mon, 27 Jun 2016 16:32:14 +0300 Subject: [PATCH 48/71] MAGETWO-52888: grid of Search Synonyms is empty in Admin Panel --- etc/ce-to-ee/1.6.0.0/map.xml.dist | 4 ++++ etc/ce-to-ee/1.6.1.0/map.xml.dist | 4 ++++ etc/ce-to-ee/1.6.2.0/map.xml.dist | 4 ++++ etc/ce-to-ee/1.7.0.0/map.xml.dist | 4 ++++ etc/ce-to-ee/1.7.0.1/map.xml.dist | 4 ++++ etc/ce-to-ee/1.7.0.2/map.xml.dist | 4 ++++ etc/ce-to-ee/1.8.0.0/map.xml.dist | 4 ++++ etc/ce-to-ee/1.8.1.0/map.xml.dist | 4 ++++ etc/ce-to-ee/1.9.0.0/map.xml.dist | 4 ++++ etc/ce-to-ee/1.9.0.1/map.xml.dist | 4 ++++ etc/ce-to-ee/1.9.1.0/map.xml.dist | 4 ++++ etc/ce-to-ee/1.9.1.1/map.xml.dist | 4 ++++ etc/ce-to-ee/1.9.2.0/map.xml.dist | 4 ++++ etc/ce-to-ee/1.9.2.1/map.xml.dist | 4 ++++ etc/ce-to-ee/1.9.2.2/map.xml.dist | 4 ++++ etc/ce-to-ee/1.9.2.3/map.xml.dist | 4 ++++ etc/ce-to-ee/1.9.2.4/map.xml.dist | 4 ++++ etc/ee-to-ee/1.11.0.0/map.xml.dist | 4 ++++ etc/ee-to-ee/1.11.0.1/map.xml.dist | 4 ++++ etc/ee-to-ee/1.11.0.2/map.xml.dist | 4 ++++ etc/ee-to-ee/1.11.1.0/map.xml.dist | 4 ++++ etc/ee-to-ee/1.11.2.0/map.xml.dist | 4 ++++ etc/ee-to-ee/1.12.0.0/map.xml.dist | 4 ++++ etc/ee-to-ee/1.12.0.1/map.xml.dist | 4 ++++ etc/ee-to-ee/1.12.0.2/map.xml.dist | 4 ++++ etc/ee-to-ee/1.13.0.0/map.xml.dist | 4 ++++ etc/ee-to-ee/1.13.0.1/map.xml.dist | 4 ++++ etc/ee-to-ee/1.13.0.2/map.xml.dist | 4 ++++ etc/ee-to-ee/1.13.1.0/map.xml.dist | 4 ++++ etc/ee-to-ee/1.14.0.0/map.xml.dist | 4 ++++ etc/ee-to-ee/1.14.0.1/map.xml.dist | 4 ++++ etc/ee-to-ee/1.14.1.0/map.xml.dist | 4 ++++ etc/ee-to-ee/1.14.2.0/map.xml.dist | 4 ++++ etc/ee-to-ee/1.14.2.1/map.xml.dist | 4 ++++ etc/ee-to-ee/1.14.2.2/map.xml.dist | 4 ++++ etc/ee-to-ee/1.14.2.3/map.xml.dist | 4 ++++ etc/ee-to-ee/1.14.2.4/map.xml.dist | 4 ++++ 37 files changed, 148 insertions(+) diff --git a/etc/ce-to-ee/1.6.0.0/map.xml.dist b/etc/ce-to-ee/1.6.0.0/map.xml.dist index 3832019dd..9db94bcca 100644 --- a/etc/ce-to-ee/1.6.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.6.0.0/map.xml.dist @@ -1058,6 +1058,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type diff --git a/etc/ce-to-ee/1.6.1.0/map.xml.dist b/etc/ce-to-ee/1.6.1.0/map.xml.dist index 0a0ddc6e1..1608fa3ec 100644 --- a/etc/ce-to-ee/1.6.1.0/map.xml.dist +++ b/etc/ce-to-ee/1.6.1.0/map.xml.dist @@ -1046,6 +1046,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type diff --git a/etc/ce-to-ee/1.6.2.0/map.xml.dist b/etc/ce-to-ee/1.6.2.0/map.xml.dist index 004ee7b07..62d069c25 100644 --- a/etc/ce-to-ee/1.6.2.0/map.xml.dist +++ b/etc/ce-to-ee/1.6.2.0/map.xml.dist @@ -1046,6 +1046,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type diff --git a/etc/ce-to-ee/1.7.0.0/map.xml.dist b/etc/ce-to-ee/1.7.0.0/map.xml.dist index 5894162c4..3f897f295 100644 --- a/etc/ce-to-ee/1.7.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.7.0.0/map.xml.dist @@ -1015,6 +1015,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type diff --git a/etc/ce-to-ee/1.7.0.1/map.xml.dist b/etc/ce-to-ee/1.7.0.1/map.xml.dist index 5894162c4..3f897f295 100644 --- a/etc/ce-to-ee/1.7.0.1/map.xml.dist +++ b/etc/ce-to-ee/1.7.0.1/map.xml.dist @@ -1015,6 +1015,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type diff --git a/etc/ce-to-ee/1.7.0.2/map.xml.dist b/etc/ce-to-ee/1.7.0.2/map.xml.dist index 5894162c4..3f897f295 100644 --- a/etc/ce-to-ee/1.7.0.2/map.xml.dist +++ b/etc/ce-to-ee/1.7.0.2/map.xml.dist @@ -1015,6 +1015,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type diff --git a/etc/ce-to-ee/1.8.0.0/map.xml.dist b/etc/ce-to-ee/1.8.0.0/map.xml.dist index 1b3180362..c146f72ea 100644 --- a/etc/ce-to-ee/1.8.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.8.0.0/map.xml.dist @@ -1015,6 +1015,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type diff --git a/etc/ce-to-ee/1.8.1.0/map.xml.dist b/etc/ce-to-ee/1.8.1.0/map.xml.dist index 77b375078..4da041764 100644 --- a/etc/ce-to-ee/1.8.1.0/map.xml.dist +++ b/etc/ce-to-ee/1.8.1.0/map.xml.dist @@ -1012,6 +1012,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type diff --git a/etc/ce-to-ee/1.9.0.0/map.xml.dist b/etc/ce-to-ee/1.9.0.0/map.xml.dist index 5c13bb324..0a23375ef 100644 --- a/etc/ce-to-ee/1.9.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.9.0.0/map.xml.dist @@ -1015,6 +1015,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type diff --git a/etc/ce-to-ee/1.9.0.1/map.xml.dist b/etc/ce-to-ee/1.9.0.1/map.xml.dist index 1b3180362..c146f72ea 100644 --- a/etc/ce-to-ee/1.9.0.1/map.xml.dist +++ b/etc/ce-to-ee/1.9.0.1/map.xml.dist @@ -1015,6 +1015,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type diff --git a/etc/ce-to-ee/1.9.1.0/map.xml.dist b/etc/ce-to-ee/1.9.1.0/map.xml.dist index 2cf4c815a..176c89307 100644 --- a/etc/ce-to-ee/1.9.1.0/map.xml.dist +++ b/etc/ce-to-ee/1.9.1.0/map.xml.dist @@ -997,6 +997,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type diff --git a/etc/ce-to-ee/1.9.1.1/map.xml.dist b/etc/ce-to-ee/1.9.1.1/map.xml.dist index 2cf4c815a..176c89307 100644 --- a/etc/ce-to-ee/1.9.1.1/map.xml.dist +++ b/etc/ce-to-ee/1.9.1.1/map.xml.dist @@ -997,6 +997,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type diff --git a/etc/ce-to-ee/1.9.2.0/map.xml.dist b/etc/ce-to-ee/1.9.2.0/map.xml.dist index ae3930b23..ca9c4070b 100644 --- a/etc/ce-to-ee/1.9.2.0/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.0/map.xml.dist @@ -1005,6 +1005,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type diff --git a/etc/ce-to-ee/1.9.2.1/map.xml.dist b/etc/ce-to-ee/1.9.2.1/map.xml.dist index ae3930b23..ca9c4070b 100644 --- a/etc/ce-to-ee/1.9.2.1/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.1/map.xml.dist @@ -1005,6 +1005,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type diff --git a/etc/ce-to-ee/1.9.2.2/map.xml.dist b/etc/ce-to-ee/1.9.2.2/map.xml.dist index 12270c3ac..14fd8c6c7 100644 --- a/etc/ce-to-ee/1.9.2.2/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.2/map.xml.dist @@ -1011,6 +1011,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type diff --git a/etc/ce-to-ee/1.9.2.3/map.xml.dist b/etc/ce-to-ee/1.9.2.3/map.xml.dist index 12270c3ac..14fd8c6c7 100644 --- a/etc/ce-to-ee/1.9.2.3/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.3/map.xml.dist @@ -1011,6 +1011,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type diff --git a/etc/ce-to-ee/1.9.2.4/map.xml.dist b/etc/ce-to-ee/1.9.2.4/map.xml.dist index 12270c3ac..14fd8c6c7 100644 --- a/etc/ce-to-ee/1.9.2.4/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.4/map.xml.dist @@ -1011,6 +1011,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type 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 index a1d48ae11..5fa5977ad 100644 --- a/etc/ee-to-ee/1.11.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.0/map.xml.dist @@ -1448,6 +1448,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type 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 index 74be6b789..099a52f9d 100644 --- a/etc/ee-to-ee/1.11.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.1/map.xml.dist @@ -1448,6 +1448,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type 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 index 74be6b789..099a52f9d 100644 --- a/etc/ee-to-ee/1.11.0.2/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.2/map.xml.dist @@ -1448,6 +1448,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type 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 index b26c07453..c284534a9 100644 --- a/etc/ee-to-ee/1.11.1.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.1.0/map.xml.dist @@ -1448,6 +1448,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type 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 index e33724eed..afcc4ce5e 100644 --- a/etc/ee-to-ee/1.11.2.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.2.0/map.xml.dist @@ -1448,6 +1448,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type 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 index e098ecc04..2d0d18477 100644 --- a/etc/ee-to-ee/1.12.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.0/map.xml.dist @@ -1418,6 +1418,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type 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 index 877b7dab8..61e90e3db 100644 --- a/etc/ee-to-ee/1.12.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.1/map.xml.dist @@ -1418,6 +1418,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type 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 index 877b7dab8..61e90e3db 100644 --- a/etc/ee-to-ee/1.12.0.2/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.2/map.xml.dist @@ -1418,6 +1418,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type 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 index f9def247b..2ec37de4c 100644 --- a/etc/ee-to-ee/1.13.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.13.0.0/map.xml.dist @@ -1402,6 +1402,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type 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 index f9def247b..2ec37de4c 100644 --- a/etc/ee-to-ee/1.13.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.13.0.1/map.xml.dist @@ -1402,6 +1402,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type 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 index f9def247b..2ec37de4c 100644 --- a/etc/ee-to-ee/1.13.0.2/map.xml.dist +++ b/etc/ee-to-ee/1.13.0.2/map.xml.dist @@ -1402,6 +1402,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type 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 index 113c354bc..01db84a87 100644 --- a/etc/ee-to-ee/1.13.1.0/map.xml.dist +++ b/etc/ee-to-ee/1.13.1.0/map.xml.dist @@ -1408,6 +1408,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type 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 index 5979fbb7f..e43e5aadf 100644 --- a/etc/ee-to-ee/1.14.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.14.0.0/map.xml.dist @@ -1408,6 +1408,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type 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 index 5979fbb7f..e43e5aadf 100644 --- a/etc/ee-to-ee/1.14.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.14.0.1/map.xml.dist @@ -1408,6 +1408,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type 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 index 06b8d8a05..7edc53f47 100644 --- a/etc/ee-to-ee/1.14.1.0/map.xml.dist +++ b/etc/ee-to-ee/1.14.1.0/map.xml.dist @@ -1416,6 +1416,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type 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 index e9dda618b..3d98d0ea4 100644 --- a/etc/ee-to-ee/1.14.2.0/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.0/map.xml.dist @@ -1432,6 +1432,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type 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 index e9dda618b..3d98d0ea4 100644 --- a/etc/ee-to-ee/1.14.2.1/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.1/map.xml.dist @@ -1432,6 +1432,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type 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 index 01325a3f4..14848816f 100644 --- a/etc/ee-to-ee/1.14.2.2/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.2/map.xml.dist @@ -1438,6 +1438,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type 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 index 01325a3f4..14848816f 100644 --- a/etc/ee-to-ee/1.14.2.3/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.3/map.xml.dist @@ -1438,6 +1438,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type 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 index 01325a3f4..14848816f 100644 --- a/etc/ee-to-ee/1.14.2.4/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.4/map.xml.dist @@ -1438,6 +1438,10 @@ + + catalogsearch_query.synonym_for + + admin_rule.role_type From e312da8c6e3ad8ab1ff89f3ae574639b0183f82a Mon Sep 17 00:00:00 2001 From: Leonid Poluyanov Date: Wed, 29 Jun 2016 13:56:03 +0300 Subject: [PATCH 49/71] MAGETWO-54784: Status field is not mapped in ee_to_ee map files --- etc/ee-to-ee/1.11.0.0/map.xml.dist | 3 +++ etc/ee-to-ee/1.11.0.1/map.xml.dist | 3 +++ etc/ee-to-ee/1.11.0.2/map.xml.dist | 3 +++ etc/ee-to-ee/1.11.1.0/map.xml.dist | 3 +++ etc/ee-to-ee/1.11.2.0/map.xml.dist | 3 +++ etc/ee-to-ee/1.12.0.0/map.xml.dist | 3 +++ etc/ee-to-ee/1.12.0.1/map.xml.dist | 3 +++ etc/ee-to-ee/1.12.0.2/map.xml.dist | 3 +++ etc/ee-to-ee/1.13.0.0/map.xml.dist | 2 ++ etc/ee-to-ee/1.13.0.1/map.xml.dist | 3 +++ etc/ee-to-ee/1.13.0.2/map.xml.dist | 3 +++ etc/ee-to-ee/1.13.1.0/map.xml.dist | 3 +++ etc/ee-to-ee/1.14.0.0/map.xml.dist | 3 +++ etc/ee-to-ee/1.14.0.1/map.xml.dist | 3 +++ etc/ee-to-ee/1.14.1.0/map.xml.dist | 3 +++ etc/ee-to-ee/1.14.2.0/map.xml.dist | 3 +++ etc/ee-to-ee/1.14.2.1/map.xml.dist | 3 +++ etc/ee-to-ee/1.14.2.2/map.xml.dist | 3 +++ etc/ee-to-ee/1.14.2.3/map.xml.dist | 3 +++ etc/ee-to-ee/1.14.2.4/map.xml.dist | 3 +++ 20 files changed, 59 insertions(+) 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 index a1d48ae11..d6310a3e0 100644 --- a/etc/ee-to-ee/1.11.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.0/map.xml.dist @@ -2610,6 +2610,9 @@ cms_page.meta_title + + magento_catalogevent_event.status + weee_tax.state 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 index 74be6b789..17bbc80a0 100644 --- a/etc/ee-to-ee/1.11.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.1/map.xml.dist @@ -2604,6 +2604,9 @@ salesrule.row_id + + magento_catalogevent_event.status + quote_payment.cc_exp_month 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 index 74be6b789..17bbc80a0 100644 --- a/etc/ee-to-ee/1.11.0.2/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.2/map.xml.dist @@ -2604,6 +2604,9 @@ salesrule.row_id + + magento_catalogevent_event.status + quote_payment.cc_exp_month 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 index b26c07453..349f833ae 100644 --- a/etc/ee-to-ee/1.11.1.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.1.0/map.xml.dist @@ -2577,6 +2577,9 @@ salesrule.row_id + + magento_catalogevent_event.status + quote_payment.cc_exp_month 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 index e33724eed..8f5709b0a 100644 --- a/etc/ee-to-ee/1.11.2.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.2.0/map.xml.dist @@ -2574,6 +2574,9 @@ salesrule.row_id + + magento_catalogevent_event.status + quote_payment.cc_exp_month 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 index e098ecc04..9787753a2 100644 --- a/etc/ee-to-ee/1.12.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.0/map.xml.dist @@ -2463,6 +2463,9 @@ cms_page.meta_title + + magento_catalogevent_event.status + weee_tax.state 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 index 877b7dab8..a60d7d9c7 100644 --- a/etc/ee-to-ee/1.12.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.1/map.xml.dist @@ -2463,6 +2463,9 @@ cms_page.meta_title + + magento_catalogevent_event.status + quote_payment.cc_exp_month 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 index 877b7dab8..a60d7d9c7 100644 --- a/etc/ee-to-ee/1.12.0.2/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.2/map.xml.dist @@ -2463,6 +2463,9 @@ cms_page.meta_title + + magento_catalogevent_event.status + quote_payment.cc_exp_month 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 index f9def247b..d9a876874 100644 --- a/etc/ee-to-ee/1.13.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.13.0.0/map.xml.dist @@ -2363,6 +2363,8 @@ cms_page.meta_title + magento_catalogevent_event.status + quote_payment.cc_exp_month 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 index f9def247b..f095b9711 100644 --- a/etc/ee-to-ee/1.13.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.13.0.1/map.xml.dist @@ -2362,6 +2362,9 @@ cms_page.meta_title + + magento_catalogevent_event.status + quote_payment.cc_exp_month 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 index f9def247b..f095b9711 100644 --- a/etc/ee-to-ee/1.13.0.2/map.xml.dist +++ b/etc/ee-to-ee/1.13.0.2/map.xml.dist @@ -2362,6 +2362,9 @@ cms_page.meta_title + + magento_catalogevent_event.status + quote_payment.cc_exp_month 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 index 113c354bc..bfc9c9a4c 100644 --- a/etc/ee-to-ee/1.13.1.0/map.xml.dist +++ b/etc/ee-to-ee/1.13.1.0/map.xml.dist @@ -2374,6 +2374,9 @@ cms_page.meta_title + + magento_catalogevent_event.status + quote_payment.cc_exp_month 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 index 5979fbb7f..04ec94ac6 100644 --- a/etc/ee-to-ee/1.14.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.14.0.0/map.xml.dist @@ -2365,6 +2365,9 @@ cms_page.meta_title + + magento_catalogevent_event.status + quote_payment.cc_exp_month 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 index 5979fbb7f..04ec94ac6 100644 --- a/etc/ee-to-ee/1.14.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.14.0.1/map.xml.dist @@ -2365,6 +2365,9 @@ cms_page.meta_title + + magento_catalogevent_event.status + quote_payment.cc_exp_month 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 index 06b8d8a05..40077b29e 100644 --- a/etc/ee-to-ee/1.14.1.0/map.xml.dist +++ b/etc/ee-to-ee/1.14.1.0/map.xml.dist @@ -2367,6 +2367,9 @@ cms_page.meta_title + + magento_catalogevent_event.status + quote_payment.cc_exp_month 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 index e9dda618b..839fc4a9a 100644 --- a/etc/ee-to-ee/1.14.2.0/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.0/map.xml.dist @@ -2404,6 +2404,9 @@ cms_page.meta_title + + magento_catalogevent_event.status + quote_payment.cc_exp_month 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 index e9dda618b..839fc4a9a 100644 --- a/etc/ee-to-ee/1.14.2.1/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.1/map.xml.dist @@ -2404,6 +2404,9 @@ cms_page.meta_title + + magento_catalogevent_event.status + quote_payment.cc_exp_month 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 index 01325a3f4..b11a4c554 100644 --- a/etc/ee-to-ee/1.14.2.2/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.2/map.xml.dist @@ -2410,6 +2410,9 @@ cms_page.meta_title + + magento_catalogevent_event.status + quote_payment.cc_exp_month 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 index 01325a3f4..b11a4c554 100644 --- a/etc/ee-to-ee/1.14.2.3/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.3/map.xml.dist @@ -2410,6 +2410,9 @@ cms_page.meta_title + + magento_catalogevent_event.status + quote_payment.cc_exp_month 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 index 01325a3f4..b11a4c554 100644 --- a/etc/ee-to-ee/1.14.2.4/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.4/map.xml.dist @@ -2410,6 +2410,9 @@ cms_page.meta_title + + magento_catalogevent_event.status + quote_payment.cc_exp_month From cadc6a89b70635fe782074e7b7d0fbb0bd5aae1d Mon Sep 17 00:00:00 2001 From: Ruslan Kostiv Date: Wed, 29 Jun 2016 16:58:13 +0300 Subject: [PATCH 50/71] MAGETWO-54825: Map files "xmlconnect" tables usage --- etc/ce-to-ce/1.9.1.0/map.xml.dist | 18 ++++++++++++++++++ etc/ce-to-ce/1.9.1.1/map.xml.dist | 18 ++++++++++++++++++ etc/ce-to-ce/1.9.2.0/map.xml.dist | 18 ++++++++++++++++++ etc/ce-to-ce/1.9.2.1/map.xml.dist | 18 ++++++++++++++++++ etc/ce-to-ce/1.9.2.2/map.xml.dist | 18 ++++++++++++++++++ etc/ce-to-ce/1.9.2.3/map.xml.dist | 18 ++++++++++++++++++ etc/ce-to-ce/1.9.2.4/map.xml.dist | 18 ++++++++++++++++++ etc/ce-to-ee/1.9.1.0/map.xml.dist | 18 ++++++++++++++++++ etc/ce-to-ee/1.9.1.1/map.xml.dist | 18 ++++++++++++++++++ etc/ce-to-ee/1.9.2.0/map.xml.dist | 18 ++++++++++++++++++ etc/ce-to-ee/1.9.2.1/map.xml.dist | 18 ++++++++++++++++++ etc/ce-to-ee/1.9.2.2/map.xml.dist | 18 ++++++++++++++++++ etc/ce-to-ee/1.9.2.3/map.xml.dist | 18 ++++++++++++++++++ etc/ce-to-ee/1.9.2.4/map.xml.dist | 18 ++++++++++++++++++ 14 files changed, 252 insertions(+) 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 index 3ee3d4dd1..416fbb364 100644 --- a/etc/ce-to-ce/1.9.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.1.0/map.xml.dist @@ -275,6 +275,24 @@ protx_api_debug + + xmlconnect_application + + + xmlconnect_config_data + + + xmlconnect_history + + + xmlconnect_images + + + xmlconnect_notification_template + + + xmlconnect_queue + googlecheckout_notification 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 index 3ee3d4dd1..416fbb364 100644 --- a/etc/ce-to-ce/1.9.1.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.1.1/map.xml.dist @@ -275,6 +275,24 @@ protx_api_debug + + xmlconnect_application + + + xmlconnect_config_data + + + xmlconnect_history + + + xmlconnect_images + + + xmlconnect_notification_template + + + xmlconnect_queue + googlecheckout_notification 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 index 8da5406c4..e2e134e39 100644 --- a/etc/ce-to-ce/1.9.2.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.0/map.xml.dist @@ -275,6 +275,24 @@ protx_api_debug + + xmlconnect_application + + + xmlconnect_config_data + + + xmlconnect_history + + + xmlconnect_images + + + xmlconnect_notification_template + + + xmlconnect_queue + googlecheckout_notification 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 index 8da5406c4..e2e134e39 100644 --- a/etc/ce-to-ce/1.9.2.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.1/map.xml.dist @@ -275,6 +275,24 @@ protx_api_debug + + xmlconnect_application + + + xmlconnect_config_data + + + xmlconnect_history + + + xmlconnect_images + + + xmlconnect_notification_template + + + xmlconnect_queue + googlecheckout_notification diff --git a/etc/ce-to-ce/1.9.2.2/map.xml.dist b/etc/ce-to-ce/1.9.2.2/map.xml.dist index fa7f9ebd5..69fcbadd5 100644 --- a/etc/ce-to-ce/1.9.2.2/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.2/map.xml.dist @@ -275,6 +275,24 @@ protx_api_debug + + xmlconnect_application + + + xmlconnect_config_data + + + xmlconnect_history + + + xmlconnect_images + + + xmlconnect_notification_template + + + xmlconnect_queue + googlecheckout_notification diff --git a/etc/ce-to-ce/1.9.2.3/map.xml.dist b/etc/ce-to-ce/1.9.2.3/map.xml.dist index fa7f9ebd5..69fcbadd5 100644 --- a/etc/ce-to-ce/1.9.2.3/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.3/map.xml.dist @@ -275,6 +275,24 @@ protx_api_debug + + xmlconnect_application + + + xmlconnect_config_data + + + xmlconnect_history + + + xmlconnect_images + + + xmlconnect_notification_template + + + xmlconnect_queue + googlecheckout_notification diff --git a/etc/ce-to-ce/1.9.2.4/map.xml.dist b/etc/ce-to-ce/1.9.2.4/map.xml.dist index fa7f9ebd5..69fcbadd5 100644 --- a/etc/ce-to-ce/1.9.2.4/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.4/map.xml.dist @@ -275,6 +275,24 @@ protx_api_debug + + xmlconnect_application + + + xmlconnect_config_data + + + xmlconnect_history + + + xmlconnect_images + + + xmlconnect_notification_template + + + xmlconnect_queue + googlecheckout_notification diff --git a/etc/ce-to-ee/1.9.1.0/map.xml.dist b/etc/ce-to-ee/1.9.1.0/map.xml.dist index 2cf4c815a..3cb3e7b9c 100644 --- a/etc/ce-to-ee/1.9.1.0/map.xml.dist +++ b/etc/ce-to-ee/1.9.1.0/map.xml.dist @@ -275,6 +275,24 @@ protx_api_debug + + xmlconnect_application + + + xmlconnect_config_data + + + xmlconnect_history + + + xmlconnect_images + + + xmlconnect_notification_template + + + xmlconnect_queue + googlecheckout_notification diff --git a/etc/ce-to-ee/1.9.1.1/map.xml.dist b/etc/ce-to-ee/1.9.1.1/map.xml.dist index 2cf4c815a..3cb3e7b9c 100644 --- a/etc/ce-to-ee/1.9.1.1/map.xml.dist +++ b/etc/ce-to-ee/1.9.1.1/map.xml.dist @@ -275,6 +275,24 @@ protx_api_debug + + xmlconnect_application + + + xmlconnect_config_data + + + xmlconnect_history + + + xmlconnect_images + + + xmlconnect_notification_template + + + xmlconnect_queue + googlecheckout_notification diff --git a/etc/ce-to-ee/1.9.2.0/map.xml.dist b/etc/ce-to-ee/1.9.2.0/map.xml.dist index ae3930b23..2fbb8e940 100644 --- a/etc/ce-to-ee/1.9.2.0/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.0/map.xml.dist @@ -275,6 +275,24 @@ protx_api_debug + + xmlconnect_application + + + xmlconnect_config_data + + + xmlconnect_history + + + xmlconnect_images + + + xmlconnect_notification_template + + + xmlconnect_queue + googlecheckout_notification diff --git a/etc/ce-to-ee/1.9.2.1/map.xml.dist b/etc/ce-to-ee/1.9.2.1/map.xml.dist index ae3930b23..2fbb8e940 100644 --- a/etc/ce-to-ee/1.9.2.1/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.1/map.xml.dist @@ -275,6 +275,24 @@ protx_api_debug + + xmlconnect_application + + + xmlconnect_config_data + + + xmlconnect_history + + + xmlconnect_images + + + xmlconnect_notification_template + + + xmlconnect_queue + googlecheckout_notification diff --git a/etc/ce-to-ee/1.9.2.2/map.xml.dist b/etc/ce-to-ee/1.9.2.2/map.xml.dist index 12270c3ac..9b7442ab1 100644 --- a/etc/ce-to-ee/1.9.2.2/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.2/map.xml.dist @@ -275,6 +275,24 @@ protx_api_debug + + xmlconnect_application + + + xmlconnect_config_data + + + xmlconnect_history + + + xmlconnect_images + + + xmlconnect_notification_template + + + xmlconnect_queue + googlecheckout_notification diff --git a/etc/ce-to-ee/1.9.2.3/map.xml.dist b/etc/ce-to-ee/1.9.2.3/map.xml.dist index 12270c3ac..9b7442ab1 100644 --- a/etc/ce-to-ee/1.9.2.3/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.3/map.xml.dist @@ -275,6 +275,24 @@ protx_api_debug + + xmlconnect_application + + + xmlconnect_config_data + + + xmlconnect_history + + + xmlconnect_images + + + xmlconnect_notification_template + + + xmlconnect_queue + googlecheckout_notification diff --git a/etc/ce-to-ee/1.9.2.4/map.xml.dist b/etc/ce-to-ee/1.9.2.4/map.xml.dist index 12270c3ac..9b7442ab1 100644 --- a/etc/ce-to-ee/1.9.2.4/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.4/map.xml.dist @@ -275,6 +275,24 @@ protx_api_debug + + xmlconnect_application + + + xmlconnect_config_data + + + xmlconnect_history + + + xmlconnect_images + + + xmlconnect_notification_template + + + xmlconnect_queue + googlecheckout_notification From 03b877c9df8586271fb8d7fc1efe3a1b6b80a315 Mon Sep 17 00:00:00 2001 From: Yurii Hryhoriev Date: Fri, 1 Jul 2016 09:40:05 +0300 Subject: [PATCH 51/71] MAGETWO-54642: Cannot save product after migration - changes according to review remarks --- src/Migration/Step/Eav/Data.php | 12 ++++++------ src/Migration/Step/Eav/Helper.php | 2 +- src/Migration/Step/Eav/InitialData.php | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Migration/Step/Eav/Data.php b/src/Migration/Step/Eav/Data.php index 1835d7b63..902a58c31 100644 --- a/src/Migration/Step/Eav/Data.php +++ b/src/Migration/Step/Eav/Data.php @@ -605,13 +605,13 @@ protected function loadNewAttributes() protected function getEntityTypeIdMappedByCode($initialEntityTypeId, $returnDestId = true) { $id = $initialEntityTypeId; - $entityTypesFrom = $this->initialData->getEntityTypes($returnDestId ? 'source' : 'dest', 'entity_type_id'); - $entityTypesTo = $this->initialData->getEntityTypes($returnDestId ? 'dest' : 'source', 'entity_type_code'); + $entityTypeIdsFrom = $this->initialData->getEntityTypesWithKeyField($returnDestId ? 'source' : 'dest', 'entity_type_id'); + $entityTypeCodesTo = $this->initialData->getEntityTypesWithKeyField($returnDestId ? 'dest' : 'source', 'entity_type_code'); - if (isset($entityTypesFrom[$initialEntityTypeId])) { - $entityTypeCode = $entityTypesFrom[$initialEntityTypeId]['entity_type_code']; - if (isset($entityTypesTo[$entityTypeCode])) { - $id = $entityTypesTo[$entityTypeCode]['entity_type_id']; + if (isset($entityTypeIdsFrom[$initialEntityTypeId])) { + $entityTypeCode = $entityTypeIdsFrom[$initialEntityTypeId]['entity_type_code']; + if (isset($entityTypeCodesTo[$entityTypeCode])) { + $id = $entityTypeCodesTo[$entityTypeCode]['entity_type_id']; } } diff --git a/src/Migration/Step/Eav/Helper.php b/src/Migration/Step/Eav/Helper.php index cc0c86ec5..a6797cc86 100644 --- a/src/Migration/Step/Eav/Helper.php +++ b/src/Migration/Step/Eav/Helper.php @@ -194,7 +194,7 @@ public function getDesignAttributeAndGroupsData($entityTypeIdCatalogProduct, $en $customDesignAttributeId = null; foreach ($this->getDestinationRecords('eav_attribute_set') as $record) { - if ($entityTypeIdCatalogProduct === $record['entity_type_id']) { + if ($entityTypeIdCatalogProduct == $record['entity_type_id']) { if ('Default' == $record['attribute_set_name']) { $catalogProductSetIdDefault = $record['attribute_set_id']; } else { diff --git a/src/Migration/Step/Eav/InitialData.php b/src/Migration/Step/Eav/InitialData.php index c5dc842d8..e3e933ccd 100644 --- a/src/Migration/Step/Eav/InitialData.php +++ b/src/Migration/Step/Eav/InitialData.php @@ -159,9 +159,9 @@ protected function initAttributeGroups() * @param string $keyField * @return array */ - public function getEntityTypes($type, $keyField = 'entity_type_code') + public function getEntityTypesWithKeyField($type, $keyField) { - return $keyField ? $this->entityTypes[$type][$keyField] : $this->entityTypes[$type]; + return $this->entityTypes[$type][$keyField]; } /** From 893629f0b7ab273f894f1e7eec30ab8f95bdf52d Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Mon, 4 Jul 2016 14:56:29 +0300 Subject: [PATCH 52/71] MAGETWO-55014: The "Record structure does not equal Collection structure" during migration from CE to EE --- src/Migration/Step/TierPrice/Data.php | 18 +++++++++++++++++- src/Migration/Step/TierPrice/Helper.php | 16 +++++++++++++--- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/src/Migration/Step/TierPrice/Data.php b/src/Migration/Step/TierPrice/Data.php index 32ad08477..427420248 100644 --- a/src/Migration/Step/TierPrice/Data.php +++ b/src/Migration/Step/TierPrice/Data.php @@ -96,7 +96,7 @@ public function perform() $pageNumber++; $destinationRecords = $destDocument->getRecords(); foreach ($items as $recordData) { - unset($recordData['value_id']); + $recordData = $this->transformRecord($recordData); $this->progress->advance(LogManager::LOG_LEVEL_INFO); $this->progress->advance(LogManager::LOG_LEVEL_DEBUG); /** @var Record $destRecord */ @@ -114,4 +114,20 @@ public function perform() $this->progress->finish(LogManager::LOG_LEVEL_INFO); return true; } + + /** + * @param array $recordData + * @return array + */ + protected function transformRecord(array $recordData) + { + $entityIdNameMap = $this->helper->getEntityIdNameMap(); + if ($entityIdNameMap['destination'] != $entityIdNameMap['source']) { + $recordData[$entityIdNameMap['destination']] = $recordData[$entityIdNameMap['source']]; + unset($recordData[$entityIdNameMap['source']]); + } + unset($recordData['value_id']); + + return $recordData; + } } diff --git a/src/Migration/Step/TierPrice/Helper.php b/src/Migration/Step/TierPrice/Helper.php index 758a5b6df..4c8fcfb70 100644 --- a/src/Migration/Step/TierPrice/Helper.php +++ b/src/Migration/Step/TierPrice/Helper.php @@ -68,9 +68,7 @@ public function getSourceDocumentFields() */ public function getDestinationDocumentFields() { - $entityIdName = (empty($this->editionMigrate) || $this->editionMigrate == Config::EDITION_MIGRATE_CE_TO_CE) - ? 'entity_id' - : 'row_id'; + $entityIdName = $this->getEntityIdNameMap()['destination']; return [ self::DESTINATION_DOCUMENT_NAME => [ 'value_id', @@ -83,4 +81,16 @@ public function getDestinationDocumentFields() ], ]; } + + /** + * @return string + */ + public function getEntityIdNameMap() + { + $entityIdName = (empty($this->editionMigrate) || $this->editionMigrate == Config::EDITION_MIGRATE_CE_TO_CE) + ? 'entity_id' + : 'row_id'; + + return ['source' => 'entity_id', 'destination' => $entityIdName]; + } } From c5821ad72807b00ea19ff1a6a39dc5c1c02df44e Mon Sep 17 00:00:00 2001 From: Yurii Hryhoriev Date: Mon, 4 Jul 2016 15:22:29 +0300 Subject: [PATCH 53/71] MAGETWO-51627: Fix tests (prepare to 2.1 update) - static tests fix --- src/Migration/App/Step/AbstractIntegrity.php | 1 + src/Migration/Config.php | 1 - .../Handler/EavAttributeGroup/SetGroupCode.php | 1 + src/Migration/Handler/Sequence.php | 1 + src/Migration/Handler/Settings/Encrypt.php | 1 + src/Migration/Handler/Synonym.php | 10 +++++++++- src/Migration/ResourceModel/Adapter/Mysql.php | 1 + src/Migration/Step/Eav/Data.php | 6 ++++-- src/Migration/Step/Eav/Helper.php | 1 + src/Migration/Step/Eav/Volume.php | 8 ++++++-- src/Migration/Step/OrderGrids/Volume.php | 1 - src/Migration/Step/PostProcessing/Data.php | 5 ++--- src/Migration/Step/PostProcessing/Helper.php | 5 ++--- src/Migration/Step/PostProcessing/Integrity.php | 3 +++ src/Migration/Step/SalesOrder/Helper.php | 1 - src/Migration/Step/TierPrice/Helper.php | 4 ++-- src/Migration/Step/UrlRewrite/Helper.php | 12 ++++++------ src/Migration/Step/UrlRewrite/Version11300to2000.php | 2 ++ src/Migration/Step/UrlRewrite/Version11410to2000.php | 2 ++ .../testsuite/Migration/App/Progress/FileTest.php | 1 + .../Step/CustomCustomerAttributes/VolumeTest.php | 1 - .../testsuite/Migration/Step/Customer/HelperTest.php | 1 + .../testsuite/Migration/Step/Log/IntegrityTest.php | 1 - .../testsuite/Migration/Step/Stores/DataTest.php | 1 + .../Migration/Step/Stores/IntegrityTest.php | 1 + .../testsuite/Migration/Step/Stores/VolumeTest.php | 1 + 26 files changed, 49 insertions(+), 24 deletions(-) diff --git a/src/Migration/App/Step/AbstractIntegrity.php b/src/Migration/App/Step/AbstractIntegrity.php index c7f66ec9b..6a4c22646 100644 --- a/src/Migration/App/Step/AbstractIntegrity.php +++ b/src/Migration/App/Step/AbstractIntegrity.php @@ -12,6 +12,7 @@ use Migration\ResourceModel; /** + * @SuppressWarnings(PHPMD.NumberOfChildren) * Class AbstractIntegrity */ abstract class AbstractIntegrity implements StageInterface diff --git a/src/Migration/Config.php b/src/Migration/Config.php index 7c440dd5c..aa52dc086 100644 --- a/src/Migration/Config.php +++ b/src/Migration/Config.php @@ -110,7 +110,6 @@ public function getSteps($mode) return $steps; } - /** * Get step data * diff --git a/src/Migration/Handler/EavAttributeGroup/SetGroupCode.php b/src/Migration/Handler/EavAttributeGroup/SetGroupCode.php index 7f5178c90..4de5add67 100644 --- a/src/Migration/Handler/EavAttributeGroup/SetGroupCode.php +++ b/src/Migration/Handler/EavAttributeGroup/SetGroupCode.php @@ -47,6 +47,7 @@ public function __construct(Config $config, Source $source) /** * {@inheritdoc} + * @SuppressWarnings(PHPMD.NPathComplexity) */ public function handle(Record $recordToHandle, Record $oppositeRecord) { diff --git a/src/Migration/Handler/Sequence.php b/src/Migration/Handler/Sequence.php index 346086f17..2f0535339 100644 --- a/src/Migration/Handler/Sequence.php +++ b/src/Migration/Handler/Sequence.php @@ -50,6 +50,7 @@ class Sequence extends AbstractHandler implements HandlerInterface /** * @param string $table + * @param Destination $destination */ public function __construct($table, Destination $destination) { diff --git a/src/Migration/Handler/Settings/Encrypt.php b/src/Migration/Handler/Settings/Encrypt.php index 6e3d7bfc6..110255bc6 100644 --- a/src/Migration/Handler/Settings/Encrypt.php +++ b/src/Migration/Handler/Settings/Encrypt.php @@ -16,6 +16,7 @@ class Encrypt extends AbstractHandler { const CRYPT_KEY = 'crypt_key'; + /** * @var \Magento\Framework\Encryption\Encryptor */ diff --git a/src/Migration/Handler/Synonym.php b/src/Migration/Handler/Synonym.php index fc2a9b581..fdb39bac6 100644 --- a/src/Migration/Handler/Synonym.php +++ b/src/Migration/Handler/Synonym.php @@ -9,11 +9,15 @@ use Migration\ResourceModel\Destination; use Migration\ResourceModel\Record; use Migration\ResourceModel\Source; + /** * Handler for synonyms */ class Synonym extends AbstractHandler implements HandlerInterface { + /** + * @var string + */ protected $synonymsTable = 'search_synonyms'; /** @@ -31,6 +35,10 @@ class Synonym extends AbstractHandler implements HandlerInterface */ protected $destination; + /** + * @param Source $source + * @param Destination $destination + */ public function __construct(Source $source, Destination $destination) { $this->source = $source; @@ -55,7 +63,7 @@ public function handle(Record $recordToHandle, Record $oppositeRecord) } /** - * @param $storeId + * @param int|string $storeId * @return array */ protected function getWebsiteId($storeId) diff --git a/src/Migration/ResourceModel/Adapter/Mysql.php b/src/Migration/ResourceModel/Adapter/Mysql.php index f11b5e6b9..146b050f6 100644 --- a/src/Migration/ResourceModel/Adapter/Mysql.php +++ b/src/Migration/ResourceModel/Adapter/Mysql.php @@ -15,6 +15,7 @@ class Mysql implements \Migration\ResourceModel\AdapterInterface { const BACKUP_DOCUMENT_PREFIX = 'migration_backup_'; + /** * @var \Magento\Framework\DB\Adapter\AdapterInterface */ diff --git a/src/Migration/Step/Eav/Data.php b/src/Migration/Step/Eav/Data.php index 902a58c31..57eeceaf7 100644 --- a/src/Migration/Step/Eav/Data.php +++ b/src/Migration/Step/Eav/Data.php @@ -605,8 +605,10 @@ protected function loadNewAttributes() protected function getEntityTypeIdMappedByCode($initialEntityTypeId, $returnDestId = true) { $id = $initialEntityTypeId; - $entityTypeIdsFrom = $this->initialData->getEntityTypesWithKeyField($returnDestId ? 'source' : 'dest', 'entity_type_id'); - $entityTypeCodesTo = $this->initialData->getEntityTypesWithKeyField($returnDestId ? 'dest' : 'source', 'entity_type_code'); + $entityTypeIdsFrom = + $this->initialData->getEntityTypesWithKeyField($returnDestId ? 'source' : 'dest', 'entity_type_id'); + $entityTypeCodesTo = + $this->initialData->getEntityTypesWithKeyField($returnDestId ? 'dest' : 'source', 'entity_type_code'); if (isset($entityTypeIdsFrom[$initialEntityTypeId])) { $entityTypeCode = $entityTypeIdsFrom[$initialEntityTypeId]['entity_type_code']; diff --git a/src/Migration/Step/Eav/Helper.php b/src/Migration/Step/Eav/Helper.php index a6797cc86..8743b113a 100644 --- a/src/Migration/Step/Eav/Helper.php +++ b/src/Migration/Step/Eav/Helper.php @@ -184,6 +184,7 @@ public function setAddedGroups(array $addedGroups) * @param int|string $entityTypeIdCatalogProduct * @param int|string $entityTypeIdCatalogProductMapped * @return array + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function getDesignAttributeAndGroupsData($entityTypeIdCatalogProduct, $entityTypeIdCatalogProductMapped) { diff --git a/src/Migration/Step/Eav/Volume.php b/src/Migration/Step/Eav/Volume.php index f9a5334ea..ba1ba5a0f 100644 --- a/src/Migration/Step/Eav/Volume.php +++ b/src/Migration/Step/Eav/Volume.php @@ -144,7 +144,11 @@ protected function validateDestinationEavTable($tableName, array $conditions = [ if (!empty($attribute[$field]) && !class_exists($attribute[$field])) { $this->errors[] = sprintf( 'Class %s does not exist but mentioned in: %s.%s for %s=%s', - $attribute[$field], $tableName, $field, $primaryKeyName, $attribute[$primaryKeyName] + $attribute[$field], + $tableName, + $field, + $primaryKeyName, + $attribute[$primaryKeyName] ); } } @@ -169,7 +173,7 @@ protected function validateCustomConditions(array $attribute, array $conditions) } /** - * @param $attribute + * @param array $attribute * @return void */ protected function checkAttributesMismatch($attribute) diff --git a/src/Migration/Step/OrderGrids/Volume.php b/src/Migration/Step/OrderGrids/Volume.php index eda53a015..1c6f668dd 100644 --- a/src/Migration/Step/OrderGrids/Volume.php +++ b/src/Migration/Step/OrderGrids/Volume.php @@ -74,7 +74,6 @@ public function perform() return $this->checkForErrors(); } - /** * Get iterations count for step * diff --git a/src/Migration/Step/PostProcessing/Data.php b/src/Migration/Step/PostProcessing/Data.php index 580d7fb7c..e23e15009 100644 --- a/src/Migration/Step/PostProcessing/Data.php +++ b/src/Migration/Step/PostProcessing/Data.php @@ -14,7 +14,6 @@ use Migration\Logger\Logger; use Migration\Reader\GroupsFactory; - /** * Class Data */ @@ -96,7 +95,7 @@ protected function deleteMissingProductAttributeValues() if (!$attributeIds) { return ; } - foreach ($this->helper->getProductDestinationDocumentFields() as $document => $fields) { + foreach (array_keys($this->helper->getProductDestinationDocumentFields()) as $document) { $this->progress->advance(LogManager::LOG_LEVEL_INFO); $this->destination->deleteRecords($document, 'attribute_id', $attributeIds); } @@ -111,7 +110,7 @@ protected function getMissingProductAttributeIds() $adapter = $this->destination->getAdapter(); $selects = []; - foreach ($this->helper->getProductDestinationDocumentFields() as $document => $fields) { + foreach (array_keys($this->helper->getProductDestinationDocumentFields()) as $document) { $selects[] = $adapter->getSelect()->from( ['ea' => $this->helper->getEavAttributeDocument()], [] diff --git a/src/Migration/Step/PostProcessing/Helper.php b/src/Migration/Step/PostProcessing/Helper.php index 65066b650..158a4f58a 100644 --- a/src/Migration/Step/PostProcessing/Helper.php +++ b/src/Migration/Step/PostProcessing/Helper.php @@ -51,8 +51,8 @@ public function __construct( */ public function getProductDestinationDocumentFields() { - $entityIdName = (empty($this->editionMigrate) || $this->editionMigrate == Config::EDITION_MIGRATE_CE_TO_CE) - ? 'entity_id' + $entityIdName = (empty($this->editionMigrate) || $this->editionMigrate == Config::EDITION_MIGRATE_CE_TO_CE) + ? 'entity_id' : 'row_id'; return [ $this->getDestinationDocumentName('catalog_product_entity_datetime') => [ @@ -109,5 +109,4 @@ public function getDestinationDocumentName($document) { return $this->destination->addDocumentPrefix($document); } - } diff --git a/src/Migration/Step/PostProcessing/Integrity.php b/src/Migration/Step/PostProcessing/Integrity.php index c486e9d33..8845c9135 100644 --- a/src/Migration/Step/PostProcessing/Integrity.php +++ b/src/Migration/Step/PostProcessing/Integrity.php @@ -105,6 +105,9 @@ protected function getResourceModel($sourceType) return $map[$sourceType]; } + /** + * @return int + */ protected function getIterationsCount() { return count(array_keys($this->helper->getProductDestinationDocumentFields())); diff --git a/src/Migration/Step/SalesOrder/Helper.php b/src/Migration/Step/SalesOrder/Helper.php index 3c217bfda..e78a6f602 100644 --- a/src/Migration/Step/SalesOrder/Helper.php +++ b/src/Migration/Step/SalesOrder/Helper.php @@ -72,7 +72,6 @@ public function getDocumentList() return ['sales_flat_order' => 'sales_order']; } - /** * @return string */ diff --git a/src/Migration/Step/TierPrice/Helper.php b/src/Migration/Step/TierPrice/Helper.php index 758a5b6df..939ac7753 100644 --- a/src/Migration/Step/TierPrice/Helper.php +++ b/src/Migration/Step/TierPrice/Helper.php @@ -68,8 +68,8 @@ public function getSourceDocumentFields() */ public function getDestinationDocumentFields() { - $entityIdName = (empty($this->editionMigrate) || $this->editionMigrate == Config::EDITION_MIGRATE_CE_TO_CE) - ? 'entity_id' + $entityIdName = (empty($this->editionMigrate) || $this->editionMigrate == Config::EDITION_MIGRATE_CE_TO_CE) + ? 'entity_id' : 'row_id'; return [ self::DESTINATION_DOCUMENT_NAME => [ diff --git a/src/Migration/Step/UrlRewrite/Helper.php b/src/Migration/Step/UrlRewrite/Helper.php index 0e1b7f082..bc13d2618 100644 --- a/src/Migration/Step/UrlRewrite/Helper.php +++ b/src/Migration/Step/UrlRewrite/Helper.php @@ -41,8 +41,8 @@ public function __construct( /** * Fields processor * - * @param $resourceType - * @param $tableName + * @param string $resourceType + * @param string $tableName * @param array $fields * @param bool $inKeys * @return array @@ -55,8 +55,8 @@ public function processFields($resourceType, $tableName, array $fields, $inKeys /** * Rename fields of staging module * - * @param $resourceType - * @param $tableName + * @param string $resourceType + * @param string $tableName * @param array $fields * @param bool $inKeys * @return array @@ -67,7 +67,7 @@ private function processFieldsOfStagingModule($resourceType, $tableName, array $ $fieldStaging = $this->stagingConfig['field_staging']; $tablesStaging = $this->stagingConfig['tables']; - if(empty($this->editionMigrate) + if (empty($this->editionMigrate) || $this->editionMigrate == Config::EDITION_MIGRATE_CE_TO_CE || $resourceType == MapInterface::TYPE_SOURCE || !in_array($tableName, $tablesStaging) @@ -78,7 +78,7 @@ private function processFieldsOfStagingModule($resourceType, $tableName, array $ $fields[$fieldStaging] = $fields[$fieldEntityId]; unset($fields[$fieldEntityId]); } else { - $map = function($item) use ($fieldEntityId, $fieldStaging) { + $map = function ($item) use ($fieldEntityId, $fieldStaging) { return $item == $fieldEntityId ? $fieldStaging : $item; }; $fields = array_map($map, $fields); diff --git a/src/Migration/Step/UrlRewrite/Version11300to2000.php b/src/Migration/Step/UrlRewrite/Version11300to2000.php index 5e1988766..ec924b6f5 100644 --- a/src/Migration/Step/UrlRewrite/Version11300to2000.php +++ b/src/Migration/Step/UrlRewrite/Version11300to2000.php @@ -13,6 +13,7 @@ /** * Class Version11300to2000 + * @SuppressWarnings(PHPMD.TooManyFields) * @SuppressWarnings(PHPMD.CouplingBetweenObjects) * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.ExcessiveMethodLength) @@ -185,6 +186,7 @@ class Version11300to2000 extends DatabaseStage implements StageInterface, Rollba * @param \Migration\ResourceModel\Destination $destination * @param \Migration\ResourceModel\Record\CollectionFactory $recordCollectionFactory * @param \Migration\ResourceModel\RecordFactory $recordFactory + * @param \Migration\Step\UrlRewrite\Helper $helper * @param string $stage * @throws \Migration\Exception */ diff --git a/src/Migration/Step/UrlRewrite/Version11410to2000.php b/src/Migration/Step/UrlRewrite/Version11410to2000.php index 610715627..b9fa2541f 100644 --- a/src/Migration/Step/UrlRewrite/Version11410to2000.php +++ b/src/Migration/Step/UrlRewrite/Version11410to2000.php @@ -13,6 +13,7 @@ /** * Class Version11410to2000 + * @SuppressWarnings(PHPMD.TooManyFields) * @SuppressWarnings(PHPMD.CouplingBetweenObjects) * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.ExcessiveMethodLength) @@ -190,6 +191,7 @@ class Version11410to2000 extends DatabaseStage implements StageInterface, Rollba * @param \Migration\ResourceModel\Destination $destination * @param \Migration\ResourceModel\Record\CollectionFactory $recordCollectionFactory * @param \Migration\ResourceModel\RecordFactory $recordFactory + * @param \Migration\Step\UrlRewrite\Helper $helper * @param string $stage * @throws \Migration\Exception */ diff --git a/tests/unit/testsuite/Migration/App/Progress/FileTest.php b/tests/unit/testsuite/Migration/App/Progress/FileTest.php index d56399bce..5f8210a47 100644 --- a/tests/unit/testsuite/Migration/App/Progress/FileTest.php +++ b/tests/unit/testsuite/Migration/App/Progress/FileTest.php @@ -14,6 +14,7 @@ class FileTest extends \PHPUnit_Framework_TestCase * @var \Magento\Framework\Filesystem\Driver\File|\PHPUnit_Framework_MockObject_MockObject */ protected $filesystemDriver; + /** * @var \Magento\Framework\Filesystem|\PHPUnit_Framework_MockObject_MockObject */ diff --git a/tests/unit/testsuite/Migration/Step/CustomCustomerAttributes/VolumeTest.php b/tests/unit/testsuite/Migration/Step/CustomCustomerAttributes/VolumeTest.php index bad7f86b0..250327be8 100644 --- a/tests/unit/testsuite/Migration/Step/CustomCustomerAttributes/VolumeTest.php +++ b/tests/unit/testsuite/Migration/Step/CustomCustomerAttributes/VolumeTest.php @@ -128,7 +128,6 @@ public function testPerform() $this->source->expects($this->once())->method('getDocument')->with('document1')->willReturn($document); $this->destination->expects($this->once())->method('getDocument')->with('document2')->willReturn($document); - $this->destination->expects($this->any())->method('getRecordsCount') ->willReturnMap([['document2', true, [], 3]]); $this->assertTrue($this->volume->perform()); diff --git a/tests/unit/testsuite/Migration/Step/Customer/HelperTest.php b/tests/unit/testsuite/Migration/Step/Customer/HelperTest.php index 4fc62c160..1dd858340 100644 --- a/tests/unit/testsuite/Migration/Step/Customer/HelperTest.php +++ b/tests/unit/testsuite/Migration/Step/Customer/HelperTest.php @@ -23,6 +23,7 @@ class HelperTest extends \PHPUnit_Framework_TestCase * Attribute name */ const ATTRIBUTE = 'password_hash'; + /** * @var Helper */ diff --git a/tests/unit/testsuite/Migration/Step/Log/IntegrityTest.php b/tests/unit/testsuite/Migration/Step/Log/IntegrityTest.php index 6d46b8af2..18ab5dd51 100644 --- a/tests/unit/testsuite/Migration/Step/Log/IntegrityTest.php +++ b/tests/unit/testsuite/Migration/Step/Log/IntegrityTest.php @@ -140,7 +140,6 @@ public function testPerformMainFlow() $this->assertTrue($this->log->perform()); } - /** * @covers \Migration\Step\Log\Integrity::getIterationsCount * @return void diff --git a/tests/unit/testsuite/Migration/Step/Stores/DataTest.php b/tests/unit/testsuite/Migration/Step/Stores/DataTest.php index 95f0d33a8..251a0f8b0 100644 --- a/tests/unit/testsuite/Migration/Step/Stores/DataTest.php +++ b/tests/unit/testsuite/Migration/Step/Stores/DataTest.php @@ -18,6 +18,7 @@ class DataTest extends \PHPUnit_Framework_TestCase * @var Data */ protected $data; + /** * @var \Migration\ResourceModel\Source|\PHPUnit_Framework_MockObject_MockObject */ diff --git a/tests/unit/testsuite/Migration/Step/Stores/IntegrityTest.php b/tests/unit/testsuite/Migration/Step/Stores/IntegrityTest.php index 678fe0f08..b0be8fc8e 100644 --- a/tests/unit/testsuite/Migration/Step/Stores/IntegrityTest.php +++ b/tests/unit/testsuite/Migration/Step/Stores/IntegrityTest.php @@ -18,6 +18,7 @@ class IntegrityTest extends \PHPUnit_Framework_TestCase * @var Integrity */ protected $integrity; + /** * @var \Migration\ResourceModel\Source|\PHPUnit_Framework_MockObject_MockObject */ diff --git a/tests/unit/testsuite/Migration/Step/Stores/VolumeTest.php b/tests/unit/testsuite/Migration/Step/Stores/VolumeTest.php index 203d3693d..517451052 100644 --- a/tests/unit/testsuite/Migration/Step/Stores/VolumeTest.php +++ b/tests/unit/testsuite/Migration/Step/Stores/VolumeTest.php @@ -18,6 +18,7 @@ class VolumeTest extends \PHPUnit_Framework_TestCase * @var Volume */ protected $volume; + /** * @var \Migration\ResourceModel\Source|\PHPUnit_Framework_MockObject_MockObject */ From d4334e59c0fa7b39f7511840778fd9c759a937b5 Mon Sep 17 00:00:00 2001 From: Yurii Hryhoriev Date: Mon, 4 Jul 2016 15:27:18 +0300 Subject: [PATCH 54/71] MAGETWO-51627: Fix tests (prepare to 2.1 update) - unit tests fix --- .../Migration/RecordTransformerTest.php | 11 +++- .../ResourceModel/AbstractResourceTest.php | 10 ++-- .../ResourceModel/Adapter/MysqlTest.php | 10 ++-- .../ResourceModel/DestinationTest.php | 10 ++-- .../Migration/ResourceModel/SourceTest.php | 14 ++--- .../Migration/Step/Eav/InitialDataTest.php | 29 ++++++++-- .../Migration/Step/Eav/VolumeTest.php | 53 ++++++++++++++++++- .../testsuite/Migration/Step/Map/DataTest.php | 4 +- .../UrlRewrite/Version11410to2000Test.php | 10 ++++ .../Step/UrlRewrite/Version191to2000Test.php | 4 +- 10 files changed, 128 insertions(+), 27 deletions(-) diff --git a/tests/unit/testsuite/Migration/RecordTransformerTest.php b/tests/unit/testsuite/Migration/RecordTransformerTest.php index 9d5a45af9..04fd6d3a4 100644 --- a/tests/unit/testsuite/Migration/RecordTransformerTest.php +++ b/tests/unit/testsuite/Migration/RecordTransformerTest.php @@ -50,7 +50,16 @@ protected function setUp() false ); $this->destDocument = $this->getMock('Migration\ResourceModel\Document', ['getStructure'], [], '', false); - $this->mapReader = $this->getMock('Migration\Reader\MapInterface'); + $this->mapReader = $this->getMockForAbstractClass( + 'Migration\Reader\MapInterface', + [], + '', + false + ); + $this->mapReader->expects($this->any())->method('getHandlerConfigs')->willReturn([ + ['class' => 'FirstHandlerFullyQualifiedName', 'params' => []], + ['class' => 'SecondHandlerFullyQualifiedName', 'params' => []] + ]); $this->handlerManagerFactory = $this->getMock( 'Migration\Handler\ManagerFactory', ['create'], diff --git a/tests/unit/testsuite/Migration/ResourceModel/AbstractResourceTest.php b/tests/unit/testsuite/Migration/ResourceModel/AbstractResourceTest.php index 1d4bfc7e0..a85f59b91 100644 --- a/tests/unit/testsuite/Migration/ResourceModel/AbstractResourceTest.php +++ b/tests/unit/testsuite/Migration/ResourceModel/AbstractResourceTest.php @@ -71,10 +71,12 @@ protected function setUp() $destinationConfig['version'] = '2.0.0.0'; $adapterConfigs = ['config' => [ - 'host' => 'localhost', - 'dbname' => 'dbname', - 'username' => 'uname', - 'password' => 'upass', + 'database' => [ + 'host' => 'localhost', + 'dbname' => 'dbname', + 'username' => 'uname', + 'password' => 'upass', + ] ]]; $this->config = $this->getMock( '\Migration\Config', diff --git a/tests/unit/testsuite/Migration/ResourceModel/Adapter/MysqlTest.php b/tests/unit/testsuite/Migration/ResourceModel/Adapter/MysqlTest.php index bf4cb4183..31e04fcc7 100644 --- a/tests/unit/testsuite/Migration/ResourceModel/Adapter/MysqlTest.php +++ b/tests/unit/testsuite/Migration/ResourceModel/Adapter/MysqlTest.php @@ -24,10 +24,12 @@ class MysqlTest extends \PHPUnit_Framework_TestCase protected function setUp() { $config = [ - 'host' => 'localhost', - 'dbname' => 'dbname', - 'username' => 'uname', - 'password' => 'upass', + 'database' => [ + 'host' => 'localhost', + 'dbname' => 'dbname', + 'username' => 'uname', + 'password' => 'upass', + ] ]; $adapterConfigs = ['config' => [ 'host' => 'localhost', diff --git a/tests/unit/testsuite/Migration/ResourceModel/DestinationTest.php b/tests/unit/testsuite/Migration/ResourceModel/DestinationTest.php index 419cd4531..94ded72b8 100644 --- a/tests/unit/testsuite/Migration/ResourceModel/DestinationTest.php +++ b/tests/unit/testsuite/Migration/ResourceModel/DestinationTest.php @@ -62,10 +62,12 @@ protected function setUp() ] ]; $adapterConfigs = ['config' => [ - 'host' => 'localhost', - 'dbname' => 'dbname', - 'username' => 'uname', - 'password' => 'upass', + 'database' => [ + 'host' => 'localhost', + 'dbname' => 'dbname', + 'username' => 'uname', + 'password' => 'upass', + ] ]]; $this->config = $this->getMock('\Migration\Config', ['getOption', 'getDestination'], [], '', false); $this->config->expects($this->any()) diff --git a/tests/unit/testsuite/Migration/ResourceModel/SourceTest.php b/tests/unit/testsuite/Migration/ResourceModel/SourceTest.php index 44ec61ec2..9ea5adcdc 100644 --- a/tests/unit/testsuite/Migration/ResourceModel/SourceTest.php +++ b/tests/unit/testsuite/Migration/ResourceModel/SourceTest.php @@ -57,10 +57,12 @@ class SourceTest extends \PHPUnit_Framework_TestCase protected function setUp() { $adapterConfigs = ['config' => [ - 'host' => 'localhost', - 'dbname' => 'dbname', - 'username' => 'uname', - 'password' => 'upass', + 'database' => [ + 'host' => 'localhost', + 'password' => 'upass', + 'dbname' => 'dbname', + 'username' => 'uname' + ] ]]; $this->config = $this->getMock('\Migration\Config', ['getOption', 'getSource'], [], '', false); $config = [ @@ -68,9 +70,9 @@ protected function setUp() 'version' => '1.14.1.0', 'database' => [ 'host' => 'localhost', - 'name' => 'dbname', - 'user' => 'uname', 'password' => 'upass', + 'name' => 'dbname', + 'user' => 'uname' ] ]; $this->config->expects($this->once()) diff --git a/tests/unit/testsuite/Migration/Step/Eav/InitialDataTest.php b/tests/unit/testsuite/Migration/Step/Eav/InitialDataTest.php index 5736c8fbd..0431baec9 100644 --- a/tests/unit/testsuite/Migration/Step/Eav/InitialDataTest.php +++ b/tests/unit/testsuite/Migration/Step/Eav/InitialDataTest.php @@ -76,16 +76,37 @@ public function testInit() 'source' => ['id_1' => 'value_1','id_2' => 'value_2'], 'dest' => ['id_1' => 'value_1','id_2' => 'value_2'] ]; + $eavEntityTypes = [ + 'source' => [ + ['entity_type_id' => '1', 'entity_type_code' => 'customer'], + ['entity_type_id' => '2', 'entity_type_code' => 'customer_address'], + ['entity_type_id' => '3', 'entity_type_code' => 'catalog_category'], + ['entity_type_id' => '4', 'entity_type_code' => 'catalog_product'], + ['entity_type_id' => '5', 'entity_type_code' => 'order'], + ['entity_type_id' => '6', 'entity_type_code' => 'invoice'], + ['entity_type_id' => '7', 'entity_type_code' => 'creditmemo'], + ['entity_type_id' => '8', 'entity_type_code' => 'shipment'] + ], + 'dest' => [ + ['entity_type_id' => '1', 'entity_type_code' => 'customer'], + ['entity_type_id' => '2', 'entity_type_code' => 'customer_address'], + ['entity_type_id' => '3', 'entity_type_code' => 'catalog_category'], + ['entity_type_id' => '4', 'entity_type_code' => 'catalog_product'], + ['entity_type_id' => '5', 'entity_type_code' => 'some_m2_type'] + ], + ]; $attributeSets = ['attr_set_1', 'attr_set_2']; $attributeGroups = ['attr_group_1', 'attr_group_2']; - $this->helper->expects($this->once())->method('getSourceRecords')->willReturnMap( - [['eav_attribute', ['attribute_id'], $dataAttributes['source']]] - ); + $this->helper->expects($this->any())->method('getSourceRecords')->willReturnMap([ + ['eav_attribute', ['attribute_id'], $dataAttributes['source']], + ['eav_entity_type', [], $eavEntityTypes['source']] + ]); $this->helper->expects($this->any())->method('getDestinationRecords')->willReturnMap( [ ['eav_attribute', ['entity_type_id', 'attribute_code'], $dataAttributes['dest']], ['eav_attribute_set', ['attribute_set_id'], $attributeSets], - ['eav_attribute_group', ['attribute_set_id', 'attribute_group_name'], $attributeGroups] + ['eav_attribute_group', ['attribute_set_id', 'attribute_group_name'], $attributeGroups], + ['eav_entity_type', [], $eavEntityTypes['dest']] ] ); $this->initialData->init(); diff --git a/tests/unit/testsuite/Migration/Step/Eav/VolumeTest.php b/tests/unit/testsuite/Migration/Step/Eav/VolumeTest.php index 16222f981..3ae7b264d 100644 --- a/tests/unit/testsuite/Migration/Step/Eav/VolumeTest.php +++ b/tests/unit/testsuite/Migration/Step/Eav/VolumeTest.php @@ -35,6 +35,11 @@ class VolumeTest extends \PHPUnit_Framework_TestCase */ protected $readerGroups; + /** + * @var \Migration\ResourceModel\Destination|\PHPUnit_Framework_MockObject_MockObject + */ + protected $destination; + /** * @var \Migration\Step\Eav\Volume */ @@ -77,13 +82,18 @@ public function setUp() ->method('create') ->with('eav_document_groups_file') ->willReturn($this->readerGroups); + $this->destination = $this->getMockBuilder('\Migration\ResourceModel\Destination') + ->disableOriginalConstructor() + ->setMethods(['getDocument']) + ->getMock(); $this->volume = new Volume( $this->helper, $this->initialData, $this->logger, $this->progress, - $groupsFactory + $groupsFactory, + $this->destination ); } @@ -145,6 +155,9 @@ public function testPerform() $this->helper->expects($this->once())->method('deleteBackups'); $this->logger->expects($this->never())->method('addRecord'); + $documentsMap = $this->getDocumentsMap(); + $this->destination->expects($this->any())->method('getDocument')->willReturnMap($documentsMap); + $this->assertTrue($this->volume->perform()); } @@ -206,6 +219,44 @@ public function testPerformWithError() $this->helper->expects($this->never())->method('deleteBackups'); $this->logger->expects($this->atLeastOnce())->method('addRecord'); + $documentsMap = $this->getDocumentsMap(); + $this->destination->expects($this->any())->method('getDocument')->willReturnMap($documentsMap); + $this->assertFalse($this->volume->perform()); } + + protected function getDocumentsMap() + { + $structureFields = [ + 'eav_attribute' => + [ + 'attribute_id' => ['COLUMN_NAME' => 'attribute_id', 'PRIMARY' => true], + 'field' => ['COLUMN_NAME' => 'field', 'PRIMARY' => false], + ], + 'catalog_eav_attribute' => + [ + 'attribute_id' => ['COLUMN_NAME' => 'attribute_id', 'PRIMARY' => true], + 'field' => ['COLUMN_NAME' => 'field', 'PRIMARY' => false], + ], + 'customer_eav_attribute' => + [ + 'attribute_id' => ['COLUMN_NAME' => 'attribute_id', 'PRIMARY' => true], + 'field' => ['COLUMN_NAME' => 'field', 'PRIMARY' => false], + ], + 'eav_entity_type' => + [ + 'attribute_id' => ['COLUMN_NAME' => 'attribute_id', 'PRIMARY' => true], + 'field' => ['COLUMN_NAME' => 'field', 'PRIMARY' => false], + ], + ]; + $documentsMap = []; + foreach ($structureFields as $documentName => $structure) { + $structure = new \Migration\ResourceModel\Structure($structureFields[$documentName]); + $destDocument = $this->getMock('\Migration\ResourceModel\Document', ['getStructure'], [], '', false); + $destDocument->expects($this->once())->method('getStructure')->willReturn($structure); + $documentsMap[] = [$documentName, $destDocument]; + } + + return $documentsMap; + } } diff --git a/tests/unit/testsuite/Migration/Step/Map/DataTest.php b/tests/unit/testsuite/Migration/Step/Map/DataTest.php index 1895ef8e2..dca0898a6 100644 --- a/tests/unit/testsuite/Migration/Step/Map/DataTest.php +++ b/tests/unit/testsuite/Migration/Step/Map/DataTest.php @@ -106,7 +106,7 @@ public function setUp() false ); $this->map = $this->getMockBuilder('Migration\Reader\Map')->disableOriginalConstructor() - ->setMethods(['getDocumentMap', 'getHandlerConfig']) + ->setMethods(['getDocumentMap', 'getHandlerConfigs']) ->getMock(); /** @var \Migration\Config|\PHPUnit_Framework_MockObject_MockObject $config */ @@ -175,7 +175,7 @@ public function testPerform() $dstDocName = 'config_data'; $this->progress->expects($this->once())->method('getProcessedEntities')->will($this->returnValue([])); $this->map->expects($this->once())->method('getDocumentMap')->will($this->returnValue($dstDocName)); - $this->map->expects($this->any())->method('getHandlerConfig')->willReturn(['class' => 'Handler\Class']); + $this->map->expects($this->any())->method('getHandlerConfigs')->willReturn(['class' => 'Handler\Class']); $sourceDocument = $this->getMock( '\Migration\ResourceModel\Document', diff --git a/tests/unit/testsuite/Migration/Step/UrlRewrite/Version11410to2000Test.php b/tests/unit/testsuite/Migration/Step/UrlRewrite/Version11410to2000Test.php index 01b8bbd35..134f7c3e8 100644 --- a/tests/unit/testsuite/Migration/Step/UrlRewrite/Version11410to2000Test.php +++ b/tests/unit/testsuite/Migration/Step/UrlRewrite/Version11410to2000Test.php @@ -50,6 +50,11 @@ class Version11410to2000Test extends \PHPUnit_Framework_TestCase */ protected $recordFactory; + /** + * @var \Migration\Step\UrlRewrite\Helper|\PHPUnit_Framework_MockObject_MockObject + */ + protected $helper; + /** * @return void */ @@ -78,6 +83,7 @@ public function setUp() false ); $this->recordFactory = $this->getMock('\Migration\ResourceModel\RecordFactory', ['create'], [], '', false); + $this->helper = $this->getMock('\Migration\Step\UrlRewrite\Helper', [], ['processFields'], '', false); } /** @@ -85,6 +91,9 @@ public function setUp() */ public function testIntegrity() { + $this->helper->expects($this->any())->method('processFields')->willReturn([ + 'array' => 'with_processed_fields' + ]); $this->version = new \Migration\Step\UrlRewrite\Version11410to2000( $this->progress, $this->logger, @@ -93,6 +102,7 @@ public function testIntegrity() $this->destination, $this->recordCollectionFactory, $this->recordFactory, + $this->helper, 'integrity' ); } diff --git a/tests/unit/testsuite/Migration/Step/UrlRewrite/Version191to2000Test.php b/tests/unit/testsuite/Migration/Step/UrlRewrite/Version191to2000Test.php index f70a198c4..ca192961e 100644 --- a/tests/unit/testsuite/Migration/Step/UrlRewrite/Version191to2000Test.php +++ b/tests/unit/testsuite/Migration/Step/UrlRewrite/Version191to2000Test.php @@ -69,12 +69,14 @@ public function setUp() $this->source = $this->getMock('\Migration\ResourceModel\Source', [], [], '', false); $select = $this->getMockBuilder('Magento\Framework\DB\Select') - ->setMethods(['from', 'joinLeft']) + ->setMethods(['from', 'joinLeft', 'where', 'group']) ->disableOriginalConstructor() ->getMock(); $select->expects($this->any())->method('from')->willReturnSelf(); $select->expects($this->any())->method('joinLeft')->willReturnSelf(); + $select->expects($this->any())->method('where')->willReturnSelf(); + $select->expects($this->any())->method('group')->willReturnSelf(); $sourceAdapter = $this->getMockBuilder('Migration\ResourceModel\Adapter\Mysql')->disableOriginalConstructor() ->setMethods(['getSelect', 'loadDataFromSelect']) From 44d9c61fc269844157c0c2997aaea24b6b1db3f8 Mon Sep 17 00:00:00 2001 From: Yurii Hryhoriev Date: Mon, 4 Jul 2016 15:31:38 +0300 Subject: [PATCH 55/71] MAGETWO-51627: Fix tests (prepare to 2.1 update) - integration tests fix --- src/Migration/Step/Eav/Data.php | 60 ++++++++++--------- .../testsuite/Migration/_files/class-map.xml | 28 +++++++++ 2 files changed, 60 insertions(+), 28 deletions(-) diff --git a/src/Migration/Step/Eav/Data.php b/src/Migration/Step/Eav/Data.php index 57eeceaf7..55da311f5 100644 --- a/src/Migration/Step/Eav/Data.php +++ b/src/Migration/Step/Eav/Data.php @@ -401,35 +401,39 @@ public function processDesignEntityAttributes($recordsToSave) $recordsToSave = $recordsToSaveFiltered; foreach ($data['scheduleGroupsMigrated'] as $group) { - $dataRecord = [ - 'entity_attribute_id' => null, - 'entity_type_id' => $entityTypeIdCatalogProductMapped, - 'attribute_set_id' => $group['attribute_set_id'], - 'attribute_group_id' => $group['attribute_group_id'], - 'attribute_id' => $data['customDesignAttributeId'], - 'sort_order' => 40, - ]; - $destinationRecord = $this->factory->create([ - 'document' => $entityAttributeDocument, - 'data' => $dataRecord - ]); - /** Adding custom_design */ - $recordsToSave->addRecord($destinationRecord); + if(isset($data['customDesignAttributeId']) && $data['customDesignAttributeId']) { + $dataRecord = [ + 'entity_attribute_id' => null, + 'entity_type_id' => $entityTypeIdCatalogProductMapped, + 'attribute_set_id' => $group['attribute_set_id'], + 'attribute_group_id' => $group['attribute_group_id'], + 'attribute_id' => $data['customDesignAttributeId'], + 'sort_order' => 40, + ]; + $destinationRecord = $this->factory->create([ + 'document' => $entityAttributeDocument, + 'data' => $dataRecord + ]); + /** Adding custom_design */ + $recordsToSave->addRecord($destinationRecord); + } - $dataRecord = [ - 'entity_attribute_id' => null, - 'entity_type_id' => $entityTypeIdCatalogProductMapped, - 'attribute_set_id' => $group['attribute_set_id'], - 'attribute_group_id' => $group['attribute_group_id'], - 'attribute_id' => $data['customLayoutAttributeId'], - 'sort_order' => 50, - ]; - $destinationRecord = $this->factory->create([ - 'document' => $entityAttributeDocument, - 'data' => $dataRecord - ]); - /** Adding custom_layout */ - $recordsToSave->addRecord($destinationRecord); + if(isset($data['customLayoutAttributeId']) && $data['customLayoutAttributeId']) { + $dataRecord = [ + 'entity_attribute_id' => null, + 'entity_type_id' => $entityTypeIdCatalogProductMapped, + 'attribute_set_id' => $group['attribute_set_id'], + 'attribute_group_id' => $group['attribute_group_id'], + 'attribute_id' => $data['customLayoutAttributeId'], + 'sort_order' => 50, + ]; + $destinationRecord = $this->factory->create([ + 'document' => $entityAttributeDocument, + 'data' => $dataRecord + ]); + /** Adding custom_layout */ + $recordsToSave->addRecord($destinationRecord); + } } return $recordsToSave; diff --git a/tests/integration/testsuite/Migration/_files/class-map.xml b/tests/integration/testsuite/Migration/_files/class-map.xml index 64ec965e7..037fb26a0 100644 --- a/tests/integration/testsuite/Migration/_files/class-map.xml +++ b/tests/integration/testsuite/Migration/_files/class-map.xml @@ -6,6 +6,34 @@ */ --> + + customer/customer + Magento\Customer\Model\ResourceModel\Customer + + + catalog/product + Magento\Catalog\Model\ResourceModel\Product + + + customer/attribute + Magento\Customer\Model\Attribute + + + eav/entity_increment_numeric + Magento\Eav\Model\Entity\Increment\NumericValue + + + customer/attribute_collection + Magento\Customer\Model\ResourceModel\Attribute\Collection + + + catalog/resource_eav_attribute + Magento\Catalog\Model\ResourceModel\Eav\Attribute + + + catalog/product_attribute_collection + Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection + catalog/product_attribute_backend_sku Magento\Catalog\Model\Product\Attribute\Backend\Sku From 7e5ec0d68fb6f972487ac98dce1d4b54f62adb0a Mon Sep 17 00:00:00 2001 From: Yurii Hryhoriev Date: Mon, 4 Jul 2016 15:33:59 +0300 Subject: [PATCH 56/71] MAGETWO-51627: Fix tests (prepare to 2.1 update) - fix for Magento\Eav\Model\Entity\Increment\Numeric renamed cass --- etc/ce-to-ce/class-map.xml.dist | 2 +- etc/ce-to-ee/class-map.xml.dist | 2 +- etc/ee-to-ee/class-map.xml.dist | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/ce-to-ce/class-map.xml.dist b/etc/ce-to-ce/class-map.xml.dist index ba77d09dd..89ed2db2a 100644 --- a/etc/ce-to-ce/class-map.xml.dist +++ b/etc/ce-to-ce/class-map.xml.dist @@ -304,7 +304,7 @@ eav/entity_increment_numeric - Magento\Eav\Model\Entity\Increment\Numeric + Magento\Eav\Model\Entity\Increment\NumericValue giftmessage/adminhtml_product_helper_form_config diff --git a/etc/ce-to-ee/class-map.xml.dist b/etc/ce-to-ee/class-map.xml.dist index 9628dbb95..27de7f80f 100644 --- a/etc/ce-to-ee/class-map.xml.dist +++ b/etc/ce-to-ee/class-map.xml.dist @@ -304,7 +304,7 @@ eav/entity_increment_numeric - Magento\Eav\Model\Entity\Increment\Numeric + Magento\Eav\Model\Entity\Increment\NumericValue giftmessage/adminhtml_product_helper_form_config diff --git a/etc/ee-to-ee/class-map.xml.dist b/etc/ee-to-ee/class-map.xml.dist index ea650b19f..b5851c83f 100644 --- a/etc/ee-to-ee/class-map.xml.dist +++ b/etc/ee-to-ee/class-map.xml.dist @@ -304,7 +304,7 @@ eav/entity_increment_numeric - Magento\Eav\Model\Entity\Increment\Numeric + Magento\Eav\Model\Entity\Increment\NumericValue giftmessage/adminhtml_product_helper_form_config From dde655b1ce36e1f470a9e39a69624844029f1a4d Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Mon, 4 Jul 2016 17:13:57 +0300 Subject: [PATCH 57/71] MAGETWO-51627: Fix tests (prepare to 2.1 update) --- src/Migration/Step/Eav/Data.php | 4 ++-- tests/unit/testsuite/Migration/Step/Eav/VolumeTest.php | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Migration/Step/Eav/Data.php b/src/Migration/Step/Eav/Data.php index 55da311f5..81245fbd0 100644 --- a/src/Migration/Step/Eav/Data.php +++ b/src/Migration/Step/Eav/Data.php @@ -401,7 +401,7 @@ public function processDesignEntityAttributes($recordsToSave) $recordsToSave = $recordsToSaveFiltered; foreach ($data['scheduleGroupsMigrated'] as $group) { - if(isset($data['customDesignAttributeId']) && $data['customDesignAttributeId']) { + if (isset($data['customDesignAttributeId']) && $data['customDesignAttributeId']) { $dataRecord = [ 'entity_attribute_id' => null, 'entity_type_id' => $entityTypeIdCatalogProductMapped, @@ -418,7 +418,7 @@ public function processDesignEntityAttributes($recordsToSave) $recordsToSave->addRecord($destinationRecord); } - if(isset($data['customLayoutAttributeId']) && $data['customLayoutAttributeId']) { + if (isset($data['customLayoutAttributeId']) && $data['customLayoutAttributeId']) { $dataRecord = [ 'entity_attribute_id' => null, 'entity_type_id' => $entityTypeIdCatalogProductMapped, diff --git a/tests/unit/testsuite/Migration/Step/Eav/VolumeTest.php b/tests/unit/testsuite/Migration/Step/Eav/VolumeTest.php index 3ae7b264d..1abe64ea4 100644 --- a/tests/unit/testsuite/Migration/Step/Eav/VolumeTest.php +++ b/tests/unit/testsuite/Migration/Step/Eav/VolumeTest.php @@ -225,6 +225,9 @@ public function testPerformWithError() $this->assertFalse($this->volume->perform()); } + /** + * @return array + */ protected function getDocumentsMap() { $structureFields = [ From c3abf85e3bc42adbe71b7b512aaabe0c7fe48164 Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Tue, 5 Jul 2016 09:32:04 +0300 Subject: [PATCH 58/71] MAGETWO-54991: The "1062 Duplicate entry" error appears during migration 1.7.0.2 --- etc/ce-to-ce/1.6.0.0/map.xml.dist | 3 +++ etc/ce-to-ce/1.6.1.0/map.xml.dist | 9 +++------ etc/ce-to-ce/1.6.2.0/map.xml.dist | 9 +++------ etc/ce-to-ce/1.7.0.0/map.xml.dist | 9 +++------ etc/ce-to-ce/1.7.0.1/map.xml.dist | 9 +++------ etc/ce-to-ce/1.7.0.2/map.xml.dist | 9 +++------ etc/ce-to-ce/1.8.0.0/map.xml.dist | 9 +++------ etc/ce-to-ce/1.8.1.0/map.xml.dist | 9 +++------ etc/ce-to-ce/1.9.0.0/map.xml.dist | 9 +++------ etc/ce-to-ce/1.9.0.1/map.xml.dist | 9 +++------ etc/ce-to-ce/1.9.1.0/map.xml.dist | 9 +++------ etc/ce-to-ce/1.9.1.1/map.xml.dist | 9 +++------ etc/ce-to-ce/1.9.2.0/map.xml.dist | 9 +++------ etc/ce-to-ce/1.9.2.1/map.xml.dist | 9 +++------ etc/ce-to-ce/1.9.2.2/map.xml.dist | 9 +++------ etc/ce-to-ce/1.9.2.3/map.xml.dist | 9 +++------ etc/ce-to-ce/1.9.2.4/map.xml.dist | 9 +++------ etc/ce-to-ee/1.6.0.0/map.xml.dist | 3 +++ etc/ce-to-ee/1.6.1.0/map.xml.dist | 9 +++------ etc/ce-to-ee/1.6.2.0/map.xml.dist | 9 +++------ etc/ce-to-ee/1.7.0.0/map.xml.dist | 9 +++------ etc/ce-to-ee/1.7.0.1/map.xml.dist | 9 +++------ etc/ce-to-ee/1.7.0.2/map.xml.dist | 9 +++------ etc/ce-to-ee/1.8.0.0/map.xml.dist | 9 +++------ etc/ce-to-ee/1.8.1.0/map.xml.dist | 9 +++------ etc/ce-to-ee/1.9.0.0/map.xml.dist | 9 +++------ etc/ce-to-ee/1.9.0.1/map.xml.dist | 9 +++------ etc/ce-to-ee/1.9.1.0/map.xml.dist | 9 +++------ etc/ce-to-ee/1.9.1.1/map.xml.dist | 9 +++------ etc/ce-to-ee/1.9.2.0/map.xml.dist | 9 +++------ etc/ce-to-ee/1.9.2.1/map.xml.dist | 9 +++------ etc/ce-to-ee/1.9.2.2/map.xml.dist | 9 +++------ etc/ce-to-ee/1.9.2.3/map.xml.dist | 9 +++------ etc/ce-to-ee/1.9.2.4/map.xml.dist | 9 +++------ etc/ee-to-ee/1.11.0.0/map.xml.dist | 9 +++------ etc/ee-to-ee/1.11.0.1/map.xml.dist | 9 +++------ etc/ee-to-ee/1.11.0.2/map.xml.dist | 9 +++------ etc/ee-to-ee/1.11.1.0/map.xml.dist | 9 +++------ etc/ee-to-ee/1.11.2.0/map.xml.dist | 9 +++------ etc/ee-to-ee/1.12.0.0/map.xml.dist | 9 +++------ etc/ee-to-ee/1.12.0.1/map.xml.dist | 9 +++------ etc/ee-to-ee/1.12.0.2/map.xml.dist | 9 +++------ etc/ee-to-ee/1.13.0.0/map.xml.dist | 9 +++------ etc/ee-to-ee/1.13.0.1/map.xml.dist | 9 +++------ etc/ee-to-ee/1.13.0.2/map.xml.dist | 9 +++------ etc/ee-to-ee/1.13.1.0/map.xml.dist | 9 +++------ etc/ee-to-ee/1.14.0.0/map.xml.dist | 9 +++------ etc/ee-to-ee/1.14.0.1/map.xml.dist | 9 +++------ etc/ee-to-ee/1.14.1.0/map.xml.dist | 9 +++------ etc/ee-to-ee/1.14.2.0/map.xml.dist | 9 +++------ etc/ee-to-ee/1.14.2.1/map.xml.dist | 3 +++ etc/ee-to-ee/1.14.2.2/map.xml.dist | 3 +++ etc/ee-to-ee/1.14.2.3/map.xml.dist | 9 +++------ etc/ee-to-ee/1.14.2.4/map.xml.dist | 9 +++------ 54 files changed, 162 insertions(+), 300 deletions(-) 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 index e57dd1a42..c8a3632f4 100644 --- a/etc/ce-to-ce/1.6.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.0.0/map.xml.dist @@ -149,6 +149,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx 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 index f8a615726..ec85b0707 100644 --- a/etc/ce-to-ce/1.6.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.1.0/map.xml.dist @@ -149,6 +149,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1529,12 +1532,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index d43b05c02..7f5a4963d 100644 --- a/etc/ce-to-ce/1.6.2.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.2.0/map.xml.dist @@ -149,6 +149,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1529,12 +1532,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index dc1466e28..18e1c9686 100644 --- a/etc/ce-to-ce/1.7.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.0/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1456,12 +1459,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index dc1466e28..18e1c9686 100644 --- a/etc/ce-to-ce/1.7.0.1/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.1/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1456,12 +1459,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index dc1466e28..18e1c9686 100644 --- a/etc/ce-to-ce/1.7.0.2/map.xml.dist +++ b/etc/ce-to-ce/1.7.0.2/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1456,12 +1459,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index 4aac5c9c0..36653bc24 100644 --- a/etc/ce-to-ce/1.8.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.8.0.0/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1456,12 +1459,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index e6dc52251..98a1215bd 100644 --- a/etc/ce-to-ce/1.8.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.8.1.0/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1453,12 +1456,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index 10a3be2b7..698435e41 100644 --- a/etc/ce-to-ce/1.9.0.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.0.0/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1462,12 +1465,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index 10a3be2b7..698435e41 100644 --- a/etc/ce-to-ce/1.9.0.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.0.1/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1462,12 +1465,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index dc7365a26..10e86ba6a 100644 --- a/etc/ce-to-ce/1.9.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.1.0/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1462,12 +1465,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index dc7365a26..10e86ba6a 100644 --- a/etc/ce-to-ce/1.9.1.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.1.1/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1462,12 +1465,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index 75514696f..9f7e5a9fb 100644 --- a/etc/ce-to-ce/1.9.2.0/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.0/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1476,12 +1479,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index 75514696f..9f7e5a9fb 100644 --- a/etc/ce-to-ce/1.9.2.1/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.1/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1476,12 +1479,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active diff --git a/etc/ce-to-ce/1.9.2.2/map.xml.dist b/etc/ce-to-ce/1.9.2.2/map.xml.dist index f23012dc7..a25cf9955 100644 --- a/etc/ce-to-ce/1.9.2.2/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.2/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1482,12 +1485,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active diff --git a/etc/ce-to-ce/1.9.2.3/map.xml.dist b/etc/ce-to-ce/1.9.2.3/map.xml.dist index f23012dc7..a25cf9955 100644 --- a/etc/ce-to-ce/1.9.2.3/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.3/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1482,12 +1485,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active diff --git a/etc/ce-to-ce/1.9.2.4/map.xml.dist b/etc/ce-to-ce/1.9.2.4/map.xml.dist index f23012dc7..a25cf9955 100644 --- a/etc/ce-to-ce/1.9.2.4/map.xml.dist +++ b/etc/ce-to-ce/1.9.2.4/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1482,12 +1485,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active diff --git a/etc/ce-to-ee/1.6.0.0/map.xml.dist b/etc/ce-to-ee/1.6.0.0/map.xml.dist index c5646feb9..1e37b9941 100644 --- a/etc/ce-to-ee/1.6.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.6.0.0/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx diff --git a/etc/ce-to-ee/1.6.1.0/map.xml.dist b/etc/ce-to-ee/1.6.1.0/map.xml.dist index 80e6cf83f..971fd594f 100644 --- a/etc/ce-to-ee/1.6.1.0/map.xml.dist +++ b/etc/ce-to-ee/1.6.1.0/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1974,12 +1977,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active diff --git a/etc/ce-to-ee/1.6.2.0/map.xml.dist b/etc/ce-to-ee/1.6.2.0/map.xml.dist index 138ddf8b2..be31ca8a1 100644 --- a/etc/ce-to-ee/1.6.2.0/map.xml.dist +++ b/etc/ce-to-ee/1.6.2.0/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1974,12 +1977,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active diff --git a/etc/ce-to-ee/1.7.0.0/map.xml.dist b/etc/ce-to-ee/1.7.0.0/map.xml.dist index 652d0e10a..13e9ae1b4 100644 --- a/etc/ce-to-ee/1.7.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.7.0.0/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1889,12 +1892,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active diff --git a/etc/ce-to-ee/1.7.0.1/map.xml.dist b/etc/ce-to-ee/1.7.0.1/map.xml.dist index 652d0e10a..13e9ae1b4 100644 --- a/etc/ce-to-ee/1.7.0.1/map.xml.dist +++ b/etc/ce-to-ee/1.7.0.1/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1889,12 +1892,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active diff --git a/etc/ce-to-ee/1.7.0.2/map.xml.dist b/etc/ce-to-ee/1.7.0.2/map.xml.dist index 652d0e10a..13e9ae1b4 100644 --- a/etc/ce-to-ee/1.7.0.2/map.xml.dist +++ b/etc/ce-to-ee/1.7.0.2/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1889,12 +1892,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active diff --git a/etc/ce-to-ee/1.8.0.0/map.xml.dist b/etc/ce-to-ee/1.8.0.0/map.xml.dist index eab5b493e..66c5148b1 100644 --- a/etc/ce-to-ee/1.8.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.8.0.0/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1889,12 +1892,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active diff --git a/etc/ce-to-ee/1.8.1.0/map.xml.dist b/etc/ce-to-ee/1.8.1.0/map.xml.dist index 572587aa9..402c84e85 100644 --- a/etc/ce-to-ee/1.8.1.0/map.xml.dist +++ b/etc/ce-to-ee/1.8.1.0/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1886,12 +1889,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active diff --git a/etc/ce-to-ee/1.9.0.0/map.xml.dist b/etc/ce-to-ee/1.9.0.0/map.xml.dist index a3dd56a05..709fe7a4e 100644 --- a/etc/ce-to-ee/1.9.0.0/map.xml.dist +++ b/etc/ce-to-ee/1.9.0.0/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1889,12 +1892,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active diff --git a/etc/ce-to-ee/1.9.0.1/map.xml.dist b/etc/ce-to-ee/1.9.0.1/map.xml.dist index eab5b493e..66c5148b1 100644 --- a/etc/ce-to-ee/1.9.0.1/map.xml.dist +++ b/etc/ce-to-ee/1.9.0.1/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1889,12 +1892,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active diff --git a/etc/ce-to-ee/1.9.1.0/map.xml.dist b/etc/ce-to-ee/1.9.1.0/map.xml.dist index 4f95a1fe9..230f5e9a3 100644 --- a/etc/ce-to-ee/1.9.1.0/map.xml.dist +++ b/etc/ce-to-ee/1.9.1.0/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1889,12 +1892,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active diff --git a/etc/ce-to-ee/1.9.1.1/map.xml.dist b/etc/ce-to-ee/1.9.1.1/map.xml.dist index 4f95a1fe9..230f5e9a3 100644 --- a/etc/ce-to-ee/1.9.1.1/map.xml.dist +++ b/etc/ce-to-ee/1.9.1.1/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1889,12 +1892,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active diff --git a/etc/ce-to-ee/1.9.2.0/map.xml.dist b/etc/ce-to-ee/1.9.2.0/map.xml.dist index f8a5a0609..e248f49ea 100644 --- a/etc/ce-to-ee/1.9.2.0/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.0/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1909,12 +1912,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active diff --git a/etc/ce-to-ee/1.9.2.1/map.xml.dist b/etc/ce-to-ee/1.9.2.1/map.xml.dist index f8a5a0609..e248f49ea 100644 --- a/etc/ce-to-ee/1.9.2.1/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.1/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1909,12 +1912,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active diff --git a/etc/ce-to-ee/1.9.2.2/map.xml.dist b/etc/ce-to-ee/1.9.2.2/map.xml.dist index 913e739e7..d359e49ac 100644 --- a/etc/ce-to-ee/1.9.2.2/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.2/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1915,12 +1918,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active diff --git a/etc/ce-to-ee/1.9.2.3/map.xml.dist b/etc/ce-to-ee/1.9.2.3/map.xml.dist index 913e739e7..d359e49ac 100644 --- a/etc/ce-to-ee/1.9.2.3/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.3/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1915,12 +1918,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active diff --git a/etc/ce-to-ee/1.9.2.4/map.xml.dist b/etc/ce-to-ee/1.9.2.4/map.xml.dist index 913e739e7..d359e49ac 100644 --- a/etc/ce-to-ee/1.9.2.4/map.xml.dist +++ b/etc/ce-to-ee/1.9.2.4/map.xml.dist @@ -158,6 +158,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -1915,12 +1918,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index 6946d0a48..37f6360b5 100644 --- a/etc/ee-to-ee/1.11.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.0/map.xml.dist @@ -170,6 +170,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -2226,12 +2229,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index 09314332d..c491eb2c6 100644 --- a/etc/ee-to-ee/1.11.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.1/map.xml.dist @@ -170,6 +170,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -2226,12 +2229,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index 09314332d..c491eb2c6 100644 --- a/etc/ee-to-ee/1.11.0.2/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.2/map.xml.dist @@ -170,6 +170,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -2226,12 +2229,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index 8c1311482..ab14461c5 100644 --- a/etc/ee-to-ee/1.11.1.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.1.0/map.xml.dist @@ -170,6 +170,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -2214,12 +2217,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index 8b1bd93c0..d86c3afe8 100644 --- a/etc/ee-to-ee/1.11.2.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.2.0/map.xml.dist @@ -170,6 +170,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -2214,12 +2217,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index ecb7c2021..020b58154 100644 --- a/etc/ee-to-ee/1.12.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.0/map.xml.dist @@ -170,6 +170,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -2166,12 +2169,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index 5096d8b48..e26ae16f4 100644 --- a/etc/ee-to-ee/1.12.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.1/map.xml.dist @@ -170,6 +170,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -2166,12 +2169,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index 5096d8b48..e26ae16f4 100644 --- a/etc/ee-to-ee/1.12.0.2/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.2/map.xml.dist @@ -170,6 +170,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -2166,12 +2169,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index 622107117..3b4a35ff3 100644 --- a/etc/ee-to-ee/1.13.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.13.0.0/map.xml.dist @@ -170,6 +170,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -2126,12 +2129,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index d87d0a433..8c72607ea 100644 --- a/etc/ee-to-ee/1.13.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.13.0.1/map.xml.dist @@ -170,6 +170,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -2126,12 +2129,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index d87d0a433..8c72607ea 100644 --- a/etc/ee-to-ee/1.13.0.2/map.xml.dist +++ b/etc/ee-to-ee/1.13.0.2/map.xml.dist @@ -170,6 +170,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -2126,12 +2129,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index f06840979..9fc6b5553 100644 --- a/etc/ee-to-ee/1.13.1.0/map.xml.dist +++ b/etc/ee-to-ee/1.13.1.0/map.xml.dist @@ -170,6 +170,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -2132,12 +2135,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index bf41f66c4..689c78712 100644 --- a/etc/ee-to-ee/1.14.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.14.0.0/map.xml.dist @@ -170,6 +170,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -2132,12 +2135,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index bf41f66c4..689c78712 100644 --- a/etc/ee-to-ee/1.14.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.14.0.1/map.xml.dist @@ -170,6 +170,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -2132,12 +2135,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index b843a7a90..40f2526e3 100644 --- a/etc/ee-to-ee/1.14.1.0/map.xml.dist +++ b/etc/ee-to-ee/1.14.1.0/map.xml.dist @@ -170,6 +170,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -2134,12 +2137,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index 495bc312a..368df7232 100644 --- a/etc/ee-to-ee/1.14.2.0/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.0/map.xml.dist @@ -170,6 +170,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -2171,12 +2174,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index 495bc312a..ac7be3ea3 100644 --- a/etc/ee-to-ee/1.14.2.1/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.1/map.xml.dist @@ -170,6 +170,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx 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 index b9a93d6db..671011c74 100644 --- a/etc/ee-to-ee/1.14.2.2/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.2/map.xml.dist @@ -170,6 +170,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx 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 index b9a93d6db..93daf160a 100644 --- a/etc/ee-to-ee/1.14.2.3/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.3/map.xml.dist @@ -170,6 +170,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -2177,12 +2180,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active 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 index b9a93d6db..93daf160a 100644 --- a/etc/ee-to-ee/1.14.2.4/map.xml.dist +++ b/etc/ee-to-ee/1.14.2.4/map.xml.dist @@ -170,6 +170,9 @@ catalog_product_flat_cl + + cataloginventory_stock_status + cataloginventory_stock_status_idx @@ -2177,12 +2180,6 @@ - - cataloginventory_stock_status.website_id - - - - rating.is_active From ed57ee4a1fc89269c04a2935b893cf446f1a0252 Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Tue, 5 Jul 2016 13:51:51 +0300 Subject: [PATCH 59/71] MAGETWO-55052: List of errors appear during 1.11.2.0 migration --- etc/ce-to-ce/1.6.0.0/config.xml.dist | 1 + etc/ce-to-ce/1.6.0.0/map-customer.xml.dist | 9 ++++++ etc/ce-to-ce/1.6.1.0/config.xml.dist | 1 + etc/ce-to-ce/1.6.1.0/map-customer.xml.dist | 9 ++++++ etc/ce-to-ce/1.6.1.0/map.xml.dist | 2 +- etc/ce-to-ce/1.6.2.0/config.xml.dist | 1 + etc/ce-to-ce/1.6.2.0/map-customer.xml.dist | 9 ++++++ etc/ce-to-ce/1.7.0.0/config.xml.dist | 1 + etc/ce-to-ce/1.7.0.1/config.xml.dist | 1 + etc/ce-to-ce/1.7.0.2/config.xml.dist | 1 + etc/ce-to-ce/1.8.0.0/config.xml.dist | 1 + etc/ce-to-ce/1.8.1.0/config.xml.dist | 1 + etc/ce-to-ce/1.9.0.0/config.xml.dist | 1 + etc/ce-to-ce/1.9.0.1/config.xml.dist | 1 + etc/ce-to-ce/1.9.1.0/config.xml.dist | 1 + etc/ce-to-ce/1.9.1.1/config.xml.dist | 1 + etc/ce-to-ce/1.9.2.0/config.xml.dist | 1 + etc/ce-to-ce/1.9.2.1/config.xml.dist | 1 + etc/ce-to-ce/1.9.2.2/config.xml.dist | 1 + etc/ce-to-ce/1.9.2.3/config.xml.dist | 1 + etc/ce-to-ce/1.9.2.4/config.xml.dist | 1 + etc/ce-to-ee/1.6.0.0/config.xml.dist | 1 + etc/ce-to-ee/1.6.0.0/map-customer.xml.dist | 9 ++++++ etc/ce-to-ee/1.6.1.0/config.xml.dist | 1 + etc/ce-to-ee/1.6.1.0/map-customer.xml.dist | 9 ++++++ etc/ce-to-ee/1.6.2.0/config.xml.dist | 1 + etc/ce-to-ee/1.6.2.0/map-customer.xml.dist | 9 ++++++ etc/ce-to-ee/1.7.0.0/config.xml.dist | 1 + etc/ce-to-ee/1.7.0.1/config.xml.dist | 1 + etc/ce-to-ee/1.7.0.2/config.xml.dist | 1 + etc/ce-to-ee/1.8.0.0/config.xml.dist | 1 + etc/ce-to-ee/1.8.1.0/config.xml.dist | 1 + etc/ce-to-ee/1.9.0.0/config.xml.dist | 1 + etc/ce-to-ee/1.9.0.1/config.xml.dist | 1 + etc/ce-to-ee/1.9.1.0/config.xml.dist | 1 + etc/ce-to-ee/1.9.1.1/config.xml.dist | 1 + etc/ce-to-ee/1.9.2.0/config.xml.dist | 1 + etc/ce-to-ee/1.9.2.1/config.xml.dist | 1 + etc/ce-to-ee/1.9.2.2/config.xml.dist | 1 + etc/ce-to-ee/1.9.2.3/config.xml.dist | 1 + etc/ce-to-ee/1.9.2.4/config.xml.dist | 1 + etc/ee-to-ee/1.11.0.0/config.xml.dist | 1 + etc/ee-to-ee/1.11.0.0/map-customer.xml.dist | 9 ++++++ etc/ee-to-ee/1.11.0.0/map.xml.dist | 18 ++++++++++++ etc/ee-to-ee/1.11.0.1/config.xml.dist | 1 + etc/ee-to-ee/1.11.0.1/map-customer.xml.dist | 9 ++++++ etc/ee-to-ee/1.11.0.1/map.xml.dist | 18 ++++++++++++ etc/ee-to-ee/1.11.0.2/config.xml.dist | 1 + etc/ee-to-ee/1.11.0.2/map-customer.xml.dist | 9 ++++++ etc/ee-to-ee/1.11.0.2/map.xml.dist | 18 ++++++++++++ etc/ee-to-ee/1.11.1.0/config.xml.dist | 1 + etc/ee-to-ee/1.11.1.0/map-customer.xml.dist | 9 ++++++ etc/ee-to-ee/1.11.1.0/map.xml.dist | 18 ++++++++++++ etc/ee-to-ee/1.11.2.0/config.xml.dist | 1 + etc/ee-to-ee/1.11.2.0/map-customer.xml.dist | 9 ++++++ etc/ee-to-ee/1.11.2.0/map.xml.dist | 18 ++++++++++++ etc/ee-to-ee/1.12.0.0/config.xml.dist | 1 + etc/ee-to-ee/1.12.0.1/config.xml.dist | 1 + etc/ee-to-ee/1.12.0.2/config.xml.dist | 1 + etc/ee-to-ee/1.13.0.0/config.xml.dist | 1 + etc/ee-to-ee/1.13.0.1/config.xml.dist | 1 + etc/ee-to-ee/1.13.0.2/config.xml.dist | 1 + etc/ee-to-ee/1.13.1.0/config.xml.dist | 1 + etc/ee-to-ee/1.14.0.0/config.xml.dist | 1 + etc/ee-to-ee/1.14.0.1/config.xml.dist | 1 + etc/ee-to-ee/1.14.1.0/config.xml.dist | 1 + etc/ee-to-ee/1.14.2.0/config.xml.dist | 1 + etc/ee-to-ee/1.14.2.1/config.xml.dist | 1 + etc/ee-to-ee/1.14.2.2/config.xml.dist | 1 + etc/ee-to-ee/1.14.2.3/config.xml.dist | 1 + etc/ee-to-ee/1.14.2.4/config.xml.dist | 1 + src/Migration/Step/TierPrice/Helper.php | 31 ++++++++++++++++++--- 72 files changed, 271 insertions(+), 5 deletions(-) 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 index 491abfd6b..21bab6e2b 100644 --- a/etc/ce-to-ce/1.6.0.0/config.xml.dist +++ b/etc/ce-to-ce/1.6.0.0/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ce + 1.6.0.0 diff --git a/etc/ce-to-ce/1.6.0.0/map-customer.xml.dist b/etc/ce-to-ce/1.6.0.0/map-customer.xml.dist index acdeebf71..dffbb87b8 100644 --- a/etc/ce-to-ce/1.6.0.0/map-customer.xml.dist +++ b/etc/ce-to-ce/1.6.0.0/map-customer.xml.dist @@ -159,6 +159,15 @@ customer_address_entity.vat_request_success + + customer_entity.failures_num + + + customer_entity.first_failure + + + customer_entity.lock_expires + 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 index dace3decb..24c3b2b23 100644 --- a/etc/ce-to-ce/1.6.1.0/config.xml.dist +++ b/etc/ce-to-ce/1.6.1.0/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ce + 1.6.1.0 diff --git a/etc/ce-to-ce/1.6.1.0/map-customer.xml.dist b/etc/ce-to-ce/1.6.1.0/map-customer.xml.dist index acdeebf71..dffbb87b8 100644 --- a/etc/ce-to-ce/1.6.1.0/map-customer.xml.dist +++ b/etc/ce-to-ce/1.6.1.0/map-customer.xml.dist @@ -159,6 +159,15 @@ customer_address_entity.vat_request_success + + customer_entity.failures_num + + + customer_entity.first_failure + + + customer_entity.lock_expires + 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 index ec85b0707..e83dbcab8 100644 --- a/etc/ce-to-ce/1.6.1.0/map.xml.dist +++ b/etc/ce-to-ce/1.6.1.0/map.xml.dist @@ -1,7 +1,7 @@ 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 index 8ca2c737e..ab17d7f8c 100644 --- a/etc/ce-to-ce/1.6.2.0/config.xml.dist +++ b/etc/ce-to-ce/1.6.2.0/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ce + 1.6.2.0 diff --git a/etc/ce-to-ce/1.6.2.0/map-customer.xml.dist b/etc/ce-to-ce/1.6.2.0/map-customer.xml.dist index acdeebf71..dffbb87b8 100644 --- a/etc/ce-to-ce/1.6.2.0/map-customer.xml.dist +++ b/etc/ce-to-ce/1.6.2.0/map-customer.xml.dist @@ -159,6 +159,15 @@ customer_address_entity.vat_request_success + + customer_entity.failures_num + + + customer_entity.first_failure + + + customer_entity.lock_expires + 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 index cf9767d14..2a6f0e10b 100644 --- a/etc/ce-to-ce/1.7.0.0/config.xml.dist +++ b/etc/ce-to-ce/1.7.0.0/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ce + 1.7.0.0 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 index a2edd7031..ac531b1c6 100644 --- a/etc/ce-to-ce/1.7.0.1/config.xml.dist +++ b/etc/ce-to-ce/1.7.0.1/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ce + 1.7.0.1 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 index e91f2b470..8d95e8307 100644 --- a/etc/ce-to-ce/1.7.0.2/config.xml.dist +++ b/etc/ce-to-ce/1.7.0.2/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ce + 1.7.0.2 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 index 5e08e5de9..694d58a56 100644 --- a/etc/ce-to-ce/1.8.0.0/config.xml.dist +++ b/etc/ce-to-ce/1.8.0.0/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ce + 1.8.0.0 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 index 177ea6ff4..df29cdb91 100644 --- a/etc/ce-to-ce/1.8.1.0/config.xml.dist +++ b/etc/ce-to-ce/1.8.1.0/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ce + 1.8.1.0 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 index 6ffa0d06f..f53b6e174 100644 --- a/etc/ce-to-ce/1.9.0.0/config.xml.dist +++ b/etc/ce-to-ce/1.9.0.0/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ce + 1.9.0.0 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 index 71db65c8d..1efdee28b 100644 --- a/etc/ce-to-ce/1.9.0.1/config.xml.dist +++ b/etc/ce-to-ce/1.9.0.1/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ce + 1.9.0.1 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 index 895a507a3..b60568927 100644 --- a/etc/ce-to-ce/1.9.1.0/config.xml.dist +++ b/etc/ce-to-ce/1.9.1.0/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ce + 1.9.1.0 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 index 611bae378..c64716f39 100644 --- a/etc/ce-to-ce/1.9.1.1/config.xml.dist +++ b/etc/ce-to-ce/1.9.1.1/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ce + 1.9.1.1 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 index d60ec5f2f..c8ab8f242 100644 --- a/etc/ce-to-ce/1.9.2.0/config.xml.dist +++ b/etc/ce-to-ce/1.9.2.0/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ce + 1.9.2.0 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 index 623052100..5283b4bf0 100644 --- a/etc/ce-to-ce/1.9.2.1/config.xml.dist +++ b/etc/ce-to-ce/1.9.2.1/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ce + 1.9.2.1 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 index 2830c8f86..daf13850d 100644 --- a/etc/ce-to-ce/1.9.2.2/config.xml.dist +++ b/etc/ce-to-ce/1.9.2.2/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ce + 1.9.2.2 diff --git a/etc/ce-to-ce/1.9.2.3/config.xml.dist b/etc/ce-to-ce/1.9.2.3/config.xml.dist index 22912c3c7..50d9b4ae7 100644 --- a/etc/ce-to-ce/1.9.2.3/config.xml.dist +++ b/etc/ce-to-ce/1.9.2.3/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ce + 1.9.2.3 diff --git a/etc/ce-to-ce/1.9.2.4/config.xml.dist b/etc/ce-to-ce/1.9.2.4/config.xml.dist index a4b9c4589..edb01b9e4 100644 --- a/etc/ce-to-ce/1.9.2.4/config.xml.dist +++ b/etc/ce-to-ce/1.9.2.4/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ce + 1.9.2.4 diff --git a/etc/ce-to-ee/1.6.0.0/config.xml.dist b/etc/ce-to-ee/1.6.0.0/config.xml.dist index c8ab9651f..5ac28e4f8 100644 --- a/etc/ce-to-ee/1.6.0.0/config.xml.dist +++ b/etc/ce-to-ee/1.6.0.0/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ee + 1.6.0.0 diff --git a/etc/ce-to-ee/1.6.0.0/map-customer.xml.dist b/etc/ce-to-ee/1.6.0.0/map-customer.xml.dist index acdeebf71..dffbb87b8 100644 --- a/etc/ce-to-ee/1.6.0.0/map-customer.xml.dist +++ b/etc/ce-to-ee/1.6.0.0/map-customer.xml.dist @@ -159,6 +159,15 @@ customer_address_entity.vat_request_success + + customer_entity.failures_num + + + customer_entity.first_failure + + + customer_entity.lock_expires + diff --git a/etc/ce-to-ee/1.6.1.0/config.xml.dist b/etc/ce-to-ee/1.6.1.0/config.xml.dist index 06817f462..c7c8c507e 100644 --- a/etc/ce-to-ee/1.6.1.0/config.xml.dist +++ b/etc/ce-to-ee/1.6.1.0/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ee + 1.6.1.0 diff --git a/etc/ce-to-ee/1.6.1.0/map-customer.xml.dist b/etc/ce-to-ee/1.6.1.0/map-customer.xml.dist index acdeebf71..dffbb87b8 100644 --- a/etc/ce-to-ee/1.6.1.0/map-customer.xml.dist +++ b/etc/ce-to-ee/1.6.1.0/map-customer.xml.dist @@ -159,6 +159,15 @@ customer_address_entity.vat_request_success + + customer_entity.failures_num + + + customer_entity.first_failure + + + customer_entity.lock_expires + diff --git a/etc/ce-to-ee/1.6.2.0/config.xml.dist b/etc/ce-to-ee/1.6.2.0/config.xml.dist index 36371ad91..2bb4d903e 100644 --- a/etc/ce-to-ee/1.6.2.0/config.xml.dist +++ b/etc/ce-to-ee/1.6.2.0/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ee + 1.6.2.0 diff --git a/etc/ce-to-ee/1.6.2.0/map-customer.xml.dist b/etc/ce-to-ee/1.6.2.0/map-customer.xml.dist index acdeebf71..dffbb87b8 100644 --- a/etc/ce-to-ee/1.6.2.0/map-customer.xml.dist +++ b/etc/ce-to-ee/1.6.2.0/map-customer.xml.dist @@ -159,6 +159,15 @@ customer_address_entity.vat_request_success + + customer_entity.failures_num + + + customer_entity.first_failure + + + customer_entity.lock_expires + diff --git a/etc/ce-to-ee/1.7.0.0/config.xml.dist b/etc/ce-to-ee/1.7.0.0/config.xml.dist index b51818850..398343a74 100644 --- a/etc/ce-to-ee/1.7.0.0/config.xml.dist +++ b/etc/ce-to-ee/1.7.0.0/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ee + 1.7.0.0 diff --git a/etc/ce-to-ee/1.7.0.1/config.xml.dist b/etc/ce-to-ee/1.7.0.1/config.xml.dist index 04f710eb2..b2e2335ff 100644 --- a/etc/ce-to-ee/1.7.0.1/config.xml.dist +++ b/etc/ce-to-ee/1.7.0.1/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ee + 1.7.0.1 diff --git a/etc/ce-to-ee/1.7.0.2/config.xml.dist b/etc/ce-to-ee/1.7.0.2/config.xml.dist index 80034062d..72d39a3c9 100644 --- a/etc/ce-to-ee/1.7.0.2/config.xml.dist +++ b/etc/ce-to-ee/1.7.0.2/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ee + 1.7.0.2 diff --git a/etc/ce-to-ee/1.8.0.0/config.xml.dist b/etc/ce-to-ee/1.8.0.0/config.xml.dist index 91456daf5..d1e004d9b 100644 --- a/etc/ce-to-ee/1.8.0.0/config.xml.dist +++ b/etc/ce-to-ee/1.8.0.0/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ee + 1.8.0.0 diff --git a/etc/ce-to-ee/1.8.1.0/config.xml.dist b/etc/ce-to-ee/1.8.1.0/config.xml.dist index 0311b50ff..539884d64 100644 --- a/etc/ce-to-ee/1.8.1.0/config.xml.dist +++ b/etc/ce-to-ee/1.8.1.0/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ee + 1.8.1.0 diff --git a/etc/ce-to-ee/1.9.0.0/config.xml.dist b/etc/ce-to-ee/1.9.0.0/config.xml.dist index b3451aec9..851461d0b 100644 --- a/etc/ce-to-ee/1.9.0.0/config.xml.dist +++ b/etc/ce-to-ee/1.9.0.0/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ee + 1.9.0.0 diff --git a/etc/ce-to-ee/1.9.0.1/config.xml.dist b/etc/ce-to-ee/1.9.0.1/config.xml.dist index 2681114c7..976d2f1b6 100644 --- a/etc/ce-to-ee/1.9.0.1/config.xml.dist +++ b/etc/ce-to-ee/1.9.0.1/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ee + 1.9.0.1 diff --git a/etc/ce-to-ee/1.9.1.0/config.xml.dist b/etc/ce-to-ee/1.9.1.0/config.xml.dist index 373313d71..155f97e4b 100644 --- a/etc/ce-to-ee/1.9.1.0/config.xml.dist +++ b/etc/ce-to-ee/1.9.1.0/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ee + 1.9.1.0 diff --git a/etc/ce-to-ee/1.9.1.1/config.xml.dist b/etc/ce-to-ee/1.9.1.1/config.xml.dist index 2a2295547..fe273b8ad 100644 --- a/etc/ce-to-ee/1.9.1.1/config.xml.dist +++ b/etc/ce-to-ee/1.9.1.1/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ee + 1.9.1.1 diff --git a/etc/ce-to-ee/1.9.2.0/config.xml.dist b/etc/ce-to-ee/1.9.2.0/config.xml.dist index 8c1b842a1..15125cffc 100644 --- a/etc/ce-to-ee/1.9.2.0/config.xml.dist +++ b/etc/ce-to-ee/1.9.2.0/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ee + 1.9.2.0 diff --git a/etc/ce-to-ee/1.9.2.1/config.xml.dist b/etc/ce-to-ee/1.9.2.1/config.xml.dist index 09b8e5a84..bd9dbc6cc 100644 --- a/etc/ce-to-ee/1.9.2.1/config.xml.dist +++ b/etc/ce-to-ee/1.9.2.1/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ee + 1.9.2.1 diff --git a/etc/ce-to-ee/1.9.2.2/config.xml.dist b/etc/ce-to-ee/1.9.2.2/config.xml.dist index 08b8870d3..aeef908da 100644 --- a/etc/ce-to-ee/1.9.2.2/config.xml.dist +++ b/etc/ce-to-ee/1.9.2.2/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ee + 1.9.2.2 diff --git a/etc/ce-to-ee/1.9.2.3/config.xml.dist b/etc/ce-to-ee/1.9.2.3/config.xml.dist index cf375ae3e..3ae0a1ae5 100644 --- a/etc/ce-to-ee/1.9.2.3/config.xml.dist +++ b/etc/ce-to-ee/1.9.2.3/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ee + 1.9.2.3 diff --git a/etc/ce-to-ee/1.9.2.4/config.xml.dist b/etc/ce-to-ee/1.9.2.4/config.xml.dist index 985ddb3e8..8795c46cd 100644 --- a/etc/ce-to-ee/1.9.2.4/config.xml.dist +++ b/etc/ce-to-ee/1.9.2.4/config.xml.dist @@ -133,6 +133,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ce-to-ee + 1.9.2.4 diff --git a/etc/ee-to-ee/1.11.0.0/config.xml.dist b/etc/ee-to-ee/1.11.0.0/config.xml.dist index 0cc317337..c05dc15f3 100644 --- a/etc/ee-to-ee/1.11.0.0/config.xml.dist +++ b/etc/ee-to-ee/1.11.0.0/config.xml.dist @@ -153,6 +153,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ee-to-ee + 1.11.0.0 diff --git a/etc/ee-to-ee/1.11.0.0/map-customer.xml.dist b/etc/ee-to-ee/1.11.0.0/map-customer.xml.dist index acdeebf71..dffbb87b8 100644 --- a/etc/ee-to-ee/1.11.0.0/map-customer.xml.dist +++ b/etc/ee-to-ee/1.11.0.0/map-customer.xml.dist @@ -159,6 +159,15 @@ customer_address_entity.vat_request_success + + customer_entity.failures_num + + + customer_entity.first_failure + + + customer_entity.lock_expires + 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 index 37f6360b5..4e0bebefb 100644 --- a/etc/ee-to-ee/1.11.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.0/map.xml.dist @@ -1722,6 +1722,18 @@ sales_flat_order_payment.customer_payment_id + + catalogrule.customer_group_ids + + + catalogrule.website_ids + + + salesrule.customer_group_ids + + + salesrule.website_ids + sales_flat_quote_payment.cc_exp_month @@ -1749,6 +1761,12 @@ enterprise_reminder_rule.to_date + + enterprise_reminder_rule.active_from + + + enterprise_reminder_rule.active_to + diff --git a/etc/ee-to-ee/1.11.0.1/config.xml.dist b/etc/ee-to-ee/1.11.0.1/config.xml.dist index 82e62db38..3e420a3ca 100644 --- a/etc/ee-to-ee/1.11.0.1/config.xml.dist +++ b/etc/ee-to-ee/1.11.0.1/config.xml.dist @@ -153,6 +153,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ee-to-ee + 1.11.0.1 diff --git a/etc/ee-to-ee/1.11.0.1/map-customer.xml.dist b/etc/ee-to-ee/1.11.0.1/map-customer.xml.dist index acdeebf71..dffbb87b8 100644 --- a/etc/ee-to-ee/1.11.0.1/map-customer.xml.dist +++ b/etc/ee-to-ee/1.11.0.1/map-customer.xml.dist @@ -159,6 +159,15 @@ customer_address_entity.vat_request_success + + customer_entity.failures_num + + + customer_entity.first_failure + + + customer_entity.lock_expires + 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 index c491eb2c6..27fee2650 100644 --- a/etc/ee-to-ee/1.11.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.1/map.xml.dist @@ -1722,6 +1722,18 @@ sales_flat_order_payment.customer_payment_id + + catalogrule.customer_group_ids + + + catalogrule.website_ids + + + salesrule.customer_group_ids + + + salesrule.website_ids + sales_flat_quote_payment.cc_exp_month @@ -1749,6 +1761,12 @@ enterprise_reminder_rule.to_date + + enterprise_reminder_rule.active_from + + + enterprise_reminder_rule.active_to + diff --git a/etc/ee-to-ee/1.11.0.2/config.xml.dist b/etc/ee-to-ee/1.11.0.2/config.xml.dist index f17fac170..bb05d10bf 100644 --- a/etc/ee-to-ee/1.11.0.2/config.xml.dist +++ b/etc/ee-to-ee/1.11.0.2/config.xml.dist @@ -153,6 +153,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ee-to-ee + 1.11.0.2 diff --git a/etc/ee-to-ee/1.11.0.2/map-customer.xml.dist b/etc/ee-to-ee/1.11.0.2/map-customer.xml.dist index acdeebf71..dffbb87b8 100644 --- a/etc/ee-to-ee/1.11.0.2/map-customer.xml.dist +++ b/etc/ee-to-ee/1.11.0.2/map-customer.xml.dist @@ -159,6 +159,15 @@ customer_address_entity.vat_request_success + + customer_entity.failures_num + + + customer_entity.first_failure + + + customer_entity.lock_expires + 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 index c491eb2c6..27fee2650 100644 --- a/etc/ee-to-ee/1.11.0.2/map.xml.dist +++ b/etc/ee-to-ee/1.11.0.2/map.xml.dist @@ -1722,6 +1722,18 @@ sales_flat_order_payment.customer_payment_id + + catalogrule.customer_group_ids + + + catalogrule.website_ids + + + salesrule.customer_group_ids + + + salesrule.website_ids + sales_flat_quote_payment.cc_exp_month @@ -1749,6 +1761,12 @@ enterprise_reminder_rule.to_date + + enterprise_reminder_rule.active_from + + + enterprise_reminder_rule.active_to + diff --git a/etc/ee-to-ee/1.11.1.0/config.xml.dist b/etc/ee-to-ee/1.11.1.0/config.xml.dist index 0b383091b..53c30b276 100644 --- a/etc/ee-to-ee/1.11.1.0/config.xml.dist +++ b/etc/ee-to-ee/1.11.1.0/config.xml.dist @@ -153,6 +153,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ee-to-ee + 1.11.1.0 diff --git a/etc/ee-to-ee/1.11.1.0/map-customer.xml.dist b/etc/ee-to-ee/1.11.1.0/map-customer.xml.dist index acdeebf71..dffbb87b8 100644 --- a/etc/ee-to-ee/1.11.1.0/map-customer.xml.dist +++ b/etc/ee-to-ee/1.11.1.0/map-customer.xml.dist @@ -159,6 +159,15 @@ customer_address_entity.vat_request_success + + customer_entity.failures_num + + + customer_entity.first_failure + + + customer_entity.lock_expires + 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 index ab14461c5..ec8fef018 100644 --- a/etc/ee-to-ee/1.11.1.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.1.0/map.xml.dist @@ -1722,6 +1722,18 @@ sales_flat_order_payment.customer_payment_id + + catalogrule.customer_group_ids + + + catalogrule.website_ids + + + salesrule.customer_group_ids + + + salesrule.website_ids + sales_flat_quote_payment.cc_exp_month @@ -1749,6 +1761,12 @@ enterprise_reminder_rule.to_date + + enterprise_reminder_rule.active_from + + + enterprise_reminder_rule.active_to + diff --git a/etc/ee-to-ee/1.11.2.0/config.xml.dist b/etc/ee-to-ee/1.11.2.0/config.xml.dist index 16446c7c8..d2dbba3d4 100644 --- a/etc/ee-to-ee/1.11.2.0/config.xml.dist +++ b/etc/ee-to-ee/1.11.2.0/config.xml.dist @@ -153,6 +153,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ee-to-ee + 1.11.2.0 diff --git a/etc/ee-to-ee/1.11.2.0/map-customer.xml.dist b/etc/ee-to-ee/1.11.2.0/map-customer.xml.dist index acdeebf71..dffbb87b8 100644 --- a/etc/ee-to-ee/1.11.2.0/map-customer.xml.dist +++ b/etc/ee-to-ee/1.11.2.0/map-customer.xml.dist @@ -159,6 +159,15 @@ customer_address_entity.vat_request_success + + customer_entity.failures_num + + + customer_entity.first_failure + + + customer_entity.lock_expires + 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 index d86c3afe8..7fb5e9db5 100644 --- a/etc/ee-to-ee/1.11.2.0/map.xml.dist +++ b/etc/ee-to-ee/1.11.2.0/map.xml.dist @@ -1722,6 +1722,18 @@ sales_flat_order_payment.customer_payment_id + + catalogrule.customer_group_ids + + + catalogrule.website_ids + + + salesrule.customer_group_ids + + + salesrule.website_ids + sales_flat_quote_payment.cc_exp_month @@ -1749,6 +1761,12 @@ enterprise_reminder_rule.to_date + + enterprise_reminder_rule.active_from + + + enterprise_reminder_rule.active_to + diff --git a/etc/ee-to-ee/1.12.0.0/config.xml.dist b/etc/ee-to-ee/1.12.0.0/config.xml.dist index 959d2d35b..6b0a275e3 100644 --- a/etc/ee-to-ee/1.12.0.0/config.xml.dist +++ b/etc/ee-to-ee/1.12.0.0/config.xml.dist @@ -153,6 +153,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ee-to-ee + 1.12.0.0 diff --git a/etc/ee-to-ee/1.12.0.1/config.xml.dist b/etc/ee-to-ee/1.12.0.1/config.xml.dist index 4968b21dd..8e47cafe8 100644 --- a/etc/ee-to-ee/1.12.0.1/config.xml.dist +++ b/etc/ee-to-ee/1.12.0.1/config.xml.dist @@ -153,6 +153,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ee-to-ee + 1.12.0.1 diff --git a/etc/ee-to-ee/1.12.0.2/config.xml.dist b/etc/ee-to-ee/1.12.0.2/config.xml.dist index 5b98696cb..6fe3e0198 100644 --- a/etc/ee-to-ee/1.12.0.2/config.xml.dist +++ b/etc/ee-to-ee/1.12.0.2/config.xml.dist @@ -153,6 +153,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ee-to-ee + 1.12.0.2 diff --git a/etc/ee-to-ee/1.13.0.0/config.xml.dist b/etc/ee-to-ee/1.13.0.0/config.xml.dist index a54a0984f..c58f75a1b 100644 --- a/etc/ee-to-ee/1.13.0.0/config.xml.dist +++ b/etc/ee-to-ee/1.13.0.0/config.xml.dist @@ -153,6 +153,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ee-to-ee + 1.13.0.0 diff --git a/etc/ee-to-ee/1.13.0.1/config.xml.dist b/etc/ee-to-ee/1.13.0.1/config.xml.dist index e434aba49..d36c1d677 100644 --- a/etc/ee-to-ee/1.13.0.1/config.xml.dist +++ b/etc/ee-to-ee/1.13.0.1/config.xml.dist @@ -153,6 +153,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ee-to-ee + 1.13.0.1 diff --git a/etc/ee-to-ee/1.13.0.2/config.xml.dist b/etc/ee-to-ee/1.13.0.2/config.xml.dist index 78b935dbe..199713b72 100644 --- a/etc/ee-to-ee/1.13.0.2/config.xml.dist +++ b/etc/ee-to-ee/1.13.0.2/config.xml.dist @@ -153,6 +153,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ee-to-ee + 1.13.0.2 diff --git a/etc/ee-to-ee/1.13.1.0/config.xml.dist b/etc/ee-to-ee/1.13.1.0/config.xml.dist index 0c24f4488..c18bed58a 100644 --- a/etc/ee-to-ee/1.13.1.0/config.xml.dist +++ b/etc/ee-to-ee/1.13.1.0/config.xml.dist @@ -153,6 +153,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ee-to-ee + 1.13.1.0 diff --git a/etc/ee-to-ee/1.14.0.0/config.xml.dist b/etc/ee-to-ee/1.14.0.0/config.xml.dist index 6b3c62182..7ef4e90ee 100644 --- a/etc/ee-to-ee/1.14.0.0/config.xml.dist +++ b/etc/ee-to-ee/1.14.0.0/config.xml.dist @@ -153,6 +153,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ee-to-ee + 1.14.0.0 diff --git a/etc/ee-to-ee/1.14.0.1/config.xml.dist b/etc/ee-to-ee/1.14.0.1/config.xml.dist index ed7e52c7a..df54d7d82 100644 --- a/etc/ee-to-ee/1.14.0.1/config.xml.dist +++ b/etc/ee-to-ee/1.14.0.1/config.xml.dist @@ -153,6 +153,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ee-to-ee + 1.14.0.1 diff --git a/etc/ee-to-ee/1.14.1.0/config.xml.dist b/etc/ee-to-ee/1.14.1.0/config.xml.dist index 03d946856..97bd1f795 100644 --- a/etc/ee-to-ee/1.14.1.0/config.xml.dist +++ b/etc/ee-to-ee/1.14.1.0/config.xml.dist @@ -161,6 +161,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ee-to-ee + 1.14.1.0 diff --git a/etc/ee-to-ee/1.14.2.0/config.xml.dist b/etc/ee-to-ee/1.14.2.0/config.xml.dist index cc4ee3643..02bc572b5 100644 --- a/etc/ee-to-ee/1.14.2.0/config.xml.dist +++ b/etc/ee-to-ee/1.14.2.0/config.xml.dist @@ -161,6 +161,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ee-to-ee + 1.14.2.0 diff --git a/etc/ee-to-ee/1.14.2.1/config.xml.dist b/etc/ee-to-ee/1.14.2.1/config.xml.dist index 4d3cd12a0..2f60d68ed 100644 --- a/etc/ee-to-ee/1.14.2.1/config.xml.dist +++ b/etc/ee-to-ee/1.14.2.1/config.xml.dist @@ -161,6 +161,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ee-to-ee + 1.14.2.1 diff --git a/etc/ee-to-ee/1.14.2.2/config.xml.dist b/etc/ee-to-ee/1.14.2.2/config.xml.dist index 192f446f8..d1ebef8c8 100644 --- a/etc/ee-to-ee/1.14.2.2/config.xml.dist +++ b/etc/ee-to-ee/1.14.2.2/config.xml.dist @@ -161,6 +161,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ee-to-ee + 1.14.2.2 diff --git a/etc/ee-to-ee/1.14.2.3/config.xml.dist b/etc/ee-to-ee/1.14.2.3/config.xml.dist index 6079293fc..75acde157 100644 --- a/etc/ee-to-ee/1.14.2.3/config.xml.dist +++ b/etc/ee-to-ee/1.14.2.3/config.xml.dist @@ -161,6 +161,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ee-to-ee + 1.14.2.3 diff --git a/etc/ee-to-ee/1.14.2.4/config.xml.dist b/etc/ee-to-ee/1.14.2.4/config.xml.dist index bee2854c3..365fc5ee0 100644 --- a/etc/ee-to-ee/1.14.2.4/config.xml.dist +++ b/etc/ee-to-ee/1.14.2.4/config.xml.dist @@ -161,6 +161,7 @@ %percent%% [%bar%] Remaining Time: %remaining% 1 ee-to-ee + 1.14.2.4 diff --git a/src/Migration/Step/TierPrice/Helper.php b/src/Migration/Step/TierPrice/Helper.php index 4c8fcfb70..35a7c6e85 100644 --- a/src/Migration/Step/TierPrice/Helper.php +++ b/src/Migration/Step/TierPrice/Helper.php @@ -19,6 +19,25 @@ class Helper * @var string */ protected $editionMigrate = ''; + /** + * @var string + */ + protected $editionNumber = ''; + + /** + * @var array + */ + protected $notExistsGroupPriceTable = [ + '1.11.0.0', + '1.11.0.1', + '1.11.0.1', + '1.11.0.2', + '1.11.1.0', + '1.11.2.0', + '1.6.0.0', + '1.6.1.0', + '1.6.2.0' + ]; /** * @param Config $config @@ -27,6 +46,7 @@ public function __construct( Config $config ) { $this->editionMigrate = $config->getOption('edition_migrate'); + $this->editionNumber = $config->getOption('edition_number'); } /** @@ -42,7 +62,7 @@ public function getDestinationName() */ public function getSourceDocumentFields() { - return [ + $sourceDocumentFields = [ self::DESTINATION_DOCUMENT_NAME => [ 'value_id', 'entity_id', @@ -52,15 +72,18 @@ public function getSourceDocumentFields() 'value', 'website_id', ], - 'catalog_product_entity_group_price' => [ + ]; + if (!empty($this->editionNumber) && !in_array($this->editionNumber, $this->notExistsGroupPriceTable)) { + $sourceDocumentFields['catalog_product_entity_group_price'] = [ 'value_id', 'entity_id', 'all_groups', 'customer_group_id', 'value', 'website_id', - ], - ]; + ]; + } + return $sourceDocumentFields; } /** From 7ad986f6ff01337264d940f817d1f6cf92268d24 Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Tue, 5 Jul 2016 15:14:27 +0300 Subject: [PATCH 60/71] MAGETWO-55052: List of errors appear during 1.11.2.0 migration --- src/Migration/Handler/Rule/NormalizationIds.php | 17 +++++++++++++---- src/Migration/Step/TierPrice/Helper.php | 1 + 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/Migration/Handler/Rule/NormalizationIds.php b/src/Migration/Handler/Rule/NormalizationIds.php index 04ece8f5b..e5e1d20af 100644 --- a/src/Migration/Handler/Rule/NormalizationIds.php +++ b/src/Migration/Handler/Rule/NormalizationIds.php @@ -6,12 +6,10 @@ namespace Migration\Handler\Rule; use Migration\Handler\AbstractHandler; -use Migration\Reader\MapFactory; -use Migration\Reader\Map; use Migration\ResourceModel\Destination; use Migration\ResourceModel\Record; -use Migration\ResourceModel\Source; use Migration\ResourceModel\RecordFactory; +use Migration\Config; /** * Class NormalizationIds @@ -34,19 +32,27 @@ class NormalizationIds extends AbstractHandler */ protected $normalizationField; + /** + * @var string + */ + protected $editionMigrate = ''; + /** * @param Destination $destination + * @param Config $config * @param null|string $normalizationDocument * @param null|string $normalizationField */ public function __construct( Destination $destination, + Config $config, $normalizationDocument = null, $normalizationField = null ) { $this->normalizationDocument = $normalizationDocument; $this->normalizationField = $normalizationField; $this->destination = $destination; + $this->editionMigrate = $config->getOption('edition_migrate'); } /** @@ -59,9 +65,12 @@ public function handle(Record $recordToHandle, Record $oppositeRecord) $this->validate($recordToHandle); $ids = explode(',', $recordToHandle->getValue($this->field)); $normalizedRecords = []; + $entityIdName = (empty($this->editionMigrate) || $this->editionMigrate == Config::EDITION_MIGRATE_CE_TO_CE) + ? 'rule_id' + : 'row_id'; foreach ($ids as $id) { $normalizedRecords[] = [ - 'rule_id' => $recordToHandle->getValue('rule_id'), + $entityIdName => $recordToHandle->getValue('rule_id'), $this->normalizationField => $id ]; } diff --git a/src/Migration/Step/TierPrice/Helper.php b/src/Migration/Step/TierPrice/Helper.php index 35a7c6e85..2d27ba553 100644 --- a/src/Migration/Step/TierPrice/Helper.php +++ b/src/Migration/Step/TierPrice/Helper.php @@ -19,6 +19,7 @@ class Helper * @var string */ protected $editionMigrate = ''; + /** * @var string */ From f0b35061b2fe11895c3bc6b78b942421aa94d14a Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Wed, 6 Jul 2016 10:30:50 +0300 Subject: [PATCH 61/71] MAGETWO-55105: List of errors appear during 1.12.0.0 migration --- etc/ee-to-ee/1.12.0.0/map.xml.dist | 15 +++------------ etc/ee-to-ee/1.12.0.1/map.xml.dist | 15 +++------------ etc/ee-to-ee/1.12.0.2/map.xml.dist | 15 +++------------ 3 files changed, 9 insertions(+), 36 deletions(-) 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 index 020b58154..002239665 100644 --- a/etc/ee-to-ee/1.12.0.0/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.0/map.xml.dist @@ -2026,21 +2026,9 @@ catalog_product_index_group_price - - catalogrule_customer_group - - - catalogrule_website - salesrule_coupon_aggregated_updated - - salesrule_customer_group - - - salesrule_website - catalog_product_index_price @@ -2566,6 +2554,9 @@ magento_reminder_rule.to_date + + sales_flat_quote_payment.cc_exp_month + 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 index e26ae16f4..a8a4ced04 100644 --- a/etc/ee-to-ee/1.12.0.1/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.1/map.xml.dist @@ -2026,21 +2026,9 @@ catalog_product_index_group_price - - catalogrule_customer_group - - - catalogrule_website - salesrule_coupon_aggregated_updated - - salesrule_customer_group - - - salesrule_website - catalog_product_index_price @@ -2569,6 +2557,9 @@ magento_reminder_rule.to_date + + sales_flat_quote_payment.cc_exp_month + 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 index e26ae16f4..a8a4ced04 100644 --- a/etc/ee-to-ee/1.12.0.2/map.xml.dist +++ b/etc/ee-to-ee/1.12.0.2/map.xml.dist @@ -2026,21 +2026,9 @@ catalog_product_index_group_price - - catalogrule_customer_group - - - catalogrule_website - salesrule_coupon_aggregated_updated - - salesrule_customer_group - - - salesrule_website - catalog_product_index_price @@ -2569,6 +2557,9 @@ magento_reminder_rule.to_date + + sales_flat_quote_payment.cc_exp_month + From 77589d1c1aaa54e44a48201b9cefbb8acbf4a220 Mon Sep 17 00:00:00 2001 From: Alex Bomko Date: Wed, 6 Jul 2016 12:39:18 +0300 Subject: [PATCH 62/71] MAGETWO-55039: Price, Qty, Advanced Price and Advanced Qty do not show on product edit page after migration --- src/Migration/Step/Eav/Data.php | 76 ++++++++++++++++++++-- src/Migration/Step/PostProcessing/Data.php | 6 -- 2 files changed, 70 insertions(+), 12 deletions(-) diff --git a/src/Migration/Step/Eav/Data.php b/src/Migration/Step/Eav/Data.php index 81245fbd0..3cdb62cb6 100644 --- a/src/Migration/Step/Eav/Data.php +++ b/src/Migration/Step/Eav/Data.php @@ -98,6 +98,11 @@ class Data implements StageInterface, RollbackInterface */ protected $readerGroups; + /** + * @var \Migration\Reader\Groups + */ + protected $readerAttributes; + /** * @param Source $source * @param Destination $destination @@ -215,8 +220,8 @@ protected function migrateAttributeSetsAndGroups() } /** - * Add Schedule Design to attribute groups of Magento 1 - * + * Add Schedule Design to attribute groups of Magento 1 + * * @param Record\Collection $recordsToSave * @param string $documentName * @return Record\Collection @@ -359,11 +364,69 @@ protected function migrateEntityAttributes() } $recordsToSave = $this->processDesignEntityAttributes($recordsToSave); + $recordsToSave = $this->moveFieldsToGroup($recordsToSave); $this->destination->clearDocument($destinationDocument->getName()); $this->saveRecords($destinationDocument, $recordsToSave); } + /** + * Move some fields to other attribute groups + * + * @param Record\Collection $recordsToSave + * @return Record\Collection + * @throws \Migration\Exception + */ + private function moveFieldsToGroup($recordsToSave) + { + $attributes = $this->helper->getDestinationRecords('eav_attribute', ['attribute_id']); + $attributeGroups = $this->helper->getDestinationRecords('eav_attribute_group', ['attribute_group_id']); + $attributeSetGroups = []; + foreach ($attributeGroups as $attributeGroup) { + if ($attributeGroup['attribute_group_code'] == 'product-details') { + $attributeSetGroups[$attributeGroup['attribute_set_id']]['product-details'] = + $attributeGroup['attribute_group_id']; + } + } + $quantityAttribute = null; + foreach ($recordsToSave as $record) { + $attributeId = $record->getValue('attribute_id'); + if (!isset($attributes[$attributeId])) { + continue; + } + if ($attributes[$attributeId]['attribute_code'] == 'price') { + $record->setValue( + 'attribute_group_id', + $attributeSetGroups[$record->getValue('attribute_set_id')]['product-details'] + ); + } + if ($attributes[$attributeId]['attribute_code'] == 'quantity_and_stock_status') { + $attributeSetGroups[$record->getValue('attribute_set_id')]['quantity_and_stock_status'] = + $record->getValue('attribute_group_id'); + $quantityAttribute = $record->getData(); + } + } + $destinationDocument = $this->destination->getDocument( + $this->map->getDocumentMap('eav_entity_attribute', MapInterface::TYPE_SOURCE) + ); + foreach ($attributeSetGroups as $attributeSetId => $attributeSetGroup) { + if (!isset($attributeSetGroup['quantity_and_stock_status'])) { + $quantityAttribute['attribute_set_id'] = $attributeSetId; + $quantityAttribute['attribute_group_id'] = $attributeSetGroup['product-details']; + $quantityAttribute['entity_attribute_id'] = ''; + $destinationRecord = $this->factory->create( + [ + 'document' => $destinationDocument, + 'data' => $quantityAttribute + ] + ); + $recordsToSave->addRecord($destinationRecord); + } + } + + return $recordsToSave; + } + /** * Move design attributes to schedule-design-update attribute groups * @@ -371,8 +434,9 @@ protected function migrateEntityAttributes() * @return Record\Collection * @throws \Migration\Exception */ - public function processDesignEntityAttributes($recordsToSave) + private function processDesignEntityAttributes($recordsToSave) { + $entityTypeIdCatalogProduct = 0; foreach ($this->helper->getDestinationRecords('eav_entity_type') as $record) { if ('catalog_product' == $record['entity_type_code']) { $entityTypeIdCatalogProduct = $record['entity_type_id']; @@ -574,9 +638,9 @@ protected function loadNewAttributeGroups() $newKey = $this->destAttributeSetsOldNewMap[$record['attribute_set_id']] . '-' . $record['attribute_group_name']; $newAttributeGroup = $this->newAttributeGroups[$newKey]; - $this->destAttributeGroupsOldNewMap[ - $record['attribute_group_id']] = $newAttributeGroup['attribute_group_id' - ]; + $this->destAttributeGroupsOldNewMap[$record['attribute_group_id']] = + $newAttributeGroup['attribute_group_id']; + } } diff --git a/src/Migration/Step/PostProcessing/Data.php b/src/Migration/Step/PostProcessing/Data.php index e23e15009..7ac948e9a 100644 --- a/src/Migration/Step/PostProcessing/Data.php +++ b/src/Migration/Step/PostProcessing/Data.php @@ -44,11 +44,6 @@ class Data implements StageInterface */ protected $helper; - /** - * @var \Migration\Reader\Groups - */ - protected $readerAttributes; - /** * @param ProgressBar\LogLevelProcessor $progress * @param ResourceModel\Source $source @@ -70,7 +65,6 @@ public function __construct( $this->progress = $progress; $this->logger = $logger; $this->helper = $helper; - $this->readerAttributes = $groupsFactory->create('eav_attribute_groups_file'); } /** From ff1b7dcd541f139862b027e25adaadc3e60450e1 Mon Sep 17 00:00:00 2001 From: Leonid Poluyanov Date: Wed, 6 Jul 2016 13:06:21 +0300 Subject: [PATCH 63/71] MAGETWO-55107: Fix migration tool tests --- .../resource/ee.url_rewrite/dest.sql | 128 +++++ .../resource/ee.url_rewrite/source.sql | 486 ++++++++++++++++++ .../testsuite/Migration/_files/config.xml | 1 + .../testsuite/Migration/_files/ee.config.xml | 5 +- .../Handler/Rule/NormalizationIdsTest.php | 11 + 5 files changed, 629 insertions(+), 2 deletions(-) create mode 100644 tests/integration/resource/ee.url_rewrite/dest.sql create mode 100644 tests/integration/resource/ee.url_rewrite/source.sql diff --git a/tests/integration/resource/ee.url_rewrite/dest.sql b/tests/integration/resource/ee.url_rewrite/dest.sql new file mode 100644 index 000000000..fa559829c --- /dev/null +++ b/tests/integration/resource/ee.url_rewrite/dest.sql @@ -0,0 +1,128 @@ +/** + * Copyright © 2016 Magento. All rights reserved. + * See COPYING.txt for license details. + */ + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; +/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; +/*!40103 SET TIME_ZONE='+00:00' */; +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; + +-- +-- Table structure for table `url_rewrite` +-- + +DROP TABLE IF EXISTS `url_rewrite`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `url_rewrite` ( + `url_rewrite_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Rewrite Id', + `entity_type` varchar(32) NOT NULL COMMENT 'Entity type code', + `entity_id` int(10) unsigned NOT NULL COMMENT 'Entity ID', + `request_path` varchar(255) DEFAULT NULL COMMENT 'Request Path', + `target_path` varchar(255) DEFAULT NULL COMMENT 'Target Path', + `redirect_type` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Redirect Type', + `store_id` smallint(5) unsigned NOT NULL COMMENT 'Store Id', + `description` varchar(255) DEFAULT NULL COMMENT 'Description', + `is_autogenerated` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Is rewrite generated automatically flag', + `metadata` varchar(255) DEFAULT NULL COMMENT 'Meta data for url rewrite', + PRIMARY KEY (`url_rewrite_id`), + UNIQUE KEY `UNQ_URL_REWRITE_REQUEST_PATH_STORE_ID` (`request_path`,`store_id`), + KEY `IDX_URL_REWRITE_TARGET_PATH` (`target_path`), + KEY `IDX_URL_REWRITE_STORE_ID_ENTITY_ID` (`store_id`,`entity_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Url Rewrites'; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `catalog_category_entity_varchar` +-- + +DROP TABLE IF EXISTS `catalog_category_entity_varchar`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `catalog_category_entity_varchar` ( + `value_id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Value ID', + `attribute_id` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Attribute ID', + `store_id` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Store ID', + `row_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Row ID', + `value` varchar(255) DEFAULT NULL COMMENT 'Value', + PRIMARY KEY (`value_id`), + UNIQUE KEY `UNQ_CAT_CTGR_ENTT_VCHR_ENTT_TYPE_ID_ENTT_ID_ATTR_ID_STORE_ID` (`row_id`,`attribute_id`,`store_id`), + KEY `IDX_CATALOG_CATEGORY_ENTITY_VARCHAR_ROW_ID` (`row_id`), + KEY `IDX_CATALOG_CATEGORY_ENTITY_VARCHAR_ATTRIBUTE_ID` (`attribute_id`), + KEY `IDX_CATALOG_CATEGORY_ENTITY_VARCHAR_STORE_ID` (`store_id`) +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COMMENT='Catalog Category Varchar Attribute Backend Table'; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `catalog_category_entity_varchar` +-- + +LOCK TABLES `catalog_category_entity_varchar` WRITE; +/*!40000 ALTER TABLE `catalog_category_entity_varchar` DISABLE KEYS */; +INSERT INTO `catalog_category_entity_varchar` VALUES +(1,41,0,1,'Root Catalog'), +(2,41,0,2,'Default Category'), +(3,48,0,2,'PRODUCTS'); +/*!40000 ALTER TABLE `catalog_category_entity_varchar` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `catalog_product_entity_varchar` +-- + +DROP TABLE IF EXISTS `catalog_product_entity_varchar`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `catalog_product_entity_varchar` ( + `value_id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Value ID', + `attribute_id` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Attribute ID', + `store_id` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Store ID', + `row_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Row ID', + `value` varchar(255) DEFAULT NULL COMMENT 'Value', + PRIMARY KEY (`value_id`), + UNIQUE KEY `UNQ_CAT_PRD_ENTT_VCHR_ENTT_ID_ATTR_ID_STORE_ID` (`row_id`,`attribute_id`,`store_id`), + KEY `IDX_CATALOG_PRODUCT_ENTITY_VARCHAR_ATTRIBUTE_ID` (`attribute_id`), + KEY `IDX_CATALOG_PRODUCT_ENTITY_VARCHAR_STORE_ID` (`store_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Catalog Product Varchar Attribute Backend Table'; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `catalog_url_rewrite_product_category` +-- + +DROP TABLE IF EXISTS `catalog_url_rewrite_product_category`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `catalog_url_rewrite_product_category` ( + `url_rewrite_id` int(10) unsigned NOT NULL COMMENT 'url_rewrite_id', + `category_id` int(10) unsigned NOT NULL COMMENT 'category_id', + `product_id` int(10) unsigned NOT NULL COMMENT 'product_id', + KEY `IDX_CATALOG_URL_REWRITE_PRODUCT_CATEGORY_CATEGORY_ID_PRODUCT_ID` (`category_id`,`product_id`), + KEY `FK_CAT_URL_REWRITE_PRD_CTGR_PRD_ID_CAT_PRD_ENTT_ENTT_ID` (`product_id`), + KEY `FK_BB79E64705D7F17FE181F23144528FC8` (`url_rewrite_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='url_rewrite_relation'; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `catalog_url_rewrite_product_category` +-- + + +/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; + +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; + +-- Dump completed on 2015-01-29 19:44:27 diff --git a/tests/integration/resource/ee.url_rewrite/source.sql b/tests/integration/resource/ee.url_rewrite/source.sql new file mode 100644 index 000000000..47b427687 --- /dev/null +++ b/tests/integration/resource/ee.url_rewrite/source.sql @@ -0,0 +1,486 @@ +/** + * Copyright © 2016 Magento. All rights reserved. + * See COPYING.txt for license details. + */ + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; +/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; +/*!40103 SET TIME_ZONE='+00:00' */; +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; + + +-- Dumping structure for magento1.cms_page +DROP TABLE IF EXISTS `cms_page`; +CREATE TABLE IF NOT EXISTS `cms_page` ( + `page_id` smallint(6) NOT NULL AUTO_INCREMENT COMMENT 'Page ID', + `title` varchar(255) DEFAULT NULL COMMENT 'Page Title', + `root_template` varchar(255) DEFAULT NULL COMMENT 'Page Template', + `meta_keywords` text COMMENT 'Page Meta Keywords', + `meta_description` text COMMENT 'Page Meta Description', + `identifier` varchar(100) DEFAULT NULL COMMENT 'Page String Identifier', + `content_heading` varchar(255) DEFAULT NULL COMMENT 'Page Content Heading', + `content` mediumtext COMMENT 'Page Content', + `creation_time` timestamp NULL DEFAULT NULL COMMENT 'Page Creation Time', + `update_time` timestamp NULL DEFAULT NULL COMMENT 'Page Modification Time', + `is_active` smallint(6) NOT NULL DEFAULT '1' COMMENT 'Is Page Active', + `sort_order` smallint(6) NOT NULL DEFAULT '0' COMMENT 'Page Sort Order', + `layout_update_xml` text COMMENT 'Page Layout Update Content', + `custom_theme` varchar(100) DEFAULT NULL COMMENT 'Page Custom Theme', + `custom_root_template` varchar(255) DEFAULT NULL COMMENT 'Page Custom Template', + `custom_layout_update_xml` text COMMENT 'Page Custom Layout Update Content', + `custom_theme_from` date DEFAULT NULL COMMENT 'Page Custom Theme Active From Date', + `custom_theme_to` date DEFAULT NULL COMMENT 'Page Custom Theme Active To Date', + `published_revision_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Published Revision Id', + `website_root` smallint(5) unsigned NOT NULL DEFAULT '1' COMMENT 'Website Root', + `under_version_control` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Under Version Control Flag', + PRIMARY KEY (`page_id`), + KEY `IDX_CMS_PAGE_IDENTIFIER` (`identifier`) +) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8 COMMENT='CMS Page Table'; + +-- Dumping data for table magento1.cms_page: ~10 rows +-- DELETE FROM `cms_page`; +/*!40000 ALTER TABLE `cms_page` DISABLE KEYS */; +INSERT INTO `cms_page` (`page_id`, `title`, `root_template`, `meta_keywords`, `meta_description`, `identifier`, `content_heading`, `content`, `creation_time`, `update_time`, `is_active`, `sort_order`, `layout_update_xml`, `custom_theme`, `custom_root_template`, `custom_layout_update_xml`, `custom_theme_from`, `custom_theme_to`, `published_revision_id`, `website_root`, `under_version_control`) VALUES + (1, '404 Not Found 1', 'two_columns_right', 'Page keywords', 'Page description', 'no-route', NULL, '\r\n

We are sorry, but the page you are looking for cannot be found.

\r\n
\r\n
    \r\n
  • If you typed the URL directly, please make sure the spelling is correct.
    • \r\n
  • If you clicked on a link to get here, we must have moved the content.\r\n
    Please try our store search box above to search for an item.
    • \r\n
  • If you are not sure how you got here,\r\n go back to the previous page\r\n or return to our store homepage.
    • \r\n
\r\n
\n\n\r\n', '2015-10-09 15:15:23', '2015-10-09 15:15:23', 1, 0, NULL, NULL, NULL, NULL, NULL, NULL, 0, 1, 0), + (2, 'Home page', 'two_columns_right', NULL, NULL, 'home', NULL, '

Home Page

', '2015-10-09 15:15:24', '2015-10-09 15:15:42', 1, 0, '', NULL, NULL, NULL, NULL, NULL, 0, 1, 0), + (3, 'About Us', 'two_columns_right', NULL, NULL, 'about-magento-demo-store', NULL, '\r\n
\r\n

About Magento Store

\r\n
\r\n
\r\n

Lorem ipsum dolor sit amet, consectetuer adipiscing elit.\r\nMorbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec,\r\ntempus vitae, iaculis semper, pede.

\r\n

Lorem ipsum dolor sit amet, consectetuer adipiscing elit.\r\nMorbi luctus. Duis lobortis. Nulla nec velit. Mauris pulvinar erat non massa. Suspendisse tortor turpis,\r\nporta nec, tempus vitae, iaculis semper, pede. Cras vel libero id lectus rhoncus porta.

\r\n
\r\n

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus.\r\nDuis lobortis. Nulla nec velit.

\r\n

Vivamus tortor nisl, lobortis in, faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper.\r\nPhasellus id massa. Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada\r\nfames ac turpis egestas. Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac,\r\ntempus nec, tempor nec, justo.

\r\n

Maecenas ullamcorper, odio vel tempus egestas, dui orci faucibus orci, sit amet aliquet lectus dolor et quam.\r\nPellentesque consequat luctus purus. Nunc et risus. Etiam a nibh. Phasellus dignissim metus eget nisi.\r\nVestibulum sapien dolor, aliquet nec, porta ac, malesuada a, libero. Praesent feugiat purus eget est.\r\nNulla facilisi. Vestibulum tincidunt sapien eu velit. Mauris purus. Maecenas eget mauris eu orci accumsan feugiat.\r\nPellentesque eget velit. Nunc tincidunt.

\r\n
\r\n

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit.\r\nMauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede.\r\nCras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in,\r\nfaucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper

\r\n

Maecenas ullamcorper, odio vel tempus egestas, dui orci faucibus orci,\r\nsit amet aliquet lectus dolor et quam. Pellentesque consequat luctus purus.

\r\n

Nunc et risus. Etiam a nibh. Phasellus dignissim metus eget nisi.

\r\n
\r\n

To all of you, from all of us at Magento Store - Thank you and Happy eCommerce!

\r\n

John Doe
\r\nSome important guy

\r\n
', '2015-10-09 15:15:24', '2015-10-09 15:15:24', 1, 0, NULL, NULL, NULL, NULL, NULL, NULL, 0, 1, 0), + (4, 'Customer Service', 'three_columns', NULL, NULL, 'customer-service', NULL, '
\r\n

Customer Service

\r\n
\r\n\r\n
\r\n
Shipping & Delivery
\r\n
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit.\r\nMauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede.\r\nCras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in,\r\nfaucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa.\r\nPellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.\r\nNunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec,\r\njusto.
\r\n
Privacy & Security
\r\n
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit.\r\nMauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede.\r\nCras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in,\r\nfaucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa.\r\nPellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.\r\nNunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec,\r\njusto.
\r\n
Returns & Replacements
\r\n
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit.\r\nMauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede.\r\nCras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in,\r\nfaucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa.\r\nPellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.\r\nNunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec,\r\njusto.
\r\n
Ordering
\r\n
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit.\r\nMauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede.\r\nCras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in,\r\nfaucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa.\r\nPellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.\r\nNunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec,\r\njusto.
\r\n
Payment, Pricing & Promotions
\r\n
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit.\r\nMauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede.\r\nCras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in,\r\nfaucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa.\r\nPellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.\r\nNunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec,\r\njusto.
\r\n
Viewing Orders
\r\n
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit.\r\nMauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede.\r\nCras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in,\r\nfaucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa.\r\n Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.\r\n Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec,\r\n justo.
\r\n
Updating Account Information
\r\n
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi luctus. Duis lobortis. Nulla nec velit.\r\n Mauris pulvinar erat non massa. Suspendisse tortor turpis, porta nec, tempus vitae, iaculis semper, pede.\r\n Cras vel libero id lectus rhoncus porta. Suspendisse convallis felis ac enim. Vivamus tortor nisl, lobortis in,\r\n faucibus et, tempus at, dui. Nunc risus. Proin scelerisque augue. Nam ullamcorper. Phasellus id massa.\r\n Pellentesque nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.\r\n Nunc augue. Aenean sed justo non leo vehicula laoreet. Praesent ipsum libero, auctor ac, tempus nec, tempor nec,\r\n justo.
\r\n
', '2015-10-09 15:15:24', '2015-10-09 15:15:24', 1, 0, NULL, NULL, NULL, NULL, NULL, NULL, 0, 1, 0), + (5, 'Enable Cookies', 'one_column', NULL, NULL, 'enable-cookies', NULL, '
\r\n
    \r\n
  • \r\n
      \r\n
    • Please enable cookies in your web browser to continue.
      • \r\n
    \r\n
    • \r\n
\r\n
\r\n

What are Cookies?

\r\n
\r\n

Cookies are short pieces of data that are sent to your computer when you visit a website.\r\n On later visits, this data is then returned to that website. Cookies allow us to recognize you automatically\r\n whenever you visit our site so that we can personalize your experience and provide you with better service.\r\n We also use cookies (and similar browser data, such as Flash cookies) for fraud prevention and other purposes.\r\n If your web browser is set to refuse cookies from our website, you will not be able to complete a purchase\r\n or take advantage of certain features of our website, such as storing items in your Shopping Cart or\r\n receiving personalized recommendations. As a result, we strongly encourage you to configure your web\r\n browser to accept cookies from our website.

\r\n

Enabling Cookies

\r\n \r\n

Internet Explorer 7.x

\r\n
    \r\n
  1. \r\n

    Start Internet Explorer

    \r\n
    2. \r\n
  2. \r\n

    Under the Tools menu, click Internet Options

    \r\n

    \r\n
    3. \r\n
  3. \r\n

    Click the Privacy tab

    \r\n

    \r\n
    4. \r\n
  4. \r\n

    Click the Advanced button

    \r\n

    \r\n
    5. \r\n
  5. \r\n

    Put a check mark in the box for Override Automatic Cookie Handling,\r\n put another check mark in the Always accept session cookies box

    \r\n

    \r\n
    6. \r\n
  6. \r\n

    Click OK

    \r\n

    \r\n
    7. \r\n
  7. \r\n

    Click OK

    \r\n

    \r\n
    8. \r\n
  8. \r\n

    Restart Internet Explore

    \r\n
    9. \r\n
\r\n

Back to Top

\r\n

Internet Explorer 6.x

\r\n
    \r\n
  1. \r\n

    Select Internet Options from the Tools menu

    \r\n

    \r\n
    2. \r\n
  2. \r\n

    Click on the Privacy tab

    \r\n
    3. \r\n
  3. \r\n

    Click the Default button (or manually slide the bar down to Medium)\r\n under Settings. Click OK

    \r\n

    \r\n
    4. \r\n
\r\n

Back to Top

\r\n

Mozilla/Firefox

\r\n
    \r\n
  1. \r\n

    Click on the Tools-menu in Mozilla

    \r\n
    2. \r\n
  2. \r\n

    Click on the Options... item in the menu - a new window open

    \r\n
    3. \r\n
  3. \r\n

    Click on the Privacy selection in the left part of the window. (See image below)

    \r\n

    \r\n
    4. \r\n
  4. \r\n

    Expand the Cookies section

    \r\n
    5. \r\n
  5. \r\n

    Check the Enable cookies and Accept cookies normally checkboxes

    \r\n
    6. \r\n
  6. \r\n

    Save changes by clicking Ok.

    \r\n
    7. \r\n
\r\n

Back to Top

\r\n

Opera 7.x

\r\n
    \r\n
  1. \r\n

    Click on the Tools menu in Opera

    \r\n
    2. \r\n
  2. \r\n

    Click on the Preferences... item in the menu - a new window open

    \r\n
    3. \r\n
  3. \r\n

    Click on the Privacy selection near the bottom left of the window. (See image below)

    \r\n

    \r\n
    4. \r\n
  4. \r\n

    The Enable cookies checkbox must be checked, and Accept all cookies\r\n should be selected in the "Normal cookies" drop-down

    \r\n
    5. \r\n
  5. \r\n

    Save changes by clicking Ok

    \r\n
    6. \r\n
\r\n

Back to Top

\r\n
\r\n', '2015-10-09 15:15:24', '2015-10-09 15:15:24', 1, 0, NULL, NULL, NULL, NULL, NULL, NULL, 0, 1, 0), + (6, 'Privacy Policy', 'one_column', NULL, NULL, 'privacy-policy-cookie-restriction-mode', 'Privacy Policy', '

\r\n Please replace this text with you Privacy Policy.\r\n Please add any additional cookies your website uses below (e.g., Google Analytics)\r\n

\r\n

\r\n This privacy policy sets out how {{config path="general/store_information/name"}} uses and protects any information\r\n that you give {{config path="general/store_information/name"}} when you use this website.\r\n {{config path="general/store_information/name"}} is committed to ensuring that your privacy is protected.\r\n Should we ask you to provide certain information by which you can be identified when using this website,\r\n then you can be assured that it will only be used in accordance with this privacy statement.\r\n {{config path="general/store_information/name"}} may change this policy from time to time by updating this page.\r\n You should check this page from time to time to ensure that you are happy with any changes.\r\n

\r\n

What we collect

\r\n

We may collect the following information:

\r\n
    \r\n
  • name
    • \r\n
  • contact information including email address
    • \r\n
  • demographic information such as postcode, preferences and interests
    • \r\n
  • other information relevant to customer surveys and/or offers
    • \r\n
\r\n

\r\n For the exhaustive list of cookies we collect see the List of cookies we collect section.\r\n

\r\n

What we do with the information we gather

\r\n

\r\n We require this information to understand your needs and provide you with a better service,\r\n and in particular for the following reasons:\r\n

\r\n
    \r\n
  • Internal record keeping.
    • \r\n
  • We may use the information to improve our products and services.
    • \r\n
  • \r\n We may periodically send promotional emails about new products, special offers or other information which we\r\n think you may find interesting using the email address which you have provided.\r\n
    • \r\n
  • \r\n From time to time, we may also use your information to contact you for market research purposes.\r\n We may contact you by email, phone, fax or mail. We may use the information to customise the website\r\n according to your interests.\r\n
    • \r\n
\r\n

Security

\r\n

\r\n We are committed to ensuring that your information is secure. In order to prevent unauthorised access or disclosure,\r\n we have put in place suitable physical, electronic and managerial procedures to safeguard and secure\r\n the information we collect online.\r\n

\r\n

How we use cookies

\r\n

\r\n A cookie is a small file which asks permission to be placed on your computer\'s hard drive.\r\n Once you agree, the file is added and the cookie helps analyse web traffic or lets you know when you visit\r\n a particular site. Cookies allow web applications to respond to you as an individual. The web application\r\n can tailor its operations to your needs, likes and dislikes by gathering and remembering information about\r\n your preferences.\r\n

\r\n

\r\n We use traffic log cookies to identify which pages are being used. This helps us analyse data about web page traffic\r\n and improve our website in order to tailor it to customer needs. We only use this information for statistical\r\n analysis purposes and then the data is removed from the system.\r\n

\r\n

\r\n Overall, cookies help us provide you with a better website, by enabling us to monitor which pages you find useful\r\n and which you do not. A cookie in no way gives us access to your computer or any information about you,\r\n other than the data you choose to share with us. You can choose to accept or decline cookies.\r\n Most web browsers automatically accept cookies, but you can usually modify your browser setting\r\n to decline cookies if you prefer. This may prevent you from taking full advantage of the website.\r\n

\r\n

Links to other websites

\r\n

\r\n Our website may contain links to other websites of interest. However, once you have used these links\r\n to leave our site, you should note that we do not have any control over that other website.\r\n Therefore, we cannot be responsible for the protection and privacy of any information which you provide whilst\r\n visiting such sites and such sites are not governed by this privacy statement.\r\n You should exercise caution and look at the privacy statement applicable to the website in question.\r\n

\r\n

Controlling your personal information

\r\n

You may choose to restrict the collection or use of your personal information in the following ways:

\r\n
    \r\n
  • \r\n whenever you are asked to fill in a form on the website, look for the box that you can click to indicate\r\n that you do not want the information to be used by anybody for direct marketing purposes\r\n
    • \r\n
  • \r\n if you have previously agreed to us using your personal information for direct marketing purposes,\r\n you may change your mind at any time by writing to or emailing us at\r\n {{config path="trans_email/ident_general/email"}}\r\n
    • \r\n
\r\n

\r\n We will not sell, distribute or lease your personal information to third parties unless we have your permission\r\n or are required by law to do so. We may use your personal information to send you promotional information\r\n about third parties which we think you may find interesting if you tell us that you wish this to happen.\r\n

\r\n

\r\n You may request details of personal information which we hold about you under the Data Protection Act 1998.\r\n A small fee will be payable. If you would like a copy of the information held on you please write to\r\n {{config path="general/store_information/address"}}.\r\n

\r\n

\r\n If you believe that any information we are holding on you is incorrect or incomplete,\r\n please write to or email us as soon as possible, at the above address.\r\n We will promptly correct any information found to be incorrect.\r\n

\r\n

List of cookies we collect

\r\n

The table below lists the cookies we collect and what information they store.

\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
COOKIE nameCOOKIE Description
CARTThe association with your shopping cart.
CATEGORY_INFOStores the category info on the page, that allows to display pages more quickly.
COMPAREThe items that you have in the Compare Products list.
CURRENCYYour preferred currency
CUSTOMERAn encrypted version of your customer id with the store.
CUSTOMER_AUTHAn indicator if you are currently logged into the store.
CUSTOMER_INFOAn encrypted version of the customer group you belong to.
CUSTOMER_SEGMENT_IDSStores the Customer Segment ID
EXTERNAL_NO_CACHEA flag, which indicates whether caching is disabled or not.
FRONTENDYou sesssion ID on the server.
GUEST-VIEWAllows guests to edit their orders.
LAST_CATEGORYThe last category you visited.
LAST_PRODUCTThe most recent product you have viewed.
NEWMESSAGEIndicates whether a new message has been received.
NO_CACHEIndicates whether it is allowed to use cache.
PERSISTENT_SHOPPING_CARTA link to information about your cart and viewing history if you have asked the site.
POLLThe ID of any polls you have recently voted in.
POLLNInformation on what polls you have voted on.
RECENTLYCOMPAREDThe items that you have recently compared.
STFInformation on products you have emailed to friends.
STOREThe store view or language you have selected.
USER_ALLOWED_SAVE_COOKIEIndicates whether a customer allowed to use cookies.
VIEWED_PRODUCT_IDSThe products that you have recently viewed.
WISHLISTAn encrypted list of products added to your Wishlist.
WISHLIST_CNTThe number of items in your Wishlist.
', '2015-10-09 15:15:25', '2015-10-09 15:15:25', 1, 0, NULL, NULL, NULL, NULL, NULL, NULL, 0, 1, 0), + (7, '503 Service Unavailable', 'one_column', NULL, NULL, 'service-unavailable', NULL, '

We\'re Offline...

\r\n

...but only for just a bit. We\'re working to make the Magento Enterprise Demo a better place for you!

', '2015-10-09 15:15:43', '2015-10-09 15:15:43', 1, 0, NULL, NULL, NULL, NULL, NULL, NULL, 0, 1, 0), + (8, 'Welcome to our Exclusive Online Store', 'one_column', NULL, NULL, 'private-sales', NULL, '
\r\n
\r\n
\r\n

Welcome to our Exclusive Online Store

\r\n

If you are a registered member, please log in here.

\r\n

Magento is the leading hub for exclusive specialty items for all your home, apparel and entertainment needs!

\r\n
\r\n
\r\n
', '2015-10-09 15:15:43', '2015-10-09 15:15:43', 1, 0, NULL, NULL, NULL, NULL, NULL, NULL, 0, 1, 0), + (9, 'Reward Points', 'one_column', NULL, NULL, 'reward-points', 'Reward Points', '

The Reward Points Program allows you to earn points for certain actions you take on the site. Points are awarded based on making purchases and customer actions such as submitting reviews.

\r\n\r\n

Benefits of Reward Points for Registered Customers

\r\n

Once you register you will be able to earn and accrue reward points, which are then redeemable at time of purchase towards the cost of your order. Rewards are an added bonus to your shopping experience on the site and just one of the ways we thank you for being a loyal customer.

\r\n\r\n

Earning Reward Points

\r\n

Rewards can currently be earned for the following actions:

\r\n
    \r\n
  • Making purchases — every time you make a purchase you earn points based on the price of products purchased and these points are added to your Reward Points balance.
    • \r\n
  • Registering on the site.
    • \r\n
  • Subscribing to a newsletter for the first time.
    • \r\n
  • Sending Invitations — Earn points by inviting your friends to join the site.
    • \r\n
  • Converting Invitations to Customer — Earn points for every invitation you send out which leads to your friends registering on the site.
    • \r\n
  • Converting Invitations to Order — Earn points for every invitation you send out which leads to a sale.
    • \r\n
  • Review Submission — Earn points for submitting product reviews.
    • \r\n
  • New Tag Submission — Earn points for adding tags to products.
    • \r\n
\r\n\r\n

Reward Points Exchange Rates

\r\n

The value of reward points is determined by an exchange rate of both currency spent on products to points, and an exchange rate of points earned to currency for spending on future purchases.

\r\n\r\n

Redeeming Reward Points

\r\n

You can redeem your reward points at checkout. If you have accumulated enough points to redeem them you will have the option of using points as one of the payment methods. The option to use reward points, as well as your balance and the monetary equivalent this balance, will be shown to you in the Payment Method area of the checkout. Redeemable reward points can be used in conjunction with other payment methods such as credit cards, gift cards and more.

\r\n

Payment Information

\r\n\r\n

Reward Points Minimums and Maximums

\r\n

Reward points may be capped at a minimum value required for redemption. If this option is selected you will not be able to use your reward points until you accrue a minimum number of points, at which point they will become available for redemption.

\r\n

Reward points may also be capped at the maximum value of points which can be accrued. If this option is selected you will need to redeem your accrued points before you are able to earn more points.

\r\n\r\n

Managing My Reward Points

\r\n

You have the ability to view and manage your points through your Customer Account. From your account you will be able to view your total points (and currency equivalent), minimum needed to redeem, whether you have reached the maximum points limit and a cumulative history of points acquired, redeemed and lost. The history record will retain and display historical rates and currency for informational purposes. The history will also show you comprehensive informational messages regarding points, including expiration notifications.

\r\n

My Account

\r\n\r\n

Reward Points Expiration

\r\n

Reward points can be set to expire. Points will expire in the order form which they were first earned.

\r\n

Note: You can sign up to receive email notifications each time your balance changes when you either earn, redeem or lose points, as well as point expiration notifications. This option is found in the Reward Points section of the My Account area.

\r\n', '2015-10-09 15:15:44', '2015-10-09 15:15:44', 1, 0, NULL, NULL, NULL, NULL, NULL, NULL, 0, 1, 0); +/*!40000 ALTER TABLE `cms_page` ENABLE KEYS */; + + +-- Dumping structure for magento1.cms_page_store +DROP TABLE IF EXISTS `cms_page_store`; +CREATE TABLE IF NOT EXISTS `cms_page_store` ( + `page_id` smallint(6) NOT NULL COMMENT 'Page ID', + `store_id` smallint(5) unsigned NOT NULL COMMENT 'Store ID', + PRIMARY KEY (`page_id`,`store_id`), + KEY `IDX_CMS_PAGE_STORE_STORE_ID` (`store_id`), + CONSTRAINT `FK_CMS_PAGE_STORE_PAGE_ID_CMS_PAGE_PAGE_ID` FOREIGN KEY (`page_id`) REFERENCES `cms_page` (`page_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_CMS_PAGE_STORE_STORE_ID_CORE_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `core_store` (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='CMS Page To Store Linkage Table'; + +-- Dumping data for table magento1.cms_page_store: ~9 rows +DELETE FROM `cms_page_store`; +/*!40000 ALTER TABLE `cms_page_store` DISABLE KEYS */; +INSERT INTO `cms_page_store` (`page_id`, `store_id`) VALUES + (1, 0), + (2, 0), + (3, 0), + (4, 0), + (5, 0), + (6, 0), + (7, 0), + (8, 0), + (9, 0); +/*!40000 ALTER TABLE `cms_page_store` ENABLE KEYS */; + +-- +-- Table structure for table `core_store` +-- + +DROP TABLE IF EXISTS `core_store`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `core_store` ( + `store_id` smallint(5) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Store Id', + `code` varchar(32) DEFAULT NULL COMMENT 'Code', + `website_id` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Website Id', + `group_id` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Group Id', + `name` varchar(255) NOT NULL COMMENT 'Store Name', + `sort_order` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Store Sort Order', + `is_active` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Store Activity', + PRIMARY KEY (`store_id`), + UNIQUE KEY `UNQ_CORE_STORE_CODE` (`code`), + KEY `IDX_CORE_STORE_WEBSITE_ID` (`website_id`), + KEY `IDX_CORE_STORE_IS_ACTIVE_SORT_ORDER` (`is_active`,`sort_order`), + KEY `IDX_CORE_STORE_GROUP_ID` (`group_id`), + CONSTRAINT `FK_CORE_STORE_GROUP_ID_CORE_STORE_GROUP_GROUP_ID` FOREIGN KEY (`group_id`) REFERENCES `core_store_group` (`group_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_CORE_STORE_WEBSITE_ID_CORE_WEBSITE_WEBSITE_ID` FOREIGN KEY (`website_id`) REFERENCES `core_website` (`website_id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COMMENT='Stores'; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `core_store` +-- + +LOCK TABLES `core_store` WRITE; +/*!40000 ALTER TABLE `core_store` DISABLE KEYS */; +INSERT INTO `core_store` VALUES +(0,'admin',0,0,'Admin',0,1), +(1,'default',1,1,'Default Store View',0,1), +(2,'de',1,1,'German',0,1), +(3,'mw_store_02',1,2,'MWStore View02',0,1); +/*!40000 ALTER TABLE `core_store` ENABLE KEYS */; +UNLOCK TABLES; + + +-- +-- Table structure for table `core_config_data` +-- + +DROP TABLE IF EXISTS `core_config_data`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `core_config_data` ( + `config_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Config Id', + `scope` varchar(8) NOT NULL DEFAULT 'default' COMMENT 'Config Scope', + `scope_id` int(11) NOT NULL DEFAULT '0' COMMENT 'Config Scope Id', + `path` varchar(255) NOT NULL DEFAULT 'general' COMMENT 'Config Path', + `value` text COMMENT 'Config Value', + PRIMARY KEY (`config_id`), + UNIQUE KEY `UNQ_CORE_CONFIG_DATA_SCOPE_SCOPE_ID_PATH` (`scope`,`scope_id`,`path`) +) ENGINE=InnoDB AUTO_INCREMENT=121 DEFAULT CHARSET=utf8 COMMENT='Config Data'; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `core_config_data` +-- + +LOCK TABLES `core_config_data` WRITE; +/*!40000 ALTER TABLE `core_config_data` DISABLE KEYS */; +INSERT INTO `core_config_data` VALUES +(1,'default',0,'catalog/seo/product_url_suffix','html'), +(2,'default',0,'catalog/seo/category_url_suffix','html'), +(3,'websites',1,'catalog/seo/product_url_suffix','html1'), +(4,'stores',3,'catalog/seo/product_url_suffix','html2'); +/*!40000 ALTER TABLE `core_config_data` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `enterprise_url_rewrite` +-- + +DROP TABLE IF EXISTS `enterprise_url_rewrite`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `enterprise_url_rewrite` ( + `url_rewrite_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Url Rewrite Id', + `request_path` varchar(255) NOT NULL COMMENT 'Request Path', + `target_path` varchar(255) NOT NULL COMMENT 'Target path', + `is_system` smallint(5) unsigned NOT NULL COMMENT 'Is url rewrite System', + `guid` varchar(32) NOT NULL COMMENT 'GUID', + `identifier` varchar(255) NOT NULL COMMENT 'Unique url identifier', + `inc` int(10) unsigned NOT NULL DEFAULT '1' COMMENT 'Url increment', + `value_id` int(10) unsigned NOT NULL COMMENT 'Entity table identifier', + `store_id` smallint(5) unsigned NOT NULL COMMENT 'Store Id', + `entity_type` smallint(5) unsigned NOT NULL COMMENT 'Url Rewrite Entity Type', + PRIMARY KEY (`url_rewrite_id`), + UNIQUE KEY `UNQ_ENTERPRISE_URL_REWRITE_REQUEST_PATH_STORE_ID_ENTITY_TYPE` (`request_path`,`store_id`,`entity_type`), + KEY `IDX_ENTERPRISE_URL_REWRITE_IDENTIFIER` (`identifier`), + KEY `IDX_ENTERPRISE_URL_REWRITE_VALUE_ID_GUID` (`value_id`,`guid`) +) ENGINE=InnoDB AUTO_INCREMENT=63 DEFAULT CHARSET=utf8 COMMENT='URL Rewrite'; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `enterprise_url_rewrite` +-- + +LOCK TABLES `enterprise_url_rewrite` WRITE; +/*!40000 ALTER TABLE `enterprise_url_rewrite` DISABLE KEYS */; +INSERT INTO `enterprise_url_rewrite` VALUES +(1,'test','catalog/category/view/id/3',1,'aafdc55c2b13623895ba2f0d586f69e1','test',1,3,1,2), +(28,'test2','catalog/category/view/id/4',1,'e310bd9490c57030e520593d9eb6ce2e','test2',1,4,1,2), +(29,'test2','catalog/category/view/id/4',1,'ecb44f765c18a3af00f24128d8b6a3b8','test2',1,4,2,2), +(30,'test','catalog/category/view/id/3',1,'962b97814939018fb8477ca2e7e03c35','test',1,3,2,2), +(33,'test2/test3','catalog/category/view/id/5',1,'e0afb234ba3561cdbaba88938a562a4b','test2/test3',1,5,1,2), +(34,'test2/test3','catalog/category/view/id/5',1,'9b0dfaa6bee6bf08eabe6b185fdf2df8','test2/test3',1,5,2,2), +(35,'test','catalog/category/view/id/3',1,'c8cab577a8c630cd873427bb6b90f96d','test',1,3,3,2), +(36,'test2','catalog/category/view/id/4',1,'10eaef8757f416c135a609dbec41ea77','test2',1,4,3,2), +(37,'test2/test3','catalog/category/view/id/5',1,'ed3ccf135ec704e3df20648b5ae7b8b0','test2/test3',1,5,3,2), +(46,'test','catalog/product/view/id/4',1,'79cd63a34f1f50f3a38cda4ef9591534','test',1,10,0,3), +(47,'test-product','catalog/product/view/id/4',1,'79cd63a34f1f50f3a38cda4ef9591534','test-product',1,11,3,3), +(48,'test-store-first','catalog/product/view/id/4',1,'79cd63a34f1f50f3a38cda4ef9591534','test-store-first',1,12,1,3), +(49,'test1.html','contacts',0,'4a0c0b790c2cb138ef699611f922339b','test1.html',1,1,1,1), +(50,'test2/test3/test_product.html','catalog/product/view/id/4/category/5',0,'4a0c0b790c2cb138ef699611f922339b','test2/test3/test_product.html',1,2,1,1), +(52,'test1','catalog/category/view/id/6',1,'a5d86e86af7f3b8b870bd5378d5084f2','test1',1,6,1,2), +(53,'test1','catalog/category/view/id/6',1,'69c325cf7b8a05180bda36bc511c1cce','test1',1,6,2,2), +(54,'test1','catalog/category/view/id/6',1,'f7011308e6f8f4e431bca3efdd1026f0','test1',1,6,3,2), +(55,'test1','catalog/product/view/id/5',1,'ada15e3563bf79b2d5c67d5cd5069e68','test1',1,13,0,3), +(56,'test4','catalog/category/view/id/7',1,'bd0ccc57528c1f3f086e6a82b83741a6','test4',1,7,1,2), +(57,'test4','catalog/category/view/id/7',1,'6eff0e8bfa846138f11cfb4a7bf5410d','test4',1,7,2,2), +(58,'test4','catalog/category/view/id/7',1,'d7f037bfe70bc4681d129bc7f5dcc76d','test4',1,7,3,2), +(59,'test5.html','contacts',0,'941ecaa436b59edf3c32e6f58c666697','test5.html',1,6,1,1), +(60,'test5','catalog/category/view/id/8',1,'74c8106e92344a3dcbf5732d6d8534fd','test5',1,8,1,2), +(61,'test5','catalog/category/view/id/8',1,'6d98585d20ddb1677a4e6458dabfe6be','test5',1,8,2,2), +(62,'test5','catalog/category/view/id/8',1,'8375e1e3b337311dde8a4b84e5e05c3f','test5',1,8,3,2); +/*!40000 ALTER TABLE `enterprise_url_rewrite` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `enterprise_url_rewrite_redirect` +-- + +DROP TABLE IF EXISTS `enterprise_url_rewrite_redirect`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `enterprise_url_rewrite_redirect` ( + `redirect_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Redirect Id', + `identifier` varchar(255) NOT NULL COMMENT 'Url identifier', + `target_path` varchar(255) NOT NULL COMMENT 'Target path', + `options` varchar(255) DEFAULT NULL COMMENT 'Redirect options', + `description` varchar(255) DEFAULT NULL COMMENT 'Description', + `category_id` int(10) unsigned DEFAULT NULL COMMENT 'Category Id', + `product_id` int(10) unsigned DEFAULT NULL COMMENT 'Product Id', + `store_id` smallint(5) unsigned NOT NULL COMMENT 'Store Id', + PRIMARY KEY (`redirect_id`), + UNIQUE KEY `UNQ_ENTERPRISE_URL_REWRITE_REDIRECT_IDENTIFIER_STORE_ID` (`identifier`,`store_id`), + KEY `FK_ENT_URL_REWRITE_REDIRECT_CTGR_ID_CAT_CTGR_ENTT_ENTT_ID` (`category_id`), + KEY `FK_ENT_URL_REWRITE_REDIRECT_PRD_ID_CAT_PRD_ENTT_ENTT_ID` (`product_id`), + CONSTRAINT `FK_ENT_URL_REWRITE_REDIRECT_CTGR_ID_CAT_CTGR_ENTT_ENTT_ID` FOREIGN KEY (`category_id`) REFERENCES `catalog_category_entity` (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_ENT_URL_REWRITE_REDIRECT_PRD_ID_CAT_PRD_ENTT_ENTT_ID` FOREIGN KEY (`product_id`) REFERENCES `catalog_product_entity` (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8 COMMENT='Permanent redirect'; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `enterprise_url_rewrite_redirect` +-- + +LOCK TABLES `enterprise_url_rewrite_redirect` WRITE; +/*!40000 ALTER TABLE `enterprise_url_rewrite_redirect` DISABLE KEYS */; +INSERT INTO `enterprise_url_rewrite_redirect` VALUES +(1,'test1.html','catalog/category/view/id/6','RP',NULL,6,NULL,1), +(2,'test2/test3/test_product.html','catalog/product/view/id/4/category/5','RP',NULL,5,4,1), +(3,'test1.html','catalog/category/view/id/6',NULL,NULL,6,NULL,2), +(4,'test1.html','catalog/category/view/id/6',NULL,NULL,6,NULL,3), +(6,'test5.html','contacts','RP',NULL,NULL,NULL,1); +/*!40000 ALTER TABLE `enterprise_url_rewrite_redirect` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `catalog_category_entity_url_key` +-- + +DROP TABLE IF EXISTS `catalog_category_entity_url_key`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `catalog_category_entity_url_key` ( + `value_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Value ID', + `entity_type_id` smallint(5) unsigned NOT NULL COMMENT 'Entity Type ID', + `attribute_id` smallint(5) unsigned NOT NULL COMMENT 'Attribute ID', + `store_id` smallint(5) unsigned NOT NULL COMMENT 'Store ID', + `entity_id` int(10) unsigned NOT NULL COMMENT 'Entity ID', + `value` varchar(255) DEFAULT NULL COMMENT 'Category Url Key', + PRIMARY KEY (`value_id`), + UNIQUE KEY `UNQ_CATALOG_CATEGORY_ENTITY_URL_KEY_ENTITY_ID_STORE_ID` (`entity_id`,`store_id`), + KEY `IDX_CATALOG_CATEGORY_ENTITY_URL_KEY_ATTRIBUTE_ID` (`attribute_id`), + KEY `IDX_CATALOG_CATEGORY_ENTITY_URL_KEY_STORE_ID` (`store_id`), + KEY `IDX_CATALOG_CATEGORY_ENTITY_URL_KEY_ENTITY_ID` (`entity_id`), + CONSTRAINT `FK_CATALOG_CATEGORY_ENTITY_URL_KEY_STORE_ID_CORE_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `core_store` (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_CAT_CTGR_ENTT_URL_KEY_ATTR_ID_EAV_ATTR_ATTR_ID` FOREIGN KEY (`attribute_id`) REFERENCES `eav_attribute` (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_CAT_CTGR_ENTT_URL_KEY_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID` FOREIGN KEY (`entity_id`) REFERENCES `catalog_category_entity` (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8 COMMENT='Catalog Category Url Key Attribute Backend Table'; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `catalog_category_entity_url_key` +-- + +LOCK TABLES `catalog_category_entity_url_key` WRITE; +/*!40000 ALTER TABLE `catalog_category_entity_url_key` DISABLE KEYS */; +INSERT INTO `catalog_category_entity_url_key` VALUES +(1,3,43,1,1,'root-catalog'), +(2,3,43,1,2,'default-category'), +(3,3,43,0,3,'test'), +(4,3,43,0,4,'test2'), +(5,3,43,0,5,'test3'), +(6,3,43,0,6,'test1'), +(7,3,43,0,7,'test4'), +(8,3,43,0,8,'test5'); +/*!40000 ALTER TABLE `catalog_category_entity_url_key` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `catalog_product_entity_url_key` +-- + +DROP TABLE IF EXISTS `catalog_product_entity_url_key`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `catalog_product_entity_url_key` ( + `value_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Value ID', + `entity_type_id` smallint(5) unsigned NOT NULL COMMENT 'Entity Type ID', + `attribute_id` smallint(5) unsigned NOT NULL COMMENT 'Attribute ID', + `store_id` smallint(5) unsigned NOT NULL COMMENT 'Store ID', + `entity_id` int(10) unsigned NOT NULL COMMENT 'Entity ID', + `value` varchar(255) DEFAULT NULL COMMENT 'Product Url Key', + PRIMARY KEY (`value_id`), + UNIQUE KEY `UNQ_CAT_PRD_ENTT_URL_KEY_ENTT_ID_ATTR_ID_STORE_ID` (`entity_id`,`attribute_id`,`store_id`), + UNIQUE KEY `UNQ_CATALOG_PRODUCT_ENTITY_URL_KEY_VALUE` (`value`), + KEY `IDX_CATALOG_PRODUCT_ENTITY_URL_KEY_ATTRIBUTE_ID` (`attribute_id`), + KEY `IDX_CATALOG_PRODUCT_ENTITY_URL_KEY_STORE_ID` (`store_id`), + KEY `IDX_CATALOG_PRODUCT_ENTITY_URL_KEY_ENTITY_ID` (`entity_id`), + CONSTRAINT `FK_CATALOG_PRODUCT_ENTITY_URL_KEY_STORE_ID_CORE_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `core_store` (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_CAT_PRD_ENTT_URL_KEY_ATTR_ID_EAV_ATTR_ATTR_ID` FOREIGN KEY (`attribute_id`) REFERENCES `eav_attribute` (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_CAT_PRD_ENTT_URL_KEY_ENTT_ID_CAT_PRD_ENTT_ENTT_ID` FOREIGN KEY (`entity_id`) REFERENCES `catalog_product_entity` (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8 COMMENT='Catalog Product Url Key Attribute Backend Table'; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `catalog_product_entity_url_key` +-- + +LOCK TABLES `catalog_product_entity_url_key` WRITE; +/*!40000 ALTER TABLE `catalog_product_entity_url_key` DISABLE KEYS */; +INSERT INTO `catalog_product_entity_url_key` VALUES +(10,4,97,0,4,'test'), +(11,4,97,3,4,'test-product'), +(12,4,97,1,4,'test-store-first'), +(13,4,97,0,5,'test1'); +/*!40000 ALTER TABLE `catalog_product_entity_url_key` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `catalog_category_product` +-- + +DROP TABLE IF EXISTS `catalog_category_product`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `catalog_category_product` ( + `category_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Category ID', + `product_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Product ID', + `position` int(11) NOT NULL DEFAULT '0' COMMENT 'Position', + PRIMARY KEY (`category_id`,`product_id`), + KEY `IDX_CATALOG_CATEGORY_PRODUCT_PRODUCT_ID` (`product_id`), + CONSTRAINT `FK_CAT_CTGR_PRD_CTGR_ID_CAT_CTGR_ENTT_ENTT_ID` FOREIGN KEY (`category_id`) REFERENCES `catalog_category_entity` (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_CAT_CTGR_PRD_PRD_ID_CAT_PRD_ENTT_ENTT_ID` FOREIGN KEY (`product_id`) REFERENCES `catalog_product_entity` (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Catalog Product To Category Linkage Table'; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `catalog_category_product` +-- + +LOCK TABLES `catalog_category_product` WRITE; +/*!40000 ALTER TABLE `catalog_category_product` DISABLE KEYS */; +INSERT INTO `catalog_category_product` VALUES +(3,4,1), +(3,5,1), +(4,4,1), +(5,4,0); +/*!40000 ALTER TABLE `catalog_category_product` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `catalog_product_website` +-- + +DROP TABLE IF EXISTS `catalog_product_website`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `catalog_product_website` ( + `product_id` int(10) unsigned NOT NULL COMMENT 'Product ID', + `website_id` smallint(5) unsigned NOT NULL COMMENT 'Website ID', + PRIMARY KEY (`product_id`,`website_id`), + KEY `IDX_CATALOG_PRODUCT_WEBSITE_WEBSITE_ID` (`website_id`), + CONSTRAINT `FK_CATALOG_PRODUCT_WEBSITE_WEBSITE_ID_CORE_WEBSITE_WEBSITE_ID` FOREIGN KEY (`website_id`) REFERENCES `core_website` (`website_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_CAT_PRD_WS_PRD_ID_CAT_PRD_ENTT_ENTT_ID` FOREIGN KEY (`product_id`) REFERENCES `catalog_product_entity` (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Catalog Product To Website Linkage Table'; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `catalog_product_website` +-- + +LOCK TABLES `catalog_product_website` WRITE; +/*!40000 ALTER TABLE `catalog_product_website` DISABLE KEYS */; +INSERT INTO `catalog_product_website` VALUES +(4,1), +(5,1); +/*!40000 ALTER TABLE `catalog_product_website` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `catalog_product_entity_varchar` +-- + +DROP TABLE IF EXISTS `catalog_product_entity_varchar`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `catalog_product_entity_varchar` ( + `value_id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Value ID', + `entity_type_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Entity Type ID', + `attribute_id` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Attribute ID', + `store_id` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Store ID', + `entity_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Entity ID', + `value` varchar(255) DEFAULT NULL COMMENT 'Value', + PRIMARY KEY (`value_id`), + UNIQUE KEY `UNQ_CAT_PRD_ENTT_VCHR_ENTT_ID_ATTR_ID_STORE_ID` (`entity_id`,`attribute_id`,`store_id`), + KEY `IDX_CATALOG_PRODUCT_ENTITY_VARCHAR_ATTRIBUTE_ID` (`attribute_id`), + KEY `IDX_CATALOG_PRODUCT_ENTITY_VARCHAR_STORE_ID` (`store_id`), + KEY `IDX_CATALOG_PRODUCT_ENTITY_VARCHAR_ENTITY_ID` (`entity_id`), + CONSTRAINT `FK_CATALOG_PRODUCT_ENTITY_VARCHAR_STORE_ID_CORE_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `core_store` (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_CAT_PRD_ENTT_VCHR_ATTR_ID_EAV_ATTR_ATTR_ID` FOREIGN KEY (`attribute_id`) REFERENCES `eav_attribute` (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_CAT_PRD_ENTT_VCHR_ENTT_ID_CAT_PRD_ENTT_ENTT_ID` FOREIGN KEY (`entity_id`) REFERENCES `catalog_product_entity` (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB AUTO_INCREMENT=97 DEFAULT CHARSET=utf8 COMMENT='Catalog Product Varchar Attribute Backend Table'; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `catalog_product_entity_varchar` +-- + +LOCK TABLES `catalog_product_entity_varchar` WRITE; +/*!40000 ALTER TABLE `catalog_product_entity_varchar` DISABLE KEYS */; +/*!40000 ALTER TABLE `catalog_product_entity_varchar` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `catalog_category_entity_varchar` +-- + +DROP TABLE IF EXISTS `catalog_category_entity_varchar`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `catalog_category_entity_varchar` ( + `value_id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Value ID', + `entity_type_id` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Entity Type ID', + `attribute_id` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Attribute ID', + `store_id` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Store ID', + `entity_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Entity ID', + `value` varchar(255) DEFAULT NULL COMMENT 'Value', + PRIMARY KEY (`value_id`), + UNIQUE KEY `UNQ_CAT_CTGR_ENTT_VCHR_ENTT_TYPE_ID_ENTT_ID_ATTR_ID_STORE_ID` (`entity_type_id`,`entity_id`,`attribute_id`,`store_id`), + KEY `IDX_CATALOG_CATEGORY_ENTITY_VARCHAR_ENTITY_ID` (`entity_id`), + KEY `IDX_CATALOG_CATEGORY_ENTITY_VARCHAR_ATTRIBUTE_ID` (`attribute_id`), + KEY `IDX_CATALOG_CATEGORY_ENTITY_VARCHAR_STORE_ID` (`store_id`), + CONSTRAINT `FK_CATALOG_CATEGORY_ENTITY_VARCHAR_STORE_ID_CORE_STORE_STORE_ID` FOREIGN KEY (`store_id`) REFERENCES `core_store` (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_CAT_CTGR_ENTT_VCHR_ATTR_ID_EAV_ATTR_ATTR_ID` FOREIGN KEY (`attribute_id`) REFERENCES `eav_attribute` (`attribute_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_CAT_CTGR_ENTT_VCHR_ENTT_ID_CAT_CTGR_ENTT_ENTT_ID` FOREIGN KEY (`entity_id`) REFERENCES `catalog_category_entity` (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB AUTO_INCREMENT=36 DEFAULT CHARSET=utf8 COMMENT='Catalog Category Varchar Attribute Backend Table'; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `catalog_category_entity_varchar` +-- + +LOCK TABLES `catalog_category_entity_varchar` WRITE; +/*!40000 ALTER TABLE `catalog_category_entity_varchar` DISABLE KEYS */; +INSERT INTO `catalog_category_entity_varchar` VALUES +(1,3,41,0,1,'Root Catalog'), +(2,3,41,1,1,'Root Catalog'), +(3,3,41,0,2,'Default Category'); +/*!40000 ALTER TABLE `catalog_category_entity_varchar` ENABLE KEYS */; +UNLOCK TABLES; + +/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; + +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; + +-- Dump completed on 2015-01-29 19:44:38 diff --git a/tests/integration/testsuite/Migration/_files/config.xml b/tests/integration/testsuite/Migration/_files/config.xml index 7866053fa..0e6d9bd34 100644 --- a/tests/integration/testsuite/Migration/_files/config.xml +++ b/tests/integration/testsuite/Migration/_files/config.xml @@ -79,5 +79,6 @@ 1 + ce-to-ce diff --git a/tests/integration/testsuite/Migration/_files/ee.config.xml b/tests/integration/testsuite/Migration/_files/ee.config.xml index 51277481a..06c57130a 100644 --- a/tests/integration/testsuite/Migration/_files/ee.config.xml +++ b/tests/integration/testsuite/Migration/_files/ee.config.xml @@ -72,10 +72,10 @@ - + - + tests/integration/testsuite/Migration/_files/map.xml @@ -91,5 +91,6 @@ 1 + ee-to-ee diff --git a/tests/unit/testsuite/Migration/Handler/Rule/NormalizationIdsTest.php b/tests/unit/testsuite/Migration/Handler/Rule/NormalizationIdsTest.php index 9f10d8a46..1de3909cb 100644 --- a/tests/unit/testsuite/Migration/Handler/Rule/NormalizationIdsTest.php +++ b/tests/unit/testsuite/Migration/Handler/Rule/NormalizationIdsTest.php @@ -39,6 +39,11 @@ class NormalizationIdsTest extends \PHPUnit_Framework_TestCase */ protected $normalizationField = 'website_id'; + /** + * @var \Migration\Config|\PHPUnit_Framework_MockObject_MockObject + */ + protected $config; + /** * @return void */ @@ -47,8 +52,14 @@ public function setUp() $this->destination = $this->getMockBuilder('Migration\ResourceModel\Destination')->disableOriginalConstructor() ->setMethods(['clearDocument', 'saveRecords']) ->getMock(); + $this->config = $this->getMockBuilder('\Migration\Config')->disableOriginalConstructor() + ->setMethods(['getOption']) + ->getMock(); + $this->config->expects($this->once())->method('getOption') + ->willReturn(\Migration\Config::EDITION_MIGRATE_CE_TO_CE); $this->handler = new NormalizationIds( $this->destination, + $this->config, $this->normalizationDocument, $this->normalizationField ); From e27c19731112db7e50052d774b7cd2be339f8f9e Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Wed, 6 Jul 2016 14:00:58 +0300 Subject: [PATCH 64/71] MAGETWO-55032: Unable to save bundle product after migration --- src/Migration/Step/Eav/Data.php | 58 +++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/src/Migration/Step/Eav/Data.php b/src/Migration/Step/Eav/Data.php index 3cdb62cb6..94ed1a46d 100644 --- a/src/Migration/Step/Eav/Data.php +++ b/src/Migration/Step/Eav/Data.php @@ -103,6 +103,21 @@ class Data implements StageInterface, RollbackInterface */ protected $readerAttributes; + /** + * @var array + */ + protected $groupsDataToAdd = [ + [ + 'attribute_group_name' => 'Schedule Design Update', + 'attribute_group_code' => 'schedule-design-update', + 'sort_order' => '55', + ], [ + 'attribute_group_name' => 'Bundle Items', + 'attribute_group_code' => 'bundle-items', + 'sort_order' => '16', + ] + ]; + /** * @param Source $source * @param Destination $destination @@ -205,7 +220,7 @@ protected function migrateAttributeSetsAndGroups() ); $recordsToSave->addRecord($destinationRecord); } - $recordsToSave = $this->addScheduleDesignToAttributeGroups($recordsToSave, $documentName); + $recordsToSave = $this->addAttributeGroups($recordsToSave, $documentName, $this->groupsDataToAdd); } $this->destination->clearDocument($destinationDocument->getName()); @@ -220,13 +235,14 @@ protected function migrateAttributeSetsAndGroups() } /** - * Add Schedule Design to attribute groups of Magento 1 - * + * Add attribute groups to Magento 1 which are needed for Magento 2 + * * @param Record\Collection $recordsToSave * @param string $documentName + * @param array $groupsData * @return Record\Collection */ - protected function addScheduleDesignToAttributeGroups($recordsToSave, $documentName) + protected function addAttributeGroups($recordsToSave, $documentName, array $groupsData) { /** @var \Magento\Framework\DB\Select $select */ $select = $this->source->getAdapter()->getSelect(); @@ -242,23 +258,25 @@ protected function addScheduleDesignToAttributeGroups($recordsToSave, $documentN $destinationDocument = $this->destination->getDocument( $this->map->getDocumentMap($documentName, MapInterface::TYPE_SOURCE) ); - foreach ($catalogProductSetIds as $id) { - $destinationRecord = $this->factory->create( - [ - 'document' => $destinationDocument, - 'data' => [ - 'attribute_group_id' => null, - 'attribute_set_id' => $id, - 'attribute_group_name' => 'Schedule Design Update', - 'sort_order' => '55', - 'default_id' => '0', - 'attribute_group_code' => 'schedule-design-update', - 'tab_group_code' => 'advanced', + foreach ($groupsData as $group) { + foreach ($catalogProductSetIds as $id) { + $destinationRecord = $this->factory->create( + [ + 'document' => $destinationDocument, + 'data' => [ + 'attribute_group_id' => null, + 'attribute_set_id' => $id, + 'attribute_group_name' => $group['attribute_group_name'], + 'sort_order' => $group['sort_order'], + 'default_id' => '0', + 'attribute_group_code' => $group['attribute_group_code'], + 'tab_group_code' => 'advanced', + ] ] - ] - ); - $addedGroups[] = $destinationRecord; - $recordsToSave->addRecord($destinationRecord); + ); + $addedGroups[] = $destinationRecord; + $recordsToSave->addRecord($destinationRecord); + } } $this->helper->setAddedGroups($addedGroups); From 51aff979fda534e84bfe489a0105e3392a67c833 Mon Sep 17 00:00:00 2001 From: Alex Bomko Date: Wed, 6 Jul 2016 18:15:44 +0300 Subject: [PATCH 65/71] MAGETWO-55039: Price, Qty, Advanced Price and Advanced Qty do not show on product edit page after migration --- src/Migration/Step/Eav/Data.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Migration/Step/Eav/Data.php b/src/Migration/Step/Eav/Data.php index 3cdb62cb6..734c987e4 100644 --- a/src/Migration/Step/Eav/Data.php +++ b/src/Migration/Step/Eav/Data.php @@ -413,7 +413,7 @@ private function moveFieldsToGroup($recordsToSave) if (!isset($attributeSetGroup['quantity_and_stock_status'])) { $quantityAttribute['attribute_set_id'] = $attributeSetId; $quantityAttribute['attribute_group_id'] = $attributeSetGroup['product-details']; - $quantityAttribute['entity_attribute_id'] = ''; + $quantityAttribute['entity_attribute_id'] = null; $destinationRecord = $this->factory->create( [ 'document' => $destinationDocument, From 906b592986585abc5e8c57865a111648b0017ac7 Mon Sep 17 00:00:00 2001 From: Alex Bomko Date: Wed, 6 Jul 2016 20:31:38 +0300 Subject: [PATCH 66/71] MAGETWO-55032: Unable to save bundle product after migration --- src/Migration/Step/Eav/Data.php | 77 +++++++++++++++++++++++++-------- 1 file changed, 60 insertions(+), 17 deletions(-) diff --git a/src/Migration/Step/Eav/Data.php b/src/Migration/Step/Eav/Data.php index 5a63a1c12..0a4f75679 100644 --- a/src/Migration/Step/Eav/Data.php +++ b/src/Migration/Step/Eav/Data.php @@ -236,7 +236,7 @@ protected function migrateAttributeSetsAndGroups() /** * Add attribute groups to Magento 1 which are needed for Magento 2 - * + * * @param Record\Collection $recordsToSave * @param string $documentName * @param array $groupsData @@ -382,7 +382,7 @@ protected function migrateEntityAttributes() } $recordsToSave = $this->processDesignEntityAttributes($recordsToSave); - $recordsToSave = $this->moveFieldsToGroup($recordsToSave); + $recordsToSave = $this->moveAttributes($recordsToSave); $this->destination->clearDocument($destinationDocument->getName()); $this->saveRecords($destinationDocument, $recordsToSave); @@ -393,49 +393,92 @@ protected function migrateEntityAttributes() * * @param Record\Collection $recordsToSave * @return Record\Collection - * @throws \Migration\Exception */ - private function moveFieldsToGroup($recordsToSave) + private function moveAttributes($recordsToSave) + { + $this->moveAttributeToGroup($recordsToSave, 'price', 'product-details'); + $this->moveAttributeToGroup($recordsToSave, 'shipment_type', 'bundle-items'); + $this->addAttributeToGroup($recordsToSave, 'quantity_and_stock_status', 'product-details'); + return $recordsToSave; + } + + /** + * Move attribute to other attribute group + * + * @param Record\Collection $recordsToSave + * @param string $attributeCode + * @param string $attributeGroupCode + * @return Record\Collection + */ + private function moveAttributeToGroup($recordsToSave, $attributeCode, $attributeGroupCode) { $attributes = $this->helper->getDestinationRecords('eav_attribute', ['attribute_id']); $attributeGroups = $this->helper->getDestinationRecords('eav_attribute_group', ['attribute_group_id']); $attributeSetGroups = []; foreach ($attributeGroups as $attributeGroup) { - if ($attributeGroup['attribute_group_code'] == 'product-details') { - $attributeSetGroups[$attributeGroup['attribute_set_id']]['product-details'] = + if ($attributeGroup['attribute_group_code'] == $attributeGroupCode) { + $attributeSetGroups[$attributeGroup['attribute_set_id']][$attributeGroupCode] = $attributeGroup['attribute_group_id']; } } - $quantityAttribute = null; foreach ($recordsToSave as $record) { $attributeId = $record->getValue('attribute_id'); if (!isset($attributes[$attributeId])) { continue; } - if ($attributes[$attributeId]['attribute_code'] == 'price') { + if ($attributes[$attributeId]['attribute_code'] == $attributeCode) { $record->setValue( 'attribute_group_id', - $attributeSetGroups[$record->getValue('attribute_set_id')]['product-details'] + $attributeSetGroups[$record->getValue('attribute_set_id')][$attributeGroupCode] ); } - if ($attributes[$attributeId]['attribute_code'] == 'quantity_and_stock_status') { - $attributeSetGroups[$record->getValue('attribute_set_id')]['quantity_and_stock_status'] = + } + return $recordsToSave; + } + + /** + * Add attribute to attribute group + * + * @param $recordsToSave + * @param $attributeCode + * @param $attributeGroupCode + * @return mixed + */ + private function addAttributeToGroup($recordsToSave, $attributeCode, $attributeGroupCode) + { + $attributes = $this->helper->getDestinationRecords('eav_attribute', ['attribute_id']); + $attributeGroups = $this->helper->getDestinationRecords('eav_attribute_group', ['attribute_group_id']); + $attributeSetGroups = []; + foreach ($attributeGroups as $attributeGroup) { + if ($attributeGroup['attribute_group_code'] == $attributeGroupCode) { + $attributeSetGroups[$attributeGroup['attribute_set_id']][$attributeGroupCode] = + $attributeGroup['attribute_group_id']; + } + } + $attribute = null; + foreach ($recordsToSave as $record) { + $attributeId = $record->getValue('attribute_id'); + if (!isset($attributes[$attributeId])) { + continue; + } + if ($attributes[$attributeId]['attribute_code'] == $attributeCode) { + $attributeSetGroups[$record->getValue('attribute_set_id')][$attributeCode] = $record->getValue('attribute_group_id'); - $quantityAttribute = $record->getData(); + $attribute = $record->getData(); } } $destinationDocument = $this->destination->getDocument( $this->map->getDocumentMap('eav_entity_attribute', MapInterface::TYPE_SOURCE) ); foreach ($attributeSetGroups as $attributeSetId => $attributeSetGroup) { - if (!isset($attributeSetGroup['quantity_and_stock_status'])) { - $quantityAttribute['attribute_set_id'] = $attributeSetId; - $quantityAttribute['attribute_group_id'] = $attributeSetGroup['product-details']; - $quantityAttribute['entity_attribute_id'] = null; + if (!isset($attributeSetGroup[$attributeCode])) { + $attribute['attribute_set_id'] = $attributeSetId; + $attribute['attribute_group_id'] = $attributeSetGroup[$attributeGroupCode]; + $attribute['entity_attribute_id'] = null; $destinationRecord = $this->factory->create( [ 'document' => $destinationDocument, - 'data' => $quantityAttribute + 'data' => $attribute ] ); $recordsToSave->addRecord($destinationRecord); From 6ca06e3ae8643da518d5d2f5413d391901dfd5c1 Mon Sep 17 00:00:00 2001 From: Alex Bomko Date: Wed, 6 Jul 2016 20:48:53 +0300 Subject: [PATCH 67/71] MAGETWO-55032: Unable to save bundle product after migration --- src/Migration/Step/Eav/Data.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Migration/Step/Eav/Data.php b/src/Migration/Step/Eav/Data.php index 0a4f75679..6661a647a 100644 --- a/src/Migration/Step/Eav/Data.php +++ b/src/Migration/Step/Eav/Data.php @@ -439,10 +439,10 @@ private function moveAttributeToGroup($recordsToSave, $attributeCode, $attribute /** * Add attribute to attribute group * - * @param $recordsToSave - * @param $attributeCode - * @param $attributeGroupCode - * @return mixed + * @param Record\Collection $recordsToSave + * @param string $attributeCode + * @param string $attributeGroupCode + * @return Record\Collection */ private function addAttributeToGroup($recordsToSave, $attributeCode, $attributeGroupCode) { @@ -701,7 +701,6 @@ protected function loadNewAttributeGroups() $newAttributeGroup = $this->newAttributeGroups[$newKey]; $this->destAttributeGroupsOldNewMap[$record['attribute_group_id']] = $newAttributeGroup['attribute_group_id']; - } } From ef5b8136f81075b0885636d818660063e8008280 Mon Sep 17 00:00:00 2001 From: Ruslan Kostiv Date: Wed, 6 Jul 2016 21:18:42 +0300 Subject: [PATCH 68/71] MAGETWO-55013: Warning while delta migration 1.9.2.1 CE-to-CE --- src/Migration/App/Progress.php | 10 ++++- src/Migration/Step/Map/Volume.php | 41 +++++++++++++++++- src/Migration/Step/PostProcessing/Data.php | 39 ++++++++++++++--- .../testsuite/Migration/App/ProgressTest.php | 43 +++++++++++++++++++ .../Migration/Step/Map/VolumeTest.php | 19 ++++++-- 5 files changed, 138 insertions(+), 14 deletions(-) diff --git a/src/Migration/App/Progress.php b/src/Migration/App/Progress.php index 1a024cc1b..45a36fcc1 100644 --- a/src/Migration/App/Progress.php +++ b/src/Migration/App/Progress.php @@ -66,7 +66,7 @@ public function isCompleted($object, $stage) * @param array $processedEntities * @return void */ - protected function saveProcessedEntities($object, $stage, array $processedEntities) + public function saveProcessedEntities($object, $stage, array $processedEntities) { $data = $this->file->getData(); $name = $this->getName($object); @@ -140,6 +140,12 @@ public function reset($object = null) */ protected function getName($object) { - return get_class($object); + if (is_string($object)) { + $name = $object; + } else { + $name = get_class($object); + } + + return $name; } } diff --git a/src/Migration/Step/Map/Volume.php b/src/Migration/Step/Map/Volume.php index fbd72428b..1caf0b409 100644 --- a/src/Migration/Step/Map/Volume.php +++ b/src/Migration/Step/Map/Volume.php @@ -11,6 +11,7 @@ use Migration\Reader\Map; use Migration\Reader\MapFactory; use Migration\ResourceModel; +use Migration\App\Progress; use Migration\App\ProgressBar; class Volume extends AbstractVolume @@ -37,11 +38,22 @@ class Volume extends AbstractVolume */ protected $progressBar; + /** + * + * @var Progress + */ + protected $progress; + /** * @var Helper */ protected $helper; + /** + * @var array + */ + protected $deletedDocumentRowsCount; + /** * @param Logger $logger * @param ResourceModel\Source $source @@ -49,6 +61,7 @@ class Volume extends AbstractVolume * @param MapFactory $mapFactory * @param ProgressBar\LogLevelProcessor $progressBar * @param Helper $helper + * @param Progress $progress */ public function __construct( Logger $logger, @@ -56,13 +69,15 @@ public function __construct( ResourceModel\Destination $destination, MapFactory $mapFactory, ProgressBar\LogLevelProcessor $progressBar, - Helper $helper + Helper $helper, + Progress $progress ) { $this->source = $source; $this->destination = $destination; $this->map = $mapFactory->create('map_file'); $this->progressBar = $progressBar; $this->helper = $helper; + $this->progress = $progress; parent::__construct($logger); } @@ -81,7 +96,7 @@ public function perform() } $distinctFields = $this->helper->getFieldsUpdateOnDuplicate($destinationName); $sourceCount = $this->source->getRecordsCount($sourceDocName, true, $distinctFields); - $destinationCount = $this->destination->getRecordsCount($destinationName); + $destinationCount = $this->getDestinationRecordsCount($destinationName); if ($sourceCount != $destinationCount) { $this->errors[] = 'Mismatch of entities in the document: ' . $destinationName; } @@ -89,4 +104,26 @@ public function perform() $this->progressBar->finish(); return $this->checkForErrors(); } + + /** + * Get count of records in destination table + * + * @param string $destinationName + * @return int + */ + public function getDestinationRecordsCount($destinationName) + { + if (null === $this->deletedDocumentRowsCount) { + $this->deletedDocumentRowsCount = $this->progress->getProcessedEntities( + 'PostProcessing', + 'deletedDocumentRowsCount' + ); + } + + $destinationCount = $this->destination->getRecordsCount($destinationName); + if (!empty($this->deletedDocumentRowsCount[$destinationName])) { + $destinationCount -= $this->deletedDocumentRowsCount[$destinationName]; + } + return $destinationCount; + } } diff --git a/src/Migration/Step/PostProcessing/Data.php b/src/Migration/Step/PostProcessing/Data.php index e23e15009..b8785f0cf 100644 --- a/src/Migration/Step/PostProcessing/Data.php +++ b/src/Migration/Step/PostProcessing/Data.php @@ -10,6 +10,7 @@ use Migration\ResourceModel; use Migration\ResourceModel\Record; use Migration\App\ProgressBar; +use Migration\App\Progress; use Migration\Logger\Manager as LogManager; use Migration\Logger\Logger; use Migration\Reader\GroupsFactory; @@ -32,6 +33,11 @@ class Data implements StageInterface /** * @var ProgressBar\LogLevelProcessor */ + protected $progressBar; + + /** + * @var Progress + */ protected $progress; /** @@ -50,27 +56,35 @@ class Data implements StageInterface protected $readerAttributes; /** - * @param ProgressBar\LogLevelProcessor $progress + * @var array + */ + protected $deletedDocumentRowsCount; + + /** + * @param ProgressBar\LogLevelProcessor $progressBar * @param ResourceModel\Source $source * @param ResourceModel\Destination $destination * @param GroupsFactory $groupsFactory * @param Helper $helper * @param Logger $logger + * @param Progress $progress */ public function __construct( - ProgressBar\LogLevelProcessor $progress, + ProgressBar\LogLevelProcessor $progressBar, ResourceModel\Source $source, ResourceModel\Destination $destination, GroupsFactory $groupsFactory, Logger $logger, - Helper $helper + Helper $helper, + Progress $progress ) { $this->source = $source; $this->destination = $destination; - $this->progress = $progress; + $this->progressBar = $progressBar; $this->logger = $logger; $this->helper = $helper; $this->readerAttributes = $groupsFactory->create('eav_attribute_groups_file'); + $this->progress = $progress; } /** @@ -78,9 +92,9 @@ public function __construct( */ public function perform() { - $this->progress->start($this->getIterationsCount(), LogManager::LOG_LEVEL_INFO); + $this->progressBar->start($this->getIterationsCount(), LogManager::LOG_LEVEL_INFO); $this->deleteMissingProductAttributeValues(); - $this->progress->finish(LogManager::LOG_LEVEL_INFO); + $this->progressBar->finish(LogManager::LOG_LEVEL_INFO); return true; } @@ -96,9 +110,20 @@ protected function deleteMissingProductAttributeValues() return ; } foreach (array_keys($this->helper->getProductDestinationDocumentFields()) as $document) { - $this->progress->advance(LogManager::LOG_LEVEL_INFO); + $this->progressBar->advance(LogManager::LOG_LEVEL_INFO); + + $rowsCountBefore = $this->destination->getRecordsCount($document); $this->destination->deleteRecords($document, 'attribute_id', $attributeIds); + $deletedCount = $rowsCountBefore - $this->destination->getRecordsCount($document); + if (!empty($deletedCount)) { + $this->deletedDocumentRowsCount[$document] = $deletedCount; + } } + $this->progress->saveProcessedEntities( + 'PostProcessing', + 'deletedDocumentRowsCount', + $this->deletedDocumentRowsCount + ); } /** diff --git a/tests/unit/testsuite/Migration/App/ProgressTest.php b/tests/unit/testsuite/Migration/App/ProgressTest.php index c7c3bc5da..97c007271 100644 --- a/tests/unit/testsuite/Migration/App/ProgressTest.php +++ b/tests/unit/testsuite/Migration/App/ProgressTest.php @@ -161,4 +161,47 @@ public function testSaveDataNoFile() $this->progress->saveResult($step, 'integrity', 'true'); } + + /** + * @return void + * @dataProvider saveProcessedEntitiesDataProvider + */ + public function testSaveProcessedEntities($data, $step, $stage, $processed, $saveData) + { + $this->file->expects($this->once())->method('getData')->willReturn($data); + $this->file->expects($this->once())->method('saveData')->with($saveData); + + $this->progress->saveProcessedEntities($step, $stage, $processed); + } + + /** + * @return array + */ + public function saveProcessedEntitiesDataProvider() + { + $step = $this->getMock('\Migration\Step\Map\Data', [], [], '', false); + $data = ['test_step' => ['dummy_array']]; + return [ + 'class' => [ + 'data' => $data, + 'step' => $step, + 'stage' => 'run1', + 'processed' => ['table1'], + 'saveData' => [ + 'test_step' => ['dummy_array'], + get_class($step) => ['run1' => [\Migration\App\Progress::PROCESS_KEY => ['table1']]], + ], + ], + 'string_name' => [ + 'data' => $data, + 'step' => 'step', + 'stage' => 'run2', + 'processed' => ['table2'], + 'saveData' => [ + 'test_step' => ['dummy_array'], + 'step' => ['run2' => [\Migration\App\Progress::PROCESS_KEY => ['table2']]], + ], + ] + ]; + } } diff --git a/tests/unit/testsuite/Migration/Step/Map/VolumeTest.php b/tests/unit/testsuite/Migration/Step/Map/VolumeTest.php index 96d0e61ad..304828721 100644 --- a/tests/unit/testsuite/Migration/Step/Map/VolumeTest.php +++ b/tests/unit/testsuite/Migration/Step/Map/VolumeTest.php @@ -14,6 +14,11 @@ class VolumeTest extends \PHPUnit_Framework_TestCase /** * @var \Migration\App\ProgressBar\LogLevelProcessor|\PHPUnit_Framework_MockObject_MockObject */ + protected $progressBar; + + /** + * @var \Migration\App\Progress|\PHPUnit_Framework_MockObject_MockObject + */ protected $progress; /** @@ -52,13 +57,20 @@ class VolumeTest extends \PHPUnit_Framework_TestCase public function setUp() { $this->logger = $this->getMock('Migration\Logger\Logger', ['addRecord'], [], '', false); - $this->progress = $this->getMock( + $this->progressBar = $this->getMock( '\Migration\App\ProgressBar\LogLevelProcessor', ['start', 'finish', 'advance'], [], '', false ); + $this->progress = $this->getMock( + '\Migration\App\Progress', + ['getProcessedEntities'], + [], + '', + false + ); $this->source = $this->getMock( 'Migration\ResourceModel\Source', ['getDocumentList', 'getRecordsCount'], @@ -91,8 +103,9 @@ public function setUp() $this->source, $this->destination, $mapFactory, - $this->progress, - $this->helper + $this->progressBar, + $this->helper, + $this->progress ); } From 7a1fc6ab2f25b9b93df85a42257d817255a4d367 Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Thu, 7 Jul 2016 11:22:23 +0300 Subject: [PATCH 69/71] MAGETWO-48593: Adapt Data Migration Tool to Magento 2.1 MLS12 --- .gitignore | 17 ----------------- CHANGELOG.md | 14 ++++++++++++++ README.md | 14 +++++++------- composer.json | 4 ++-- 4 files changed, 23 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 7085fe3ba..4f52fd894 100644 --- a/.gitignore +++ b/.gitignore @@ -9,23 +9,6 @@ atlassian* /.idea /.gitattributes /node_modules -/etc/ce-1.9.1/deltalog.xml -/etc/ce-1.9.1/config.xml -/etc/ce-1.9.1/eav-document-groups.xml -/etc/ce-1.9.1/log-document-groups.xml -/etc/ce-1.9.1/map-eav.xml -/etc/ce-1.9.1/map.xml -/etc/ce-1.9.1/map-log.xml -/etc/ce-1.9.1/settings.xml -/etc/ee-1.14.1/deltalog.xml -/etc/ee-1.14.1/config.xml -/etc/ee-1.14.1/eav-document-groups.xml -/etc/ee-1.14.1/log-document-groups.xml -/etc/ee-1.14.1/map.xml -/etc/ee-1.14.1/map-eav.xml -/etc/ee-1.14.1/map-log.xml -/etc/ee-1.14.1/map-sales.xml -/etc/ee-1.14.1/settings.xml /tests/unit/tmp /tests/unit/phpunit.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index 52b30835b..b1e4c1eab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ +2.1.0 +============= +* Added support for migration of Magento 1 CE stores upgraded to 1.6 and later versions from versions earlier than 1.6 version +* Added support for migration for the following versions: + + * Magento CE v. 1.9.2.4, v. 2.1.0 + * Magento EE v. 1.14.2.4, v.2.1.0 + +* Fixed bugs: + * Fixed an issue with RMA creation after migration + * Fixed an issue with URL Rewrite duplication for CMS Pages + * [Issue#59](https://github.com/magento/data-migration-tool/issues/59) Wrong URL addresses for products and categories + * [Issue#36](https://github.com/magento/data-migration-tool/issues/36) `Incorrect table name` error on products grid page + 2.0.5 ============= * Added support for: diff --git a/README.md b/README.md index 4abb65dad..016836840 100644 --- a/README.md +++ b/README.md @@ -25,11 +25,11 @@ Also the following versions are already supported if you choose to migrate from ## Prerequisites Before you start your migration, you must do all of the following: -* Set up a Magento 2.0 system that meets our system requirements. +* Set up a Magento 2 system that meets our system requirements. Set up your system using a topology and design that at least matches your existing Magento 1.x system. -* Do not start Magento 2.0 cron jobs. +* Do not start Magento 2 cron jobs. * Back up or dump your Magento 2 database as soon after installation as possible. @@ -39,14 +39,14 @@ Before you start your migration, you must do all of the following: * To provide redundancy in the event of unexpected issues, we advise you to replicate your Magento 1.x database. -* Migrate Magento 1.x extension and custom code to Magento 2.0. +* Migrate Magento 1.x extension and custom code to Magento 2. Reach out to your extension providers to see if they have been ported yet. ## Install the Data Migration Tool This section discusses how to install the Magento Data Migration Tool. You can install it from either repo.magento.com or from a GitHub repository. -**Note**: The versions of both the migration tool and the Magento 2 code must be identical (for example, 2.0.0). To find the version of either package, open `composer.json` and find the value of `"version"`. +**Note**: The versions of both the migration tool and the Magento 2 code must be identical (for example, 2.1.0). To find the version of either package, open `composer.json` and find the value of `"version"`. ### Install the tool from GitHub To install the migration tool from GitHub, use the following steps: @@ -58,7 +58,7 @@ To install the migration tool from GitHub, use the following steps: composer config repositories.data-migration-tool git https://github.com/magento/data-migration-tool composer require magento/data-migration-tool: - where `` is release version (e.g. 2.0.2) + where `` is release version (e.g. 2.1.0) 3. Wait while dependencies are updated. @@ -91,11 +91,11 @@ To update `composer.json`: Exact version example: - composer require magento/data-migration-tool:2.0.0 + composer require magento/data-migration-tool:2.1.0 Next significant release example: - composer require magento/data-migration-tool:~2.0.0 + composer require magento/data-migration-tool:~2.0 9. Wait while dependencies are installed. diff --git a/composer.json b/composer.json index 350b0b233..6b664cc54 100644 --- a/composer.json +++ b/composer.json @@ -1,10 +1,10 @@ { "name": "magento/data-migration-tool", "description": "Migration Tool", - "version": "2.0.5", + "version": "2.1.0", "require": { "symfony/console": "~2.3", - "magento/framework": "~100.1.0", + "magento/framework": "~100.1", "monolog/monolog": "~1.16.0" }, "autoload": { From a2e0b4c63d8a3dfe0b23661e38ab75d305b9dcfa Mon Sep 17 00:00:00 2001 From: Ruslan Kostiv Date: Thu, 7 Jul 2016 17:43:56 +0300 Subject: [PATCH 70/71] MAGETWO-55107: Fix migration tool tests --- src/Migration/Step/Eav/Data.php | 1 + src/Migration/Step/PostProcessing/Data.php | 3 --- tests/integration/resource/eav/dest.sql | 2 ++ tests/integration/resource/ee.eav/dest.sql | 2 ++ tests/unit/testsuite/Migration/App/ProgressTest.php | 8 +++++++- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/Migration/Step/Eav/Data.php b/src/Migration/Step/Eav/Data.php index 6661a647a..214eab27b 100644 --- a/src/Migration/Step/Eav/Data.php +++ b/src/Migration/Step/Eav/Data.php @@ -22,6 +22,7 @@ * Class Data * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + * @SuppressWarnings(PHPMD.TooManyFields) * @codeCoverageIgnoreStart */ class Data implements StageInterface, RollbackInterface diff --git a/src/Migration/Step/PostProcessing/Data.php b/src/Migration/Step/PostProcessing/Data.php index c8cc0b9ad..a8d75ddf0 100644 --- a/src/Migration/Step/PostProcessing/Data.php +++ b/src/Migration/Step/PostProcessing/Data.php @@ -13,7 +13,6 @@ use Migration\App\Progress; use Migration\Logger\Manager as LogManager; use Migration\Logger\Logger; -use Migration\Reader\GroupsFactory; /** * Class Data @@ -59,7 +58,6 @@ class Data implements StageInterface * @param ProgressBar\LogLevelProcessor $progressBar * @param ResourceModel\Source $source * @param ResourceModel\Destination $destination - * @param GroupsFactory $groupsFactory * @param Helper $helper * @param Logger $logger * @param Progress $progress @@ -68,7 +66,6 @@ public function __construct( ProgressBar\LogLevelProcessor $progressBar, ResourceModel\Source $source, ResourceModel\Destination $destination, - GroupsFactory $groupsFactory, Logger $logger, Helper $helper, Progress $progress diff --git a/tests/integration/resource/eav/dest.sql b/tests/integration/resource/eav/dest.sql index da9561445..9908dd785 100644 --- a/tests/integration/resource/eav/dest.sql +++ b/tests/integration/resource/eav/dest.sql @@ -60,6 +60,7 @@ ENGINE=InnoDB ; INSERT INTO `eav_attribute` (`attribute_id`, `entity_type_id`, `attribute_code`, `attribute_model`, `backend_model`, `backend_type`, `backend_table`, `frontend_model`, `frontend_input`, `frontend_label`, `frontend_class`, `source_model`, `is_required`, `is_user_defined`, `default_value`, `is_unique`, `note`) VALUES (70, 4, 'sku', NULL, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\Sku', 'static', NULL, NULL, 'text', 'SKU', 'validate-length maximum-length-64', NULL, 1, 0, NULL, 1, NULL); INSERT INTO `eav_attribute` (`attribute_id`, `entity_type_id`, `attribute_code`, `attribute_model`, `backend_model`, `backend_type`, `backend_table`, `frontend_model`, `frontend_input`, `frontend_label`, `frontend_class`, `source_model`, `is_required`, `is_user_defined`, `default_value`, `is_unique`, `note`) VALUES (1, 1, 'website_id', NULL, 'Magento\\Customer\\Model\\Customer\\Attribute\\Backend\\Website', 'static', NULL, NULL, 'select', 'Associate to Website', NULL, 'Magento\\Customer\\Model\\Customer\\Attribute\\Source\\Website', 1, 0, NULL, 0, NULL); +INSERT INTO `eav_attribute` (`attribute_id`, `entity_type_id`, `attribute_code`, `attribute_model`, `backend_model`, `backend_type`, `backend_table`, `frontend_model`, `frontend_input`, `frontend_label`, `frontend_class`, `source_model`, `is_required`, `is_user_defined`, `default_value`, `is_unique`, `note`) VALUES (115, 4, 'quantity_and_stock_status', NULL, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\Stock', 'int', NULL, NULL, 'select', 'Quantity', NULL, 'Magento\\CatalogInventory\\Model\\Source\\Stock', 0, 0, '1', 0, NULL); DROP TABLE IF EXISTS `catalog_eav_attribute`; CREATE TABLE `catalog_eav_attribute` ( @@ -153,6 +154,7 @@ CREATE TABLE `eav_entity_attribute` ( ENGINE=InnoDB ; INSERT INTO `eav_entity_attribute` (`entity_attribute_id`, `entity_type_id`, `attribute_set_id`, `attribute_group_id`, `attribute_id`, `sort_order`) VALUES (70, 4, 4, 7, 70, 20); +INSERT INTO `eav_entity_attribute` (`entity_attribute_id`, `entity_type_id`, `attribute_set_id`, `attribute_group_id`, `attribute_id`, `sort_order`) VALUES (113, 4, 4, 7, 115, 3); CREATE TABLE `customer_eav_attribute` ( `attribute_id` SMALLINT(5) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'Attribute Id', diff --git a/tests/integration/resource/ee.eav/dest.sql b/tests/integration/resource/ee.eav/dest.sql index fa1ea27f6..61e4d8844 100644 --- a/tests/integration/resource/ee.eav/dest.sql +++ b/tests/integration/resource/ee.eav/dest.sql @@ -60,6 +60,7 @@ ENGINE=InnoDB ; INSERT INTO `eav_attribute` (`attribute_id`, `entity_type_id`, `attribute_code`, `attribute_model`, `backend_model`, `backend_type`, `backend_table`, `frontend_model`, `frontend_input`, `frontend_label`, `frontend_class`, `source_model`, `is_required`, `is_user_defined`, `default_value`, `is_unique`, `note`) VALUES (70, 4, 'sku', NULL, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\Sku', 'static', NULL, NULL, 'text', 'SKU', 'validate-length maximum-length-64', NULL, 1, 0, NULL, 1, NULL); INSERT INTO `eav_attribute` (`attribute_id`, `entity_type_id`, `attribute_code`, `attribute_model`, `backend_model`, `backend_type`, `backend_table`, `frontend_model`, `frontend_input`, `frontend_label`, `frontend_class`, `source_model`, `is_required`, `is_user_defined`, `default_value`, `is_unique`, `note`) VALUES (1, 1, 'website_id', NULL, 'Magento\\Customer\\Model\\Customer\\Attribute\\Backend\\Website', 'static', NULL, NULL, 'select', 'Associate to Website', NULL, 'Magento\\Customer\\Model\\Customer\\Attribute\\Source\\Website', 1, 0, NULL, 0, NULL); +INSERT INTO `eav_attribute` (`attribute_id`, `entity_type_id`, `attribute_code`, `attribute_model`, `backend_model`, `backend_type`, `backend_table`, `frontend_model`, `frontend_input`, `frontend_label`, `frontend_class`, `source_model`, `is_required`, `is_user_defined`, `default_value`, `is_unique`, `note`) VALUES (115, 4, 'quantity_and_stock_status', NULL, 'Magento\\Catalog\\Model\\Product\\Attribute\\Backend\\Stock', 'int', NULL, NULL, 'select', 'Quantity', NULL, 'Magento\\CatalogInventory\\Model\\Source\\Stock', 0, 0, '1', 0, NULL); DROP TABLE IF EXISTS `catalog_eav_attribute`; CREATE TABLE `catalog_eav_attribute` ( @@ -153,6 +154,7 @@ CREATE TABLE `eav_entity_attribute` ( ENGINE=InnoDB ; INSERT INTO `eav_entity_attribute` (`entity_attribute_id`, `entity_type_id`, `attribute_set_id`, `attribute_group_id`, `attribute_id`, `sort_order`) VALUES (70, 4, 4, 7, 70, 20); +INSERT INTO `eav_entity_attribute` (`entity_attribute_id`, `entity_type_id`, `attribute_set_id`, `attribute_group_id`, `attribute_id`, `sort_order`) VALUES (113, 4, 4, 7, 115, 3); CREATE TABLE `customer_eav_attribute` ( `attribute_id` SMALLINT(5) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'Attribute Id', diff --git a/tests/unit/testsuite/Migration/App/ProgressTest.php b/tests/unit/testsuite/Migration/App/ProgressTest.php index 97c007271..e73fcbd8f 100644 --- a/tests/unit/testsuite/Migration/App/ProgressTest.php +++ b/tests/unit/testsuite/Migration/App/ProgressTest.php @@ -163,10 +163,16 @@ public function testSaveDataNoFile() } /** + * @param array $data + * @param string $step + * @param string $stage + * @param array $processed + * @param array $saveData + * * @return void * @dataProvider saveProcessedEntitiesDataProvider */ - public function testSaveProcessedEntities($data, $step, $stage, $processed, $saveData) + public function testSaveProcessedEntities(array $data, $step, $stage, array $processed, array $saveData) { $this->file->expects($this->once())->method('getData')->willReturn($data); $this->file->expects($this->once())->method('saveData')->with($saveData); From e2b55d8056f5c58fb924c40b8a88c3fca8477121 Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Thu, 7 Jul 2016 18:49:04 +0300 Subject: [PATCH 71/71] MAGETWO-48593: Adapt Data Migration Tool to Magento 2.1 MLS12 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 016836840..20255abb6 100644 --- a/README.md +++ b/README.md @@ -100,4 +100,4 @@ To update `composer.json`: 9. Wait while dependencies are installed. ## For more details -See the Migration User Guide. +See the Migration User Guide.