Skip to content

Commit f67d174

Browse files
author
Olga Kopylova
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-35131-move-cache-invalidate
2 parents 7aebadf + 0247336 commit f67d174

File tree

86 files changed

+1865
-1347
lines changed

Some content is hidden

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

86 files changed

+1865
-1347
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
138138
'role_id',
139139
$installer->getTable('authorization_role'),
140140
'role_id',
141-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
142141
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
143142
)->setComment(
144143
'Admin Rule Table'

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
7979
'parent_id',
8080
$installer->getTable('catalog_product_entity'),
8181
'entity_id',
82-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
8382
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
8483
)
8584
->setComment('Catalog Product Bundle Option');
@@ -138,7 +137,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
138137
'option_id',
139138
$installer->getTable('catalog_product_bundle_option'),
140139
'option_id',
141-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
142140
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
143141
)
144142
->setComment('Catalog Product Bundle Option Value');
@@ -238,7 +236,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
238236
'option_id',
239237
$installer->getTable('catalog_product_bundle_option'),
240238
'option_id',
241-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
242239
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
243240
)
244241
->addForeignKey(
@@ -251,7 +248,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
251248
'product_id',
252249
$installer->getTable('catalog_product_entity'),
253250
'entity_id',
254-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
255251
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
256252
)
257253
->setComment('Catalog Product Bundle Selection');
@@ -305,7 +301,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
305301
'website_id',
306302
$installer->getTable('store_website'),
307303
'website_id',
308-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
309304
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
310305
)
311306
->addForeignKey(
@@ -318,7 +313,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
318313
'selection_id',
319314
$installer->getTable('catalog_product_bundle_selection'),
320315
'selection_id',
321-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
322316
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
323317
)
324318
->setComment('Catalog Product Bundle Selection Price');
@@ -383,7 +377,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
383377
'customer_group_id',
384378
$installer->getTable('customer_group'),
385379
'customer_group_id',
386-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
387380
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
388381
)
389382
->addForeignKey(
@@ -396,7 +389,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
396389
'entity_id',
397390
$installer->getTable('catalog_product_entity'),
398391
'entity_id',
399-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
400392
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
401393
)
402394
->addForeignKey(
@@ -409,7 +401,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
409401
'website_id',
410402
$installer->getTable('store_website'),
411403
'website_id',
412-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
413404
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
414405
)
415406
->setComment('Catalog Product Bundle Price Index');

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

