Skip to content

Commit add8055

Browse files
author
Dmytro Voskoboinikov
committed
Merge branch '2.3-develop' into 2.3-bugfixes-150818
2 parents 96a9622 + b1ce314 commit add8055

File tree

280 files changed

+14184
-8491
lines changed

Some content is hidden

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

280 files changed

+14184
-8491
lines changed

‎app/code/Magento/AdminNotification/etc/adminhtml/menu.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
99
<menu>
10-
<add id="Magento_AdminNotification::system_adminnotification" title="Notifications" translate="title" module="Magento_AdminNotification" sortOrder="10" parent="Magento_Backend::system_other_settings" action="adminhtml/notification" resource="Magento_AdminNotification::adminnotification"/>
10+
<add id="Magento_AdminNotification::system_adminnotification" title="Notifications" translate="title" module="Magento_AdminNotification" sortOrder="10" parent="Magento_Backend::system_other_settings" action="adminhtml/notification" resource="Magento_AdminNotification::adminnotification"/>
1111
</menu>
1212
</config>

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

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
{
2-
"adminnotification_inbox": {
3-
"column": {
4-
"notification_id": true,
5-
"severity": true,
6-
"date_added": true,
7-
"title": true,
8-
"description": true,
9-
"url": true,
10-
"is_read": true,
11-
"is_remove": true
2+
"adminnotification_inbox": {
3+
"column": {
4+
"notification_id": true,
5+
"severity": true,
6+
"date_added": true,
7+
"title": true,
8+
"description": true,
9+
"url": true,
10+
"is_read": true,
11+
"is_remove": true
12+
},
13+
"index": {
14+
"ADMINNOTIFICATION_INBOX_SEVERITY": true,
15+
"ADMINNOTIFICATION_INBOX_IS_READ": true,
16+
"ADMINNOTIFICATION_INBOX_IS_REMOVE": true
17+
},
18+
"constraint": {
19+
"PRIMARY": true
20+
}
1221
},
13-
"index": {
14-
"ADMINNOTIFICATION_INBOX_SEVERITY": true,
15-
"ADMINNOTIFICATION_INBOX_IS_READ": true,
16-
"ADMINNOTIFICATION_INBOX_IS_REMOVE": true
17-
},
18-
"constraint": {
19-
"PRIMARY": true
20-
}
21-
},
22-
"admin_system_messages": {
23-
"column": {
24-
"identity": true,
25-
"severity": true,
26-
"created_at": true
27-
},
28-
"constraint": {
29-
"PRIMARY": true
22+
"admin_system_messages": {
23+
"column": {
24+
"identity": true,
25+
"severity": true,
26+
"created_at": true
27+
},
28+
"constraint": {
29+
"PRIMARY": true
30+
}
3031
}
31-
}
3232
}

‎app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
1717
use Magento\Framework\Search\Request\IndexScopeResolverInterface as TableResolver;
1818
use Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory;
19+
use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
1920

2021
/**
2122
* @api
@@ -47,12 +48,17 @@ class Index extends AbstractDb
4748
*/
4849
private $dimensionCollectionFactory;
4950

51+
/**
52+
* @var int|null
53+
*/
54+
private $websiteId;
55+
5056
/**
5157
* Index constructor.
5258
* @param Context $context
5359
* @param StoreManagerInterface $storeManager
5460
* @param MetadataPool $metadataPool
55-
* @param null $connectionName
61+
* @param string|null $connectionName
5662
* @param TableResolver|null $tableResolver
5763
* @param DimensionCollectionFactory|null $dimensionCollectionFactory
5864
*/
@@ -94,12 +100,17 @@ protected function _getCatalogProductPriceData($productIds = null)
94100
$catalogProductIndexPriceSelect = [];
95101

96102
foreach ($this->dimensionCollectionFactory->create() as $dimensions) {
97-
$catalogProductIndexPriceSelect[] = $connection->select()->from(
98-
$this->tableResolver->resolve('catalog_product_index_price', $dimensions),
99-
['entity_id', 'customer_group_id', 'website_id', 'min_price']
100-
);
101-
if ($productIds) {
102-
current($catalogProductIndexPriceSelect)->where('entity_id IN (?)', $productIds);
103+
if (!isset($dimensions[WebsiteDimensionProvider::DIMENSION_NAME]) ||
104+
$this->websiteId === null ||
105+
$dimensions[WebsiteDimensionProvider::DIMENSION_NAME]->getValue() === $this->websiteId) {
106+
$select = $connection->select()->from(
107+
$this->tableResolver->resolve('catalog_product_index_price', $dimensions),
108+
['entity_id', 'customer_group_id', 'website_id', 'min_price']
109+
);
110+
if ($productIds) {
111+
$select->where('entity_id IN (?)', $productIds);
112+
}
113+
$catalogProductIndexPriceSelect[] = $select;
103114
}
104115
}
105116

@@ -123,9 +134,12 @@ protected function _getCatalogProductPriceData($productIds = null)
123134
*/
124135
public function getPriceIndexData($productIds, $storeId)
125136
{
137+
$websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
138+
139+
$this->websiteId = $websiteId;
126140
$priceProductsIndexData = $this->_getCatalogProductPriceData($productIds);
141+
$this->websiteId = null;
127142

128-
$websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
129143
if (!isset($priceProductsIndexData[$websiteId])) {
130144
return [];
131145
}

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
2-
"catalogsearch_recommendations": {
3-
"column": {
4-
"id": true,
5-
"query_id": true,
6-
"relation_id": true
7-
},
8-
"constraint": {
9-
"PRIMARY": true,
10-
"CATALOGSEARCH_RECOMMENDATIONS_QUERY_ID_SEARCH_QUERY_QUERY_ID": true,
11-
"CATALOGSEARCH_RECOMMENDATIONS_RELATION_ID_SEARCH_QUERY_QUERY_ID": true
2+
"catalogsearch_recommendations": {
3+
"column": {
4+
"id": true,
5+
"query_id": true,
6+
"relation_id": true
7+
},
8+
"constraint": {
9+
"PRIMARY": true,
10+
"CATALOGSEARCH_RECOMMENDATIONS_QUERY_ID_SEARCH_QUERY_QUERY_ID": true,
11+
"CATALOGSEARCH_RECOMMENDATIONS_RELATION_ID_SEARCH_QUERY_QUERY_ID": true
12+
}
1213
}
13-
}
1414
}

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

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
11
{
2-
"magento_bulk": {
3-
"column": {
4-
"id": true,
5-
"uuid": true,
6-
"user_id": true,
7-
"description": true,
8-
"operation_count": true,
9-
"start_time": true
2+
"magento_bulk": {
3+
"column": {
4+
"id": true,
5+
"uuid": true,
6+
"user_id": true,
7+
"description": true,
8+
"operation_count": true,
9+
"start_time": true
10+
},
11+
"constraint": {
12+
"PRIMARY": true,
13+
"MAGENTO_BULK_USER_ID_ADMIN_USER_USER_ID": true,
14+
"MAGENTO_BULK_UUID": true
15+
}
1016
},
11-
"constraint": {
12-
"PRIMARY": true,
13-
"MAGENTO_BULK_USER_ID_ADMIN_USER_USER_ID": true,
14-
"MAGENTO_BULK_UUID": true
15-
}
16-
},
17-
"magento_operation": {
18-
"column": {
19-
"id": true,
20-
"bulk_uuid": true,
21-
"topic_name": true,
22-
"serialized_data": true,
23-
"result_serialized_data": true,
24-
"status": true,
25-
"error_code": true,
26-
"result_message": true
27-
},
28-
"index": {
29-
"MAGENTO_OPERATION_BULK_UUID_ERROR_CODE": true
30-
},
31-
"constraint": {
32-
"PRIMARY": true,
33-
"MAGENTO_OPERATION_BULK_UUID_MAGENTO_BULK_UUID": true
34-
}
35-
},
36-
"magento_acknowledged_bulk": {
37-
"column": {
38-
"id": true,
39-
"bulk_uuid": true
17+
"magento_operation": {
18+
"column": {
19+
"id": true,
20+
"bulk_uuid": true,
21+
"topic_name": true,
22+
"serialized_data": true,
23+
"result_serialized_data": true,
24+
"status": true,
25+
"error_code": true,
26+
"result_message": true
27+
},
28+
"index": {
29+
"MAGENTO_OPERATION_BULK_UUID_ERROR_CODE": true
30+
},
31+
"constraint": {
32+
"PRIMARY": true,
33+
"MAGENTO_OPERATION_BULK_UUID_MAGENTO_BULK_UUID": true
34+
}
4035
},
41-
"constraint": {
42-
"PRIMARY": true,
43-
"MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID_MAGENTO_BULK_UUID": true,
44-
"MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID": true
36+
"magento_acknowledged_bulk": {
37+
"column": {
38+
"id": true,
39+
"bulk_uuid": true
40+
},
41+
"constraint": {
42+
"PRIMARY": true,
43+
"MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID_MAGENTO_BULK_UUID": true,
44+
"MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID": true
45+
}
4546
}
46-
}
4747
}

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

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
{
2-
"authorization_role": {
3-
"column": {
4-
"role_id": true,
5-
"parent_id": true,
6-
"tree_level": true,
7-
"sort_order": true,
8-
"role_type": true,
9-
"user_id": true,
10-
"user_type": true,
11-
"role_name": true
2+
"authorization_role": {
3+
"column": {
4+
"role_id": true,
5+
"parent_id": true,
6+
"tree_level": true,
7+
"sort_order": true,
8+
"role_type": true,
9+
"user_id": true,
10+
"user_type": true,
11+
"role_name": true
12+
},
13+
"index": {
14+
"AUTHORIZATION_ROLE_PARENT_ID_SORT_ORDER": true,
15+
"AUTHORIZATION_ROLE_TREE_LEVEL": true
16+
},
17+
"constraint": {
18+
"PRIMARY": true
19+
}
1220
},
13-
"index": {
14-
"AUTHORIZATION_ROLE_PARENT_ID_SORT_ORDER": true,
15-
"AUTHORIZATION_ROLE_TREE_LEVEL": true
16-
},
17-
"constraint": {
18-
"PRIMARY": true
19-
}
20-
},
21-
"authorization_rule": {
22-
"column": {
23-
"rule_id": true,
24-
"role_id": true,
25-
"resource_id": true,
26-
"privileges": true,
27-
"permission": true
28-
},
29-
"index": {
30-
"AUTHORIZATION_RULE_RESOURCE_ID_ROLE_ID": true,
31-
"AUTHORIZATION_RULE_ROLE_ID_RESOURCE_ID": true
32-
},
33-
"constraint": {
34-
"PRIMARY": true,
35-
"AUTHORIZATION_RULE_ROLE_ID_AUTHORIZATION_ROLE_ROLE_ID": true
21+
"authorization_rule": {
22+
"column": {
23+
"rule_id": true,
24+
"role_id": true,
25+
"resource_id": true,
26+
"privileges": true,
27+
"permission": true
28+
},
29+
"index": {
30+
"AUTHORIZATION_RULE_RESOURCE_ID_ROLE_ID": true,
31+
"AUTHORIZATION_RULE_ROLE_ID_RESOURCE_ID": true
32+
},
33+
"constraint": {
34+
"PRIMARY": true,
35+
"AUTHORIZATION_RULE_ROLE_ID_AUTHORIZATION_ROLE_ROLE_ID": true
36+
}
3637
}
37-
}
3838
}

0 commit comments

Comments
 (0)