Merge branch '2.3-develop' into 2.3-develop-pr10

janakbhimani · Oct 25, 2018 · ae788d7 · ae788d7
2 parents cca538d + 2e036c4
commit ae788d7
Show file tree

Hide file tree

Showing 484 changed files with 10,591 additions and 5,885 deletions.
diff --git a/app/code/Magento/AdminNotification/etc/db_schema.xml b/app/code/Magento/AdminNotification/etc/db_schema.xml
@@ -21,16 +21,16 @@
                 default="0" comment="Flag if notification read"/>
         <column xsi:type="smallint" name="is_remove" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Flag if notification might be removed"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="notification_id"/>
         </constraint>
-        <index name="ADMINNOTIFICATION_INBOX_SEVERITY" indexType="btree">
+        <index referenceId="ADMINNOTIFICATION_INBOX_SEVERITY" indexType="btree">
             <column name="severity"/>
         </index>
-        <index name="ADMINNOTIFICATION_INBOX_IS_READ" indexType="btree">
+        <index referenceId="ADMINNOTIFICATION_INBOX_IS_READ" indexType="btree">
             <column name="is_read"/>
         </index>
-        <index name="ADMINNOTIFICATION_INBOX_IS_REMOVE" indexType="btree">
+        <index referenceId="ADMINNOTIFICATION_INBOX_IS_REMOVE" indexType="btree">
             <column name="is_remove"/>
         </index>
     </table>
@@ -40,7 +40,7 @@
                 default="0" comment="Problem type"/>
         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
                 comment="Create date"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="identity"/>
         </constraint>
     </table>

diff --git a/app/code/Magento/AdvancedSearch/etc/db_schema.xml b/app/code/Magento/AdvancedSearch/etc/db_schema.xml
@@ -14,13 +14,13 @@
                 default="0" comment="Query Id"/>
         <column xsi:type="int" name="relation_id" padding="10" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Relation Id"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="id"/>
         </constraint>
-        <constraint xsi:type="foreign" name="CATALOGSEARCH_RECOMMENDATIONS_QUERY_ID_SEARCH_QUERY_QUERY_ID"
+        <constraint xsi:type="foreign" referenceId="CATALOGSEARCH_RECOMMENDATIONS_QUERY_ID_SEARCH_QUERY_QUERY_ID"
                     table="catalogsearch_recommendations" column="query_id" referenceTable="search_query"
                     referenceColumn="query_id" onDelete="CASCADE"/>
-        <constraint xsi:type="foreign" name="CATALOGSEARCH_RECOMMENDATIONS_RELATION_ID_SEARCH_QUERY_QUERY_ID"
+        <constraint xsi:type="foreign" referenceId="CATALOGSEARCH_RECOMMENDATIONS_RELATION_ID_SEARCH_QUERY_QUERY_ID"
                     table="catalogsearch_recommendations" column="relation_id" referenceTable="search_query"
                     referenceColumn="query_id" onDelete="CASCADE"/>
     </table>

diff --git a/app/code/Magento/AsynchronousOperations/etc/db_schema.xml b/app/code/Magento/AsynchronousOperations/etc/db_schema.xml
@@ -21,13 +21,13 @@
                 comment="Total number of operations scheduled within this bulk"/>
         <column xsi:type="timestamp" name="start_time" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
                 comment="Bulk start time"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="id"/>
         </constraint>
-        <constraint xsi:type="unique" name="MAGENTO_BULK_UUID">
+        <constraint xsi:type="unique" referenceId="MAGENTO_BULK_UUID">
             <column name="uuid"/>
         </constraint>
-        <index name="MAGENTO_BULK_USER_ID_ADMIN_USER_USER_ID" indexType="btree">
+        <index referenceId="MAGENTO_BULK_USER_ID_ADMIN_USER_USER_ID" indexType="btree">
             <column name="user_id"/>
         </index>
     </table>
@@ -47,12 +47,12 @@
                 comment="Code of the error that appeared during operation execution (used to aggregate related failed operations)"/>
         <column xsi:type="varchar" name="result_message" nullable="true" length="255"
                 comment="Operation result message"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="id"/>
         </constraint>
-        <constraint xsi:type="foreign" name="MAGENTO_OPERATION_BULK_UUID_MAGENTO_BULK_UUID" table="magento_operation"
+        <constraint xsi:type="foreign" referenceId="MAGENTO_OPERATION_BULK_UUID_MAGENTO_BULK_UUID" table="magento_operation"
                     column="bulk_uuid" referenceTable="magento_bulk" referenceColumn="uuid" onDelete="CASCADE"/>
