MAGETWO-62610: Data upgrade fails on multi-database setup
Merging, resolved conflicts: app/code/Magento/Quote/Setup/UpgradeData.php app/code/Magento/Sales/Setup/UpgradeData.php
Showing
- app/code/Magento/Quote/Setup/ConvertSerializedDataToJson.php 140 additions, 0 deletionsapp/code/Magento/Quote/Setup/ConvertSerializedDataToJson.php
- app/code/Magento/Quote/Setup/QuoteSetup.php 29 additions, 8 deletionsapp/code/Magento/Quote/Setup/QuoteSetup.php
- app/code/Magento/Quote/Setup/UpgradeData.php 13 additions, 108 deletionsapp/code/Magento/Quote/Setup/UpgradeData.php
- app/code/Magento/Sales/Setup/ConvertSerializedDataToJson.php 87 additions, 0 deletionsapp/code/Magento/Sales/Setup/ConvertSerializedDataToJson.php
- app/code/Magento/Sales/Setup/SalesSetup.php 37 additions, 12 deletionsapp/code/Magento/Sales/Setup/SalesSetup.php
- app/code/Magento/Sales/Setup/UpgradeData.php 9 additions, 54 deletionsapp/code/Magento/Sales/Setup/UpgradeData.php
- app/etc/di.xml 7 additions, 0 deletionsapp/etc/di.xml
- lib/internal/Magento/Framework/DB/Select/InQueryModifier.php 1 addition, 1 deletionlib/internal/Magento/Framework/DB/Select/InQueryModifier.php
- lib/internal/Magento/Framework/DB/Select/QueryModifierFactory.php 22 additions, 4 deletions...rnal/Magento/Framework/DB/Select/QueryModifierFactory.php
- lib/internal/Magento/Framework/DB/Test/Unit/Select/QueryModifierFactoryTest.php 106 additions, 0 deletions...ramework/DB/Test/Unit/Select/QueryModifierFactoryTest.php
Please register or sign in to comment