Skip to content

Commit f1fb6fb

Browse files
author
Stanislav Idolov
committed
MAGETWO-56743: Unable to upgrade with split databases
1 parent 8f21503 commit f1fb6fb

File tree

5 files changed

+12
-5
lines changed

5 files changed

+12
-5
lines changed

app/code/Magento/OfflineShipping/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
"magento/module-backend": "100.2.*",
99
"magento/module-shipping": "100.2.*",
1010
"magento/module-catalog": "101.1.*",
11-
"magento/module-sales": "100.2.*",
1211
"magento/module-sales-rule": "100.2.*",
1312
"magento/module-directory": "100.2.*",
1413
"magento/module-quote": "100.2.*",
1514
"magento/framework": "100.2.*"
1615
},
1716
"suggest": {
1817
"magento/module-checkout": "100.2.*",
18+
"magento/module-sales": "100.2.*",
1919
"magento/module-offline-shipping-sample-data": "Sample Data version:100.2.*"
2020
},
2121
"type": "magento2-module",

app/code/Magento/Sales/Setup/SalesSetup.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
/**
1616
* Setup Model of Sales Module
1717
* @codeCoverageIgnore
18+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1819
*/
1920
class SalesSetup extends \Magento\Eav\Setup\EavSetup
2021
{

app/code/Magento/Sales/Setup/UpgradeSchema.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* See COPYING.txt for license details.
55
*/
66
namespace Magento\Sales\Setup;
7+
78
use Magento\Framework\Setup\UpgradeSchemaInterface;
89
use Magento\Framework\Setup\ModuleContextInterface;
910
use Magento\Framework\Setup\SchemaSetupInterface;
@@ -35,7 +36,8 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
3536
'product_id',
3637
'catalog_product_entity',
3738
'entity_id',
38-
self::$connectionName)
39+
self::$connectionName
40+
)
3941
);
4042
//sales_bestsellers_aggregated_monthly
4143
$connection->dropForeignKey(
@@ -45,7 +47,8 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
4547
'product_id',
4648
'catalog_product_entity',
4749
'entity_id',
48-
self::$connectionName)
50+
self::$connectionName
51+
)
4952
);
5053

5154
//sales_bestsellers_aggregated_yearly
@@ -56,7 +59,8 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
5659
'product_id',
5760
'catalog_product_entity',
5861
'entity_id',
59-
self::$connectionName)
62+
self::$connectionName
63+
)
6064
);
6165

6266
$installer->endSetup();

app/code/Magento/SalesSequence/Setup/InstallSchema.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
100100
'sales_sequence_profile',
101101
'meta_id',
102102
'sales_sequence_meta',
103-
'meta_id', self::$connectionName
103+
'meta_id',
104+
self::$connectionName
104105
),
105106
'meta_id',
106107
$installer->getTable('sales_sequence_meta', self::$connectionName),

lib/internal/Magento/Framework/Module/Setup.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ private function _getTableCacheName($tableName)
144144
* Check is table exists
145145
*
146146
* @param string $table
147+
* @param string $connectionName
147148
* @return bool
148149
*/
149150
public function tableExists($table, $connectionName = ResourceConnection::DEFAULT_CONNECTION)

0 commit comments

Comments
 (0)