-        <index name="MAGENTO_OPERATION_BULK_UUID_ERROR_CODE" indexType="btree">
+        <index referenceId="MAGENTO_OPERATION_BULK_UUID_ERROR_CODE" indexType="btree">
             <column name="bulk_uuid"/>
             <column name="error_code"/>
         </index>
@@ -62,13 +62,13 @@
         <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Internal ID"/>
         <column xsi:type="varbinary" name="bulk_uuid" nullable="true" length="39" comment="Related Bulk UUID"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="id"/>
         </constraint>
-        <constraint xsi:type="foreign" name="MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID_MAGENTO_BULK_UUID"
+        <constraint xsi:type="foreign" referenceId="MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID_MAGENTO_BULK_UUID"
                     table="magento_acknowledged_bulk" column="bulk_uuid" referenceTable="magento_bulk"
                     referenceColumn="uuid" onDelete="CASCADE"/>
-        <constraint xsi:type="unique" name="MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID">
+        <constraint xsi:type="unique" referenceId="MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID">
             <column name="bulk_uuid"/>
         </constraint>
     </table>

diff --git a/app/code/Magento/AsynchronousOperations/etc/db_schema_whitelist.json b/app/code/Magento/AsynchronousOperations/etc/db_schema_whitelist.json
@@ -15,7 +15,8 @@
         },
         "constraint": {
             "PRIMARY": true,
-            "MAGENTO_BULK_UUID": true
+            "MAGENTO_BULK_UUID": true,
+            "MAGENTO_BULK_USER_ID_ADMIN_USER_USER_ID": true
         }
     },
     "magento_operation": {

diff --git a/app/code/Magento/Authorization/etc/db_schema.xml b/app/code/Magento/Authorization/etc/db_schema.xml
@@ -21,14 +21,14 @@
                 comment="User ID"/>
         <column xsi:type="varchar" name="user_type" nullable="true" length="16" comment="User Type"/>
         <column xsi:type="varchar" name="role_name" nullable="true" length="50" comment="Role Name"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="role_id"/>
         </constraint>
-        <index name="AUTHORIZATION_ROLE_PARENT_ID_SORT_ORDER" indexType="btree">
+        <index referenceId="AUTHORIZATION_ROLE_PARENT_ID_SORT_ORDER" indexType="btree">
             <column name="parent_id"/>
             <column name="sort_order"/>
         </index>
-        <index name="AUTHORIZATION_ROLE_TREE_LEVEL" indexType="btree">
+        <index referenceId="AUTHORIZATION_ROLE_TREE_LEVEL" indexType="btree">
             <column name="tree_level"/>
         </index>
     </table>
@@ -40,17 +40,17 @@
         <column xsi:type="varchar" name="resource_id" nullable="true" length="255" comment="Resource ID"/>
         <column xsi:type="varchar" name="privileges" nullable="true" length="20" comment="Privileges"/>
         <column xsi:type="varchar" name="permission" nullable="true" length="10" comment="Permission"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="rule_id"/>
         </constraint>
-        <constraint xsi:type="foreign" name="AUTHORIZATION_RULE_ROLE_ID_AUTHORIZATION_ROLE_ROLE_ID"
+        <constraint xsi:type="foreign" referenceId="AUTHORIZATION_RULE_ROLE_ID_AUTHORIZATION_ROLE_ROLE_ID"
                     table="authorization_rule" column="role_id" referenceTable="authorization_role"
                     referenceColumn="role_id" onDelete="CASCADE"/>
-        <index name="AUTHORIZATION_RULE_RESOURCE_ID_ROLE_ID" indexType="btree">
+        <index referenceId="AUTHORIZATION_RULE_RESOURCE_ID_ROLE_ID" indexType="btree">
             <column name="resource_id"/>
             <column name="role_id"/>
         </index>
-        <index name="AUTHORIZATION_RULE_ROLE_ID_RESOURCE_ID" indexType="btree">
+        <index referenceId="AUTHORIZATION_RULE_ROLE_ID_RESOURCE_ID" indexType="btree">
             <column name="role_id"/>
             <column name="resource_id"/>
         </index>

diff --git a/app/code/Magento/Backend/view/adminhtml/web/js/validate-store.js b/app/code/Magento/Backend/view/adminhtml/web/js/validate-store.js
@@ -67,6 +67,7 @@ define([
                              * 'Confirm' action handler.
                              */
                             confirm: function () {
+                                $('body').trigger('processStart');
                                 dataPost().postData(requestData);
                             }
                         }

diff --git a/app/code/Magento/Bundle/etc/db_schema.xml b/app/code/Magento/Bundle/etc/db_schema.xml
@@ -18,13 +18,13 @@
         <column xsi:type="int" name="position" padding="10" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Position"/>
         <column xsi:type="varchar" name="type" nullable="true" length="255" comment="Type"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="option_id"/>
         </constraint>
-        <constraint xsi:type="foreign" name="CAT_PRD_BNDL_OPT_PARENT_ID_CAT_PRD_ENTT_ENTT_ID"
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_OPT_PARENT_ID_CAT_PRD_ENTT_ENTT_ID"
                     table="catalog_product_bundle_option" column="parent_id" referenceTable="catalog_product_entity"
                     referenceColumn="entity_id" onDelete="CASCADE"/>
-        <index name="CATALOG_PRODUCT_BUNDLE_OPTION_PARENT_ID" indexType="btree">
+        <index referenceId="CATALOG_PRODUCT_BUNDLE_OPTION_PARENT_ID" indexType="btree">
             <column name="parent_id"/>
         </index>
     </table>
@@ -39,13 +39,13 @@
         <column xsi:type="varchar" name="title" nullable="true" length="255" comment="Title"/>
         <column xsi:type="int" name="parent_product_id" padding="10" unsigned="true" nullable="false" identity="false"
                 comment="Parent Product Id"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="value_id"/>
         </constraint>
-        <constraint xsi:type="foreign" name="CAT_PRD_BNDL_OPT_VAL_OPT_ID_CAT_PRD_BNDL_OPT_OPT_ID"
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_OPT_VAL_OPT_ID_CAT_PRD_BNDL_OPT_OPT_ID"
                     table="catalog_product_bundle_option_value" column="option_id"
                     referenceTable="catalog_product_bundle_option" referenceColumn="option_id" onDelete="CASCADE"/>
-        <constraint xsi:type="unique" name="CAT_PRD_BNDL_OPT_VAL_OPT_ID_PARENT_PRD_ID_STORE_ID">
+        <constraint xsi:type="unique" referenceId="CAT_PRD_BNDL_OPT_VAL_OPT_ID_PARENT_PRD_ID_STORE_ID">
             <column name="option_id"/>
             <column name="parent_product_id"/>
             <column name="store_id"/>
@@ -73,19 +73,19 @@
                 comment="Selection Qty"/>
         <column xsi:type="smallint" name="selection_can_change_qty" padding="6" unsigned="false" nullable="false"
                 identity="false" default="0" comment="Selection Can Change Qty"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="selection_id"/>
         </constraint>
-        <constraint xsi:type="foreign" name="CAT_PRD_BNDL_SELECTION_OPT_ID_CAT_PRD_BNDL_OPT_OPT_ID"
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_SELECTION_OPT_ID_CAT_PRD_BNDL_OPT_OPT_ID"
                     table="catalog_product_bundle_selection" column="option_id"
                     referenceTable="catalog_product_bundle_option" referenceColumn="option_id" onDelete="CASCADE"/>
-        <constraint xsi:type="foreign" name="CAT_PRD_BNDL_SELECTION_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_SELECTION_PRD_ID_CAT_PRD_ENTT_ENTT_ID"
                     table="catalog_product_bundle_selection" column="product_id" referenceTable="catalog_product_entity"
                     referenceColumn="entity_id" onDelete="CASCADE"/>
-        <index name="CATALOG_PRODUCT_BUNDLE_SELECTION_OPTION_ID" indexType="btree">
+        <index referenceId="CATALOG_PRODUCT_BUNDLE_SELECTION_OPTION_ID" indexType="btree">
             <column name="option_id"/>
         </index>
-        <index name="CATALOG_PRODUCT_BUNDLE_SELECTION_PRODUCT_ID" indexType="btree">
+        <index referenceId="CATALOG_PRODUCT_BUNDLE_SELECTION_PRODUCT_ID" indexType="btree">
             <column name="product_id"/>
         </index>
     </table>
@@ -101,19 +101,19 @@
                 nullable="false" default="0" comment="Selection Price Value"/>
         <column xsi:type="int" name="parent_product_id" padding="10" unsigned="true" nullable="false" identity="false"
                 comment="Parent Product Id"/>
-        <constraint xsi:type="primary" name="PK_CATALOG_PRODUCT_BUNDLE_SELECTION_PRICE">
+        <constraint xsi:type="primary" referenceId="PK_CATALOG_PRODUCT_BUNDLE_SELECTION_PRICE">
             <column name="selection_id"/>
             <column name="parent_product_id"/>
             <column name="website_id"/>
         </constraint>
-        <constraint xsi:type="foreign" name="CAT_PRD_BNDL_SELECTION_PRICE_WS_ID_STORE_WS_WS_ID"
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_SELECTION_PRICE_WS_ID_STORE_WS_WS_ID"
                     table="catalog_product_bundle_selection_price" column="website_id" referenceTable="store_website"
                     referenceColumn="website_id" onDelete="CASCADE"/>
-        <constraint xsi:type="foreign" name="FK_DCF37523AA05D770A70AA4ED7C2616E4"
+        <constraint xsi:type="foreign" referenceId="FK_DCF37523AA05D770A70AA4ED7C2616E4"
                     table="catalog_product_bundle_selection_price" column="selection_id"
                     referenceTable="catalog_product_bundle_selection" referenceColumn="selection_id"
                     onDelete="CASCADE"/>
-        <index name="CATALOG_PRODUCT_BUNDLE_SELECTION_PRICE_WEBSITE_ID" indexType="btree">
+        <index referenceId="CATALOG_PRODUCT_BUNDLE_SELECTION_PRICE_WEBSITE_ID" indexType="btree">
             <column name="website_id"/>
         </index>
     </table>
@@ -129,24 +129,24 @@
                 comment="Min Price"/>
         <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="false"
                 comment="Max Price"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="entity_id"/>
             <column name="website_id"/>
             <column name="customer_group_id"/>
         </constraint>
-        <constraint xsi:type="foreign" name="CAT_PRD_BNDL_PRICE_IDX_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID"
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_PRICE_IDX_CSTR_GROUP_ID_CSTR_GROUP_CSTR_GROUP_ID"
                     table="catalog_product_bundle_price_index" column="customer_group_id"
                     referenceTable="customer_group" referenceColumn="customer_group_id" onDelete="CASCADE"/>
-        <constraint xsi:type="foreign" name="CAT_PRD_BNDL_PRICE_IDX_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_PRICE_IDX_ENTT_ID_CAT_PRD_ENTT_ENTT_ID"
                     table="catalog_product_bundle_price_index" column="entity_id"
                     referenceTable="catalog_product_entity" referenceColumn="entity_id" onDelete="CASCADE"/>
-        <constraint xsi:type="foreign" name="CAT_PRD_BNDL_PRICE_IDX_WS_ID_STORE_WS_WS_ID"
+        <constraint xsi:type="foreign" referenceId="CAT_PRD_BNDL_PRICE_IDX_WS_ID_STORE_WS_WS_ID"
                     table="catalog_product_bundle_price_index" column="website_id" referenceTable="store_website"
                     referenceColumn="website_id" onDelete="CASCADE"/>
-        <index name="CATALOG_PRODUCT_BUNDLE_PRICE_INDEX_WEBSITE_ID" indexType="btree">
+        <index referenceId="CATALOG_PRODUCT_BUNDLE_PRICE_INDEX_WEBSITE_ID" indexType="btree">
             <column name="website_id"/>
         </index>
-        <index name="CATALOG_PRODUCT_BUNDLE_PRICE_INDEX_CUSTOMER_GROUP_ID" indexType="btree">
+        <index referenceId="CATALOG_PRODUCT_BUNDLE_PRICE_INDEX_CUSTOMER_GROUP_ID" indexType="btree">
             <column name="customer_group_id"/>
         </index>
     </table>
@@ -162,7 +162,7 @@
                 default="0" comment="Option Id"/>
         <column xsi:type="smallint" name="stock_status" padding="6" unsigned="false" nullable="true" identity="false"
                 default="0" comment="Stock Status"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="entity_id"/>
             <column name="website_id"/>
             <column name="stock_id"/>
@@ -197,7 +197,7 @@
                 comment="Tier Price"/>
         <column xsi:type="decimal" name="base_tier" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Base Tier"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="entity_id"/>
             <column name="customer_group_id"/>
             <column name="website_id"/>
@@ -231,7 +231,7 @@
                 comment="Tier Price"/>
         <column xsi:type="decimal" name="base_tier" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Base Tier"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="entity_id"/>
             <column name="customer_group_id"/>
             <column name="website_id"/>
@@ -257,7 +257,7 @@
                 comment="Price"/>
         <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Tier Price"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="entity_id"/>
             <column name="customer_group_id"/>
             <column name="website_id"/>
@@ -285,7 +285,7 @@
                 comment="Price"/>
         <column xsi:type="decimal" name="tier_price" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Tier Price"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="entity_id"/>
             <column name="customer_group_id"/>
             <column name="website_id"/>
@@ -313,7 +313,7 @@
                 comment="Tier Price"/>
         <column xsi:type="decimal" name="alt_tier_price" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Alt Tier Price"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="entity_id"/>
             <column name="customer_group_id"/>
             <column name="website_id"/>
@@ -340,7 +340,7 @@
                 comment="Tier Price"/>
         <column xsi:type="decimal" name="alt_tier_price" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Alt Tier Price"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="entity_id"/>
             <column name="customer_group_id"/>
             <column name="website_id"/>