Skip to content

Commit cb3914b

Browse files
author
Michael Logvin
committed
MAGETWO-36214: Reorder install logic
1 parent 0b3caf5 commit cb3914b

File tree

5 files changed

+56
-47
lines changed

5 files changed

+56
-47
lines changed

‎app/code/Magento/Catalog/Setup/UpgradeSchema.php‎

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,32 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
3131
'FK_CAT_PRD_ENTT_ENTT_TYPE_ID_EAV_ENTT_TYPE_ENTT_TYPE_ID'
3232
);
3333

34-
//Drop entity_type_id column for catalog product entities
35-
// $connection->dropColumn($installer->getTable('catalog_product_entity'), 'entity_type_id');
36-
// $connection->dropColumn($installer->getTable('catalog_product_entity_datetime'), 'entity_type_id');
37-
// $connection->dropColumn($installer->getTable('catalog_product_entity_decimal'), 'entity_type_id');
38-
// $connection->dropColumn($installer->getTable('catalog_product_entity_gallery'), 'entity_type_id');
39-
// $connection->dropColumn($installer->getTable('catalog_product_entity_int'), 'entity_type_id');
40-
// $connection->dropColumn($installer->getTable('catalog_product_entity_text'), 'entity_type_id');
41-
// $connection->dropColumn($installer->getTable('catalog_product_entity_varchar'), 'entity_type_id');
42-
43-
//Drop entity_type_id column for catalog category entities
44-
// $connection->dropColumn($installer->getTable('catalog_category_entity'), 'entity_type_id');
45-
// $connection->dropColumn($installer->getTable('catalog_category_entity_datetime'), 'entity_type_id');
46-
// $connection->dropColumn($installer->getTable('catalog_category_entity_decimal'), 'entity_type_id');
47-
// $connection->dropColumn($installer->getTable('catalog_category_entity_int'), 'entity_type_id');
48-
// $connection->dropColumn($installer->getTable('catalog_category_entity_text'), 'entity_type_id');
49-
// $connection->dropColumn($installer->getTable('catalog_category_entity_varchar'), 'entity_type_id');
34+
$dropTablesColumn = [
35+
'catalog_product_entity',
36+
'catalog_product_entity_datetime',
37+
'catalog_product_entity_decimal',
38+
'catalog_product_entity_gallery',
39+
'catalog_product_entity_int',
40+
'catalog_product_entity_text',
41+
'catalog_product_entity_varchar',
42+
'catalog_category_entity',
43+
'catalog_category_entity_datetime',
44+
'catalog_category_entity_decimal',
45+
'catalog_category_entity_int',
46+
'catalog_category_entity_text',
47+
'catalog_category_entity_varchar'
48+
];
49+
foreach ($dropTablesColumn as $table) {
50+
$connection->dropIndex(
51+
$table,
52+
$installer->getIdxName(
53+
$table,
54+
'entity_type_id',
55+
\Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_INDEX
56+
)
57+
);
58+
$connection->dropColumn($installer->getTable($table), 'entity_type_id');
59+
}
5060

5161
$installer->endSetup();
5262
}

‎app/code/Magento/Customer/Setup/UpgradeSchema.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,21 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
4646
$installer->getIdxName(
4747
$installer->getTable($table),
4848
['entity_type_id'],
49-
\Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
49+
\Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_INDEX
5050
)
5151
);
52-
// $connection->dropColumn($installer->getTable($table), 'entity_type_id');
52+
$connection->dropColumn($installer->getTable($table), 'entity_type_id');
5353
}
5454

55-
// $connection->dropColumn($installer->getTable('customer_address_entity'), 'entity_type_id');
56-
// $connection->dropColumn($installer->getTable('customer_address_entity'), 'attribute_set_id');
57-
//
58-
// $connection->dropIndex(
59-
// $installer->getTable('customer_entity'),
60-
// $installer->getIdxName('customer_entity', ['entity_type_id'])
61-
// );
62-
// $connection->dropColumn($installer->getTable('customer_entity'), 'entity_type_id');
63-
// $connection->dropColumn($installer->getTable('customer_entity'), 'attribute_set_id');
55+
$connection->dropColumn($installer->getTable('customer_address_entity'), 'entity_type_id');
56+
$connection->dropColumn($installer->getTable('customer_address_entity'), 'attribute_set_id');
57+
58+
$connection->dropIndex(
59+
$installer->getTable('customer_entity'),
60+
$installer->getIdxName('customer_entity', ['entity_type_id'])
61+
);
62+
$connection->dropColumn($installer->getTable('customer_entity'), 'entity_type_id');
63+
$connection->dropColumn($installer->getTable('customer_entity'), 'attribute_set_id');
6464
}
6565

