Skip to content

Commit 40ce12d

Browse files
slavvkaslavvka
committed
Merge remote-tracking branch 'mainline/2.3-develop' into DEVOPS-2632-2.3
2 parents caf42c9 + 1a06f4a commit 40ce12d

File tree

68 files changed

+1172
-161
lines changed

Some content is hidden

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

68 files changed

+1172
-161
lines changed

‎app/code/Magento/Catalog/etc/db_schema.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1809,7 +1809,7 @@
18091809
<constraint xsi:type="foreign" name="CAT_PRD_FRONTEND_ACTION_CSTR_ID_CSTR_ENTT_ENTT_ID"
18101810
table="catalog_product_frontend_action" column="customer_id" referenceTable="customer_entity"
18111811
referenceColumn="entity_id" onDelete="CASCADE"/>
1812-
<constraint xsi:type="foreign" name="PRODUCT_FRONTEND_ACTION_PRODUCT_ID"
1812+
<constraint xsi:type="foreign" name="CAT_PRD_FRONTEND_ACTION_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
18131813
table="catalog_product_frontend_action" column="product_id" referenceTable="catalog_product_entity"
18141814
referenceColumn="entity_id" onDelete="CASCADE" />
18151815
<constraint xsi:type="unique" name="CATALOG_PRODUCT_FRONTEND_ACTION_VISITOR_ID_PRODUCT_ID_TYPE_ID">

‎app/code/Magento/Catalog/etc/db_schema_whitelist.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,8 @@
10961096
"index": {
10971097
"CAT_CTGR_PRD_IDX_REPLICA_PRD_ID_STORE_ID_CTGR_ID_VISIBILITY": true,
10981098
"IDX_87EB2E3059853CF89A75B4C55074810B": true,
1099-
"CAT_CTGR_PRD_IDX_PRD_ID_STORE_ID_CTGR_ID_VISIBILITY": true
1099+
"CAT_CTGR_PRD_IDX_PRD_ID_STORE_ID_CTGR_ID_VISIBILITY": true,
1100+
"CAT_CTGR_PRD_IDX_STORE_ID_CTGR_ID_VISIBILITY_IS_PARENT_POSITION": true
11001101
},
11011102
"constraint": {
11021103
"PRIMARY": true
@@ -1114,8 +1115,9 @@
11141115
"constraint": {
11151116
"PRIMARY": true,
11161117
"CAT_PRD_FRONTEND_ACTION_CSTR_ID_CSTR_ENTT_ENTT_ID": true,
1118+
"CAT_PRD_FRONTEND_ACTION_PRD_ID_CAT_PRD_ENTT_ENTT_ID": true,
11171119
"CATALOG_PRODUCT_FRONTEND_ACTION_VISITOR_ID_PRODUCT_ID_TYPE_ID": true,
11181120
"CATALOG_PRODUCT_FRONTEND_ACTION_CUSTOMER_ID_PRODUCT_ID_TYPE_ID": true
11191121
}
11201122
}
1121-
}
1123+
}

‎app/code/Magento/CatalogRule/etc/db_schema.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<constraint xsi:type="primary" name="PRIMARY">
6161
<column name="rule_product_id"/>
6262
</constraint>
63-
<constraint xsi:type="unique" name="IDX_EAA51B56FF092A0DCB795D1CEF812B7B">
63+
<constraint xsi:type="unique" name="UNQ_EAA51B56FF092A0DCB795D1CEF812B7B">
6464
<column name="rule_id"/>
6565
<column name="from_time"/>
6666
<column name="to_time"/>
@@ -198,7 +198,7 @@
198198
<constraint xsi:type="primary" name="PRIMARY">
199199
<column name="rule_product_id"/>
200200
</constraint>
201-
<constraint xsi:type="unique" name="IDX_EAA51B56FF092A0DCB795D1CEF812B7B">
201+
<constraint xsi:type="unique" name="UNQ_EAA51B56FF092A0DCB795D1CEF812B7B">
202202
<column name="rule_id"/>
203203
<column name="from_time"/>
204204
<column name="to_time"/>

‎app/code/Magento/CatalogRule/etc/db_schema_whitelist.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@
4949
},
5050
"constraint": {
5151
"PRIMARY": true,
52-
"IDX_EAA51B56FF092A0DCB795D1CEF812B7B": true
52+
"IDX_EAA51B56FF092A0DCB795D1CEF812B7B": true,
53+
"UNQ_EAA51B56FF092A0DCB795D1CEF812B7B": true
5354
}
5455
},
5556
"catalogrule_product_price": {
@@ -146,7 +147,8 @@
146147
},
147148
"constraint": {
148149
"PRIMARY": true,
149-
"UNQ_BDF2B92A4F0B28D7896648B3B8A26089": true
150+
"IDX_EAA51B56FF092A0DCB795D1CEF812B7B": true,
151+
"UNQ_EAA51B56FF092A0DCB795D1CEF812B7B": true
150152
}
151153
},
152154
"catalogrule_product_price_replica": {
@@ -190,4 +192,4 @@
190192
"PRIMARY": true
191193
}
192194
}
193-
}
195+
}