Lines changed: 1 addition & 86 deletions
Large diffs are not rendered by default.

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,15 +283,13 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
283283
'product_id',
284284
$installer->getTable('catalog_product_entity'),
285285
'entity_id',
286-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
287286
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
288287
)
289288
->addForeignKey(
290289
$installer->getFkName('cataloginventory_stock_item', 'stock_id', 'cataloginventory_stock', 'stock_id'),
291290
'stock_id',
292291
$installer->getTable('cataloginventory_stock'),
293292
'stock_id',
294-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
295293
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
296294
)
297295
->setComment('Cataloginventory Stock Item');

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -418,23 +418,20 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
418418
'customer_group_id',
419419
$installer->getTable('customer_group'),
420420
'customer_group_id',
421-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
422421
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
423422
)
424423
->addForeignKey(
425424
$installer->getFkName('catalogrule_group_website', 'rule_id', 'catalogrule', 'rule_id'),
426425
'rule_id',
427426
$installer->getTable('catalogrule'),
428427
'rule_id',
429-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
430428
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
431429
)
432430
->addForeignKey(
433431
$installer->getFkName('catalogrule_group_website', 'website_id', 'store_website', 'website_id'),
434432
'website_id',
435433
$installer->getTable('store_website'),
436434
'website_id',
437-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
438435
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
439436
)
440437
->setComment('CatalogRule Group Website');
@@ -469,15 +466,13 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
469466
'rule_id',
470467
$installer->getTable('catalogrule'),
471468
'rule_id',
472-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
473469
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
474470
)
475471
->addForeignKey(
476472
$installer->getFkName('catalogrule_website', 'website_id', 'store_website', 'website_id'),
477473
'website_id',
478474
$installer->getTable('store_website'),
479475
'website_id',
480-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
481476
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
482477
)
483478
->setComment('Catalog Rules To Websites Relations');
@@ -512,7 +507,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
512507
'rule_id',
513508
$installer->getTable('catalogrule'),
514509
'rule_id',
515-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
516510
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
517511
)
518512
->addForeignKey(
@@ -525,7 +519,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
525519
'customer_group_id',
526520
$installer->getTable('customer_group'),
527521
'customer_group_id',
528-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
529522
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
530523
)
531524
->setComment('Catalog Rules To Customer Groups Relations');

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,23 +57,20 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
5757
'product_id',
5858
$installer->getTable('catalog_product_entity'),
5959
'entity_id',
60-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
6160
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
6261
)
6362
->addForeignKey(
6463
$installer->getFkName($tableName, 'category_id', 'catalog_category_entity', 'entity_id'),
6564
'category_id',
6665
$installer->getTable('catalog_category_entity'),
6766
'entity_id',
68-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
6967
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
7068
)
7169
->addForeignKey(
7270
$installer->getFkName($tableName, 'url_rewrite_id', 'url_rewrite', 'url_rewrite_id'),
7371
'url_rewrite_id',
7472
$installer->getTable('url_rewrite'),
7573
'url_rewrite_id',
76-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
7774
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
7875
)
7976
->setComment('url_rewrite_relation');

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,12 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
9797
'agreement_id',
9898
$installer->getTable('checkout_agreement'),
9999
'agreement_id',
100-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
101100
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
102101
)->addForeignKey(
103102
$installer->getFkName('checkout_agreement_store', 'store_id', 'store', 'store_id'),
104103
'store_id',
105104
$installer->getTable('store'),
106105
'store_id',
107-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
108106
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
109107
)->setComment(
110108
'Checkout Agreement Store'

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,12 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
102102
'block_id',
103103
$installer->getTable('cms_block'),
104104
'block_id',
105-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
106105
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
107106
)->addForeignKey(
108107
$installer->getFkName('cms_block_store', 'store_id', 'store', 'store_id'),
109108
'store_id',
110109
$installer->getTable('store'),
111110
'store_id',
112-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
113111
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
114112
)->setComment(
115113
'CMS Block To Store Linkage Table'
@@ -262,14 +260,12 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
262260
'page_id',
263261
$installer->getTable('cms_page'),
264262
'page_id',
265-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
266263
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
267264
)->addForeignKey(
268265
$installer->getFkName('cms_page_store', 'store_id', 'store', 'store_id'),
269266
'store_id',
270267
$installer->getTable('store'),
271268
'store_id',
272-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
273269
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
274270
)->setComment(
275271
'CMS Page To Store Linkage Table'

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
7777
'product_id',
7878
$installer->getTable('catalog_product_entity'),
7979
'entity_id',
80-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
81-
\Magento\Framework\DB\Ddl\Table::ACTION_NO_ACTION
80+
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
8281
)
8382
->setComment('Catalog Product Super Attribute Table');
8483

@@ -147,15 +146,13 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
147146
'product_super_attribute_id',
148147
$installer->getTable('catalog_product_super_attribute'),
149148
'product_super_attribute_id',
150-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
151149
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
152150
)
153151
->addForeignKey(
154152
$installer->getFkName('catalog_product_super_attribute_label', 'store_id', 'store', 'store_id'),
155153
'store_id',
156154
$installer->getTable('store'),
157155
'store_id',
158-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
159156
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
160157
)
161158
->setComment('Catalog Product Super Attribute Label Table');
@@ -231,7 +228,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
231228
'website_id',
232229
$installer->getTable('store_website'),
233230
'website_id',
234-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
235231
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
236232
)
237233
->addForeignKey(
@@ -244,7 +240,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
244240
'product_super_attribute_id',
245241
$installer->getTable('catalog_product_super_attribute'),
246242
'product_super_attribute_id',
247-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
248243
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
249244
)
250245
->setComment('Catalog Product Super Attribute Pricing Table');
@@ -300,15 +295,13 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
300295
'product_id',
301296
$installer->getTable('catalog_product_entity'),
302297
'entity_id',
303-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
304298
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
305299
)
306300
->addForeignKey(
307301
$installer->getFkName('catalog_product_super_link', 'parent_id', 'catalog_product_entity', 'entity_id'),
308302
'parent_id',
309303
$installer->getTable('catalog_product_entity'),
310304
'entity_id',
311-
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
312305
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
313306
)
314307
->setComment('Catalog Product Super Link Table');

0 commit comments

Comments
 (0)