6666
if (version_compare($context->getVersion(), '2.0.0.2') < 0) {

‎app/code/Magento/Quote/Setup/InstallSchema.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
390390
)->addColumn(
391391
'address_type',
392392
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
393-
255,
393+
10,
394394
[],
395395
'Address Type'
396396
)->addColumn(
@@ -408,19 +408,19 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
408408
)->addColumn(
409409
'firstname',
410410
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
411-
255,
411+
20,
412412
[],
413413
'Firstname'
414414
)->addColumn(
415415
'middlename',
416416
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
417-
40,
417+
20,
418418
[],
419419
'Middlename'
420420
)->addColumn(
421421
'lastname',
422422
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
423-
255,
423+
20,
424424
[],
425425
'Lastname'
426426
)->addColumn(
@@ -438,19 +438,19 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
438438
)->addColumn(
439439
'street',
440440
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
441-
255,
441+
40,
442442
[],
443443
'Street'
444444
)->addColumn(
445445
'city',
446446
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
447-
255,
447+
40,
448448
[],
449449
'City'
450450
)->addColumn(
451451
'region',
452452
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
453-
255,
453+
40,
454454
[],
455455
'Region'
456456
)->addColumn(
@@ -462,25 +462,25 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
462462
)->addColumn(
463463
'postcode',
464464
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
465-
255,
465+
20,
466466
[],
467467
'Postcode'
468468
)->addColumn(
469469
'country_id',
470470
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
471-
255,
471+
30,
472472
[],
473473
'Country Id'
474474
)->addColumn(
475475
'telephone',
476476
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
477-
255,
477+
20,
478478
[],
479479
'Phone Number'
480480
)->addColumn(
481481
'fax',
482482
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
483-
255,
483+
20,
484484
[],
485485
'Fax'
486486
)->addColumn(
@@ -498,7 +498,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
498498
)->addColumn(
499499
'shipping_method',
500500
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
501-
255,
501+
40,
502502
[],
503503
'Shipping Method'
504504
)->addColumn(

‎app/code/Magento/SalesRule/Setup/InstallSchema.php‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -731,13 +731,12 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
731731
$installer->getTable('salesrule'),
732732
'rule_id',
733733
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
734-
// )->addForeignKey(
735-
// $installer->getFkName('salesrule_website', 'website_id', 'core/website', 'website_id'),
736-
// 'website_id',
737-
// $websitesTable,
738-
// 'website_id',
739-
// \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
740-
// \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
734+
)->addForeignKey(
735+
$installer->getFkName('salesrule_website', 'website_id', 'store_website', 'website_id'),
736+
'website_id',
737+
$websitesTable,
738+
'website_id',
739+
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
741740
)->setComment(
742741
'Sales Rules To Websites Relations'
743742
);

‎lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1085,7 +1085,7 @@ public function getForeignKeys($tableName, $schemaName = null)
10851085
$createSql = $this->getCreateTable($tableName, $schemaName);
10861086

10871087
// collect CONSTRAINT
1088-
$regExp = '#,\s+CONSTRAINT `([^`]*)` FOREIGN KEY \(`([^`]*)`\) '
1088+
$regExp = '#,\s+CONSTRAINT `([^`]*)` FOREIGN KEY ?\(`([^`]*)`\) '
10891089
. 'REFERENCES (`([^`]*)`\.)?`([^`]*)` \(`([^`]*)`\)'
10901090
. '( ON DELETE (RESTRICT|CASCADE|SET NULL|NO ACTION))?'
10911091
. '( ON UPDATE (RESTRICT|CASCADE|SET NULL|NO ACTION))?#';

0 commit comments

Comments
 (0)