‎app/code/Magento/Developer/Console/Command/TablesWhitelistGenerateCommand.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@
2222
*/
2323
class TablesWhitelistGenerateCommand extends Command
2424
{
25-
/**
26-
* Whitelist file name.
27-
*/
28-
const GENERATED_FILE_NAME = 'db_schema_whitelist.json';
29-
3025
/**
3126
* Module name key, that will be used in whitelist generate command.
3227
*/

‎app/code/Magento/Eav/etc/db_schema.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@
377377
<column name="attribute_set_id"/>
378378
<column name="attribute_group_name"/>
379379
</constraint>
380-
<constraint xsi:type="unique" name="CATALOG_CATEGORY_PRODUCT_ATTRIBUTE_SET_ID_ATTRIBUTE_GROUP_CODE">
380+
<constraint xsi:type="unique" name="EAV_ATTRIBUTE_GROUP_ATTRIBUTE_SET_ID_ATTRIBUTE_GROUP_CODE">
381381
<column name="attribute_set_id"/>
382382
<column name="attribute_group_code"/>
383383
</constraint>

‎app/code/Magento/Eav/etc/db_schema_whitelist.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@
234234
"PRIMARY": true,
235235
"EAV_ATTR_GROUP_ATTR_SET_ID_EAV_ATTR_SET_ATTR_SET_ID": true,
236236
"EAV_ATTRIBUTE_GROUP_ATTRIBUTE_SET_ID_ATTRIBUTE_GROUP_NAME": true,
237+
"EAV_ATTRIBUTE_GROUP_ATTRIBUTE_SET_ID_ATTRIBUTE_GROUP_CODE": true,
237238
"CATALOG_CATEGORY_PRODUCT_ATTRIBUTE_SET_ID_ATTRIBUTE_GROUP_CODE": true
238239
}
239240
},
@@ -386,4 +387,4 @@
386387
"EAV_FORM_ELEMENT_TYPE_ID_ATTRIBUTE_ID": true
387388
}
388389
}
389-
}
390+
}

‎app/code/Magento/MysqlMq/etc/db_schema.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444
<constraint xsi:type="primary" name="PRIMARY">
4545
<column name="id"/>
4646
</constraint>
47-
<constraint xsi:type="foreign" name="QUEUE_MESSAGE_ID_QUEUE_MESSAGE_STATUS_MESSAGE_ID"
47+
<constraint xsi:type="foreign" name="QUEUE_MESSAGE_STATUS_MESSAGE_ID_QUEUE_MESSAGE_ID"
4848
table="queue_message_status" column="message_id" referenceTable="queue_message" referenceColumn="id"
4949
onDelete="CASCADE"/>
50-
<constraint xsi:type="foreign" name="QUEUE_ID_QUEUE_MESSAGE_STATUS_QUEUE_ID" table="queue_message_status"
50+
<constraint xsi:type="foreign" name="QUEUE_MESSAGE_STATUS_QUEUE_ID_QUEUE_ID" table="queue_message_status"
5151
column="queue_id" referenceTable="queue" referenceColumn="id" onDelete="CASCADE"/>
5252
<constraint xsi:type="unique" name="QUEUE_MESSAGE_STATUS_QUEUE_ID_MESSAGE_ID">
5353
<column name="queue_id"/>

‎app/code/Magento/MysqlMq/etc/db_schema_whitelist.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,11 @@
3333
},
3434
"constraint": {
3535
"PRIMARY": true,
36+
"QUEUE_MESSAGE_STATUS_MESSAGE_ID_QUEUE_MESSAGE_ID": true,
3637
"QUEUE_MESSAGE_ID_QUEUE_MESSAGE_STATUS_MESSAGE_ID": true,
38+
"QUEUE_MESSAGE_STATUS_QUEUE_ID_QUEUE_ID": true,
3739
"QUEUE_ID_QUEUE_MESSAGE_STATUS_QUEUE_ID": true,
3840
"QUEUE_MESSAGE_STATUS_QUEUE_ID_MESSAGE_ID": true
3941
}
4042
}
41-
}
43+
}

‎app/code/Magento/Newsletter/etc/db_schema_whitelist.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
},
1212
"index": {
1313
"NEWSLETTER_SUBSCRIBER_CUSTOMER_ID": true,
14-
"NEWSLETTER_SUBSCRIBER_STORE_ID": true
14+
"NEWSLETTER_SUBSCRIBER_STORE_ID": true,
15+
"NEWSLETTER_SUBSCRIBER_SUBSCRIBER_EMAIL": true
1516
},
1617
"constraint": {
1718
"PRIMARY": true,
@@ -112,4 +113,4 @@
112113
"NLTTR_PROBLEM_SUBSCRIBER_ID_NLTTR_SUBSCRIBER_SUBSCRIBER_ID": true
113114
}
114115
}
115-
}
116+
}

0 commit comments

Comments
 (0)