Skip to content

Commit ae788d7

Browse files
serhii-balkoserhii-balko
committed
Merge branch '2.3-develop' into 2.3-develop-pr10
2 parents cca538d + 2e036c4 commit ae788d7

File tree

484 files changed

+10591
-5885
lines changed

Some content is hidden

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

484 files changed

+10591
-5885
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@
2121
default="0" comment="Flag if notification read"/>
2222
<column xsi:type="smallint" name="is_remove" padding="5" unsigned="true" nullable="false" identity="false"
2323
default="0" comment="Flag if notification might be removed"/>
24-
<constraint xsi:type="primary" name="PRIMARY">
24+
<constraint xsi:type="primary" referenceId="PRIMARY">
2525
<column name="notification_id"/>
2626
</constraint>
27-
<index name="ADMINNOTIFICATION_INBOX_SEVERITY" indexType="btree">
27+
<index referenceId="ADMINNOTIFICATION_INBOX_SEVERITY" indexType="btree">
2828
<column name="severity"/>
2929
</index>
30-
<index name="ADMINNOTIFICATION_INBOX_IS_READ" indexType="btree">
30+
<index referenceId="ADMINNOTIFICATION_INBOX_IS_READ" indexType="btree">
3131
<column name="is_read"/>
3232
</index>
33-
<index name="ADMINNOTIFICATION_INBOX_IS_REMOVE" indexType="btree">
33+
<index referenceId="ADMINNOTIFICATION_INBOX_IS_REMOVE" indexType="btree">
3434
<column name="is_remove"/>
3535
</index>
3636
</table>
@@ -40,7 +40,7 @@
4040
default="0" comment="Problem type"/>
4141
<column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
4242
comment="Create date"/>
43-
<constraint xsi:type="primary" name="PRIMARY">
43+
<constraint xsi:type="primary" referenceId="PRIMARY">
4444
<column name="identity"/>
4545
</constraint>
4646
</table>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
default="0" comment="Query Id"/>
1515
<column xsi:type="int" name="relation_id" padding="10" unsigned="true" nullable="false" identity="false"
1616
default="0" comment="Relation Id"/>
17-
<constraint xsi:type="primary" name="PRIMARY">
17+
<constraint xsi:type="primary" referenceId="PRIMARY">
1818
<column name="id"/>
1919
</constraint>
20-
<constraint xsi:type="foreign" name="CATALOGSEARCH_RECOMMENDATIONS_QUERY_ID_SEARCH_QUERY_QUERY_ID"
20+
<constraint xsi:type="foreign" referenceId="CATALOGSEARCH_RECOMMENDATIONS_QUERY_ID_SEARCH_QUERY_QUERY_ID"
2121
table="catalogsearch_recommendations" column="query_id" referenceTable="search_query"
2222
referenceColumn="query_id" onDelete="CASCADE"/>
23-
<constraint xsi:type="foreign" name="CATALOGSEARCH_RECOMMENDATIONS_RELATION_ID_SEARCH_QUERY_QUERY_ID"
23+
<constraint xsi:type="foreign" referenceId="CATALOGSEARCH_RECOMMENDATIONS_RELATION_ID_SEARCH_QUERY_QUERY_ID"
2424
table="catalogsearch_recommendations" column="relation_id" referenceTable="search_query"
2525
referenceColumn="query_id" onDelete="CASCADE"/>
2626
</table>

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
comment="Total number of operations scheduled within this bulk"/>
2222
<column xsi:type="timestamp" name="start_time" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
2323
comment="Bulk start time"/>
24-
<constraint xsi:type="primary" name="PRIMARY">
24+
<constraint xsi:type="primary" referenceId="PRIMARY">
2525
<column name="id"/>
2626
</constraint>
27-
<constraint xsi:type="unique" name="MAGENTO_BULK_UUID">
27+
<constraint xsi:type="unique" referenceId="MAGENTO_BULK_UUID">
2828
<column name="uuid"/>
2929
</constraint>
30-
<index name="MAGENTO_BULK_USER_ID_ADMIN_USER_USER_ID" indexType="btree">
30+
<index referenceId="MAGENTO_BULK_USER_ID_ADMIN_USER_USER_ID" indexType="btree">
3131
<column name="user_id"/>
3232
</index>
3333
</table>
@@ -47,12 +47,12 @@
4747
comment="Code of the error that appeared during operation execution (used to aggregate related failed operations)"/>
4848
<column xsi:type="varchar" name="result_message" nullable="true" length="255"
4949
comment="Operation result message"/>
50-
<constraint xsi:type="primary" name="PRIMARY">
50+
<constraint xsi:type="primary" referenceId="PRIMARY">
5151
<column name="id"/>
5252
</constraint>
53-
<constraint xsi:type="foreign" name="MAGENTO_OPERATION_BULK_UUID_MAGENTO_BULK_UUID" table="magento_operation"
53+
<constraint xsi:type="foreign" referenceId="MAGENTO_OPERATION_BULK_UUID_MAGENTO_BULK_UUID" table="magento_operation"
5454
column="bulk_uuid" referenceTable="magento_bulk" referenceColumn="uuid" onDelete="CASCADE"/>
55-
<index name="MAGENTO_OPERATION_BULK_UUID_ERROR_CODE" indexType="btree">
55+
<index referenceId="MAGENTO_OPERATION_BULK_UUID_ERROR_CODE" indexType="btree">
5656
<column name="bulk_uuid"/>
5757
<column name="error_code"/>
5858
</index>
@@ -62,13 +62,13 @@
6262
<column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
6363
comment="Internal ID"/>
6464
<column xsi:type="varbinary" name="bulk_uuid" nullable="true" length="39" comment="Related Bulk UUID"/>
65-
<constraint xsi:type="primary" name="PRIMARY">
65+
<constraint xsi:type="primary" referenceId="PRIMARY">
6666
<column name="id"/>
6767
</constraint>
68-
<constraint xsi:type="foreign" name="MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID_MAGENTO_BULK_UUID"
68+
<constraint xsi:type="foreign" referenceId="MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID_MAGENTO_BULK_UUID"
6969
table="magento_acknowledged_bulk" column="bulk_uuid" referenceTable="magento_bulk"
7070
referenceColumn="uuid" onDelete="CASCADE"/>
71-
<constraint xsi:type="unique" name="MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID">
71+
<constraint xsi:type="unique" referenceId="MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID">
7272
<column name="bulk_uuid"/>
7373
</constraint>
7474
</table>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
},
1616
"constraint": {
1717
"PRIMARY": true,
18-
"MAGENTO_BULK_UUID": true
18+
"MAGENTO_BULK_UUID": true,
19+
"MAGENTO_BULK_USER_ID_ADMIN_USER_USER_ID": true
1920
}
2021
},
2122
"magento_operation": {

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
comment="User ID"/>
2222
<column xsi:type="varchar" name="user_type" nullable="true" length="16" comment="User Type"/>
2323
<column xsi:type="varchar" name="role_name" nullable="true" length="50" comment="Role Name"/>
24-
<constraint xsi:type="primary" name="PRIMARY">
24+
<constraint xsi:type="primary" referenceId="PRIMARY">
2525
<column name="role_id"/>
2626
</constraint>
27-
<index name="AUTHORIZATION_ROLE_PARENT_ID_SORT_ORDER" indexType="btree">
27+
<index referenceId="AUTHORIZATION_ROLE_PARENT_ID_SORT_ORDER" indexType="btree">
2828
<column name="parent_id"/>
2929
<column name="sort_order"/>
3030
</index>
31-
<index name="AUTHORIZATION_ROLE_TREE_LEVEL" indexType="btree">
31+
<index referenceId="AUTHORIZATION_ROLE_TREE_LEVEL" indexType="btree">
3232
<column name="tree_level"/>
3333
</index>
3434
</table>
@@ -40,17 +40,17 @@
4040
<column xsi:type="varchar" name="resource_id" nullable="true" length="255" comment="Resource ID"/>
4141
<column xsi:type="varchar" name="privileges" nullable="true" length="20" comment="Privileges"/>
4242
<column xsi:type="varchar" name="permission" nullable="true" length="10" comment="Permission"/>
43-
<constraint xsi:type="primary" name="PRIMARY">
43+
<constraint xsi:type="primary" referenceId="PRIMARY">
4444
<column name="rule_id"/>
4545
</constraint>
46-
<constraint xsi:type="foreign" name="AUTHORIZATION_RULE_ROLE_ID_AUTHORIZATION_ROLE_ROLE_ID"
46+
<constraint xsi:type="foreign" referenceId="AUTHORIZATION_RULE_ROLE_ID_AUTHORIZATION_ROLE_ROLE_ID"
4747
table="authorization_rule" column="role_id" referenceTable="authorization_role"
4848
referenceColumn="role_id" onDelete="CASCADE"/>
49-
<index name="AUTHORIZATION_RULE_RESOURCE_ID_ROLE_ID" indexType="btree">
49+
<index referenceId="AUTHORIZATION_RULE_RESOURCE_ID_ROLE_ID" indexType="btree">
5050
<column name="resource_id"/>
5151
<column name="role_id"/>
5252
</index>
53-
<index name="AUTHORIZATION_RULE_ROLE_ID_RESOURCE_ID" indexType="btree">
53+
<index referenceId="AUTHORIZATION_RULE_ROLE_ID_RESOURCE_ID" indexType="btree">
5454
<column name="role_id"/>
5555
<column name="resource_id"/>
5656
</index>

‎app/code/Magento/Backend/view/adminhtml/web/js/validate-store.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ define([
6767
* 'Confirm' action handler.
6868
*/
6969
confirm: function () {
70+
$('body').trigger('processStart');
7071
dataPost().postData(requestData);
7172
}
7273
}

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

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
<column xsi:type="int" name="position" padding="10" unsigned="true" nullable="false" identity="false"
1919
default="0" comment="Position"/>
2020
<column xsi:type="varchar" name="type" nullable="true" length="255" comment="Type"/>
21-
<constraint xsi:type="primary" name="PRIMARY">
21+
<constraint xsi:type="primary" referenceId="PRIMARY">
2222
<column name="option_id"/>
2323
</constraint>
24-
<constraint xsi:type="foreign" name="CAT_PRD_BNDL_OPT_PARENT_ID_CAT_PRD_ENTT_ENTT_ID"
24+
<constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_OPT_PARENT_ID_CAT_PRD_ENTT_ENTT_ID"
2525
table="catalog_product_bundle_option" column="parent_id" referenceTable="catalog_product_entity"
2626
referenceColumn="entity_id" onDelete="CASCADE"/>
27-
<index name="CATALOG_PRODUCT_BUNDLE_OPTION_PARENT_ID" indexType="btree">
27+
<index referenceId="CATALOG_PRODUCT_BUNDLE_OPTION_PARENT_ID" indexType="btree">
2828
<column name="parent_id"/>
2929
</index>
3030
</table>
@@ -39,13 +39,13 @@
3939
<column xsi:type="varchar" name="title" nullable="true" length="255" comment="Title"/>
4040
<column xsi:type="int" name="parent_product_id" padding="10" unsigned="true" nullable="false" identity="false"
4141
comment="Parent Product Id"/>
42-
<constraint xsi:type="primary" name="PRIMARY">
42+
<constraint xsi:type="primary" referenceId="PRIMARY">
4343
<column name="value_id"/>
4444
</constraint>
45-
<constraint xsi:type="foreign" name="CAT_PRD_BNDL_OPT_VAL_OPT_ID_CAT_PRD_BNDL_OPT_OPT_ID"
45+
<constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_OPT_VAL_OPT_ID_CAT_PRD_BNDL_OPT_OPT_ID"
4646
table="catalog_product_bundle_option_value" column="option_id"
4747
referenceTable="catalog_product_bundle_option" referenceColumn="option_id" onDelete="CASCADE"/>
48-
<constraint xsi:type="unique" name="CAT_PRD_BNDL_OPT_VAL_OPT_ID_PARENT_PRD_ID_STORE_ID">
48+
<constraint xsi:type="unique" referenceId="CAT_PRD_BNDL_OPT_VAL_OPT_ID_PARENT_PRD_ID_STORE_ID">
4949
<column name="option_id"/>
5050
<column name="parent_product_id"/>
5151
<column name="store_id"/>
@@ -73,19 +73,19 @@
7373
comment="Selection Qty"/>
7474
<column xsi:type="smallint" name="selection_can_change_qty" padding="6" unsigned="false" nullable="false"
7575
identity="false" default="0" comment="Selection Can Change Qty"/>
76-
<constraint xsi:type="primary" name="PRIMARY">
76+
<constraint xsi:type="primary" referenceId="PRIMARY">
7777
<column name="selection_id"/>
7878
</constraint>
79-
<constraint xsi:type="foreign" name="CAT_PRD_BNDL_SELECTION_OPT_ID_CAT_PRD_BNDL_OPT_OPT_ID"
79+
<constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_SELECTION_OPT_ID_CAT_PRD_BNDL_OPT_OPT_ID"
8080
table="catalog_product_bundle_selection" column="option_id"
8181
referenceTable="catalog_product_bundle_option" referenceColumn="option_id" onDelete="CASCADE"/>
82-
<constraint xsi:type="foreign" name="CAT_PRD_BNDL_SELECTION_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
82+
<constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_SELECTION_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
8383
table="catalog_product_bundle_selection" column="product_id" referenceTable="catalog_product_entity"
8484
referenceColumn="entity_id" onDelete="CASCADE"/>
85-
<index name="CATALOG_PRODUCT_BUNDLE_SELECTION_OPTION_ID" indexType="btree">
85+
<index referenceId="CATALOG_PRODUCT_BUNDLE_SELECTION_OPTION_ID" indexType="btree">
8686
<column name="option_id"/>
8787
</index>
88-
<index name="CATALOG_PRODUCT_BUNDLE_SELECTION_PRODUCT_ID" indexType="btree">
88+
<index referenceId="CATALOG_PRODUCT_BUNDLE_SELECTION_PRODUCT_ID" indexType="btree">
8989
<column name="product_id"/>
9090
</index>
9191
</table>
@@ -101,19 +101,19 @@
101101
nullable="false" default="0" comment="Selection Price Value"/>
102102
<column xsi:type="int" name="parent_product_id" padding="10" unsigned="true" nullable="false" identity="false"
103103
comment="Parent Product Id"/>
104-
<constraint xsi:type="primary" name="PK_CATALOG_PRODUCT_BUNDLE_SELECTION_PRICE">
104+
<constraint xsi:type="primary" referenceId="PK_CATALOG_PRODUCT_BUNDLE_SELECTION_PRICE">
105105
<column name="selection_id"/>
106106
<column name="parent_product_id"/>
107107
<column name="website_id"/>
108108
</constraint>
109-
<constraint xsi:type="foreign" name="CAT_PRD_BNDL_SELECTION_PRICE_WS_ID_STORE_WS_WS_ID"
109+
<constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_SELECTION_PRICE_WS_ID_STORE_WS_WS_ID"
110110
table="catalog_product_bundle_selection_price" column="website_id" referenceTable="store_website"
111111
referenceColumn="website_id" onDelete="CASCADE"/>
112-
<constraint xsi:type="foreign" name="FK_DCF37523AA05D770A70AA4ED7C2616E4"
112+
<constraint xsi:type="foreign" referenceId="FK_DCF37523AA05D770A70AA4ED7C2616E4"
113113
table="catalog_product_bundle_selection_price" column="selection_id"
114114
referenceTable="catalog_product_bundle_selection" referenceColumn="selection_id"
115115
onDelete="CASCADE"/>
116-
<index name="CATALOG_PRODUCT_BUNDLE_SELECTION_PRICE_WEBSITE_ID" indexType="btree">
116+
<index referenceId="CATALOG_PRODUCT_BUNDLE_SELECTION_PRICE_WEBSITE_ID" indexType="btree">
117117
<column name="website_id"/>
118118
</index>
119119
</table>
@@ -129,24 +129,24 @@
129129
comment="Min Price"/>
130130
<column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="false"
131131
comment="Max Price"/>
132-
<constraint xsi:type="primary" name="PRIMARY">
132+
<constraint xsi:type="primary" referenceId="PRIMARY">
133133
<column name="entity_id"/>
134134
<column name="website_id"/>
135135
<column name="customer_group_id"/>
136136
</constraint>
137-
<constraint xsi:type="foreign" name="CAT_PRD_BNDL_PRICE_IDX_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID"
137+
<constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_PRICE_IDX_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID"
138138
table="catalog_product_bundle_price_index" column="customer_group_id"
139139
referenceTable="customer_group" referenceColumn="customer_group_id" onDelete="CASCADE"/>
140-
<constraint xsi:type="foreign" name="CAT_PRD_BNDL_PRICE_IDX_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
140+
<constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_PRICE_IDX_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
141141
table="catalog_product_bundle_price_index" column="entity_id"
142142
referenceTable="catalog_product_entity" referenceColumn="entity_id" onDelete="CASCADE"/>
143-
<constraint xsi:type="foreign" name="CAT_PRD_BNDL_PRICE_IDX_WS_ID_STORE_WS_WS_ID"
143+
<constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_PRICE_IDX_WS_ID_STORE_WS_WS_ID"
144144
table="catalog_product_bundle_price_index" column="website_id" referenceTable="store_website"
145145
referenceColumn="website_id" onDelete="CASCADE"/>
146-
<index name="CATALOG_PRODUCT_BUNDLE_PRICE_INDEX_WEBSITE_ID" indexType="btree">
146+
<index referenceId="CATALOG_PRODUCT_BUNDLE_PRICE_INDEX_WEBSITE_ID" indexType="btree">
147147
<column name="website_id"/>
148148
</index>
149-
<index name="CATALOG_PRODUCT_BUNDLE_PRICE_INDEX_CUSTOMER_GROUP_ID" indexType="btree">
149+
<index referenceId="CATALOG_PRODUCT_BUNDLE_PRICE_INDEX_CUSTOMER_GROUP_ID" indexType="btree">
150150
<column name="customer_group_id"/>
151151
</index>
152152
</table>
@@ -162,7 +162,7 @@
162162
default="0" comment="Option Id"/>
163163
<column xsi:type="smallint" name="stock_status" padding="6" unsigned="false" nullable="true" identity="false"
164164
default="0" comment="Stock Status"/>
165-
<constraint xsi:type="primary" name="PRIMARY">
165+
<constraint xsi:type="primary" referenceId="PRIMARY">
166166
<column name="entity_id"/>
167167
<column name="website_id"/>
168168
<column name="stock_id"/>
@@ -197,7 +197,7 @@
197197
comment="Tier Price"/>
198198
<column xsi:type="decimal" name="base_tier" scale="4" precision="12" unsigned="false" nullable="true"
199199
comment="Base Tier"/>
200-
<constraint xsi:type="primary" name="PRIMARY">
200+
<constraint xsi:type="primary" referenceId="PRIMARY">
201201
<column name="entity_id"/>
202202
<column name="customer_group_id"/>
203203
<column name="website_id"/>
@@ -231,7 +231,7 @@
231231
comment="Tier Price"/>
232232
<column xsi:type="decimal" name="base_tier" scale="4" precision="12" unsigned="false" nullable="true"
233233
comment="Base Tier"/>
234-
<constraint xsi:type="primary" name="PRIMARY">
234+
<constraint xsi:type="primary" referenceId="PRIMARY">
235235
<column name="entity_id"/>
236236
<column name="customer_group_id"/>
237237
<column name="website_id"/>
@@ -257,7 +257,7 @@
257257
comment="Price"/>
258258
<column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
259259
comment="Tier Price"/>
260-
<constraint xsi:type="primary" name="PRIMARY">
260+
<constraint xsi:type="primary" referenceId="PRIMARY">
261261
<column name="entity_id"/>
262262
<column name="customer_group_id"/>
263263
<column name="website_id"/>
@@ -285,7 +285,7 @@
285285
comment="Price"/>
286286
<column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
287287
comment="Tier Price"/>
288-
<constraint xsi:type="primary" name="PRIMARY">
288+
<constraint xsi:type="primary" referenceId="PRIMARY">
289289
<column name="entity_id"/>
290290
<column name="customer_group_id"/>
291291
<column name="website_id"/>
@@ -313,7 +313,7 @@
313313
comment="Tier Price"/>
314314
<column xsi:type="decimal" name="alt_tier_price" scale="4" precision="12" unsigned="false" nullable="true"
315315
comment="Alt Tier Price"/>
316-
<constraint xsi:type="primary" name="PRIMARY">
316+
<constraint xsi:type="primary" referenceId="PRIMARY">
317317
<column name="entity_id"/>
318318
<column name="customer_group_id"/>
319319
<column name="website_id"/>
@@ -340,7 +340,7 @@
340340
comment="Tier Price"/>
341341
<column xsi:type="decimal" name="alt_tier_price" scale="4" precision="12" unsigned="false" nullable="true"
342342
comment="Alt Tier Price"/>
343-
<constraint xsi:type="primary" name="PRIMARY">
343+
<constraint xsi:type="primary" referenceId="PRIMARY">
344344
<column name="entity_id"/>
345345
<column name="customer_group_id"/>
346346
<column name="website_id"/>

0 commit comments

Comments
 (0)