-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2050 from magento-performance/pr-2.2-develop
Fixed issues: MAGETWO-72597 [2.2.x] - Impossible to perform mass update on product with 60+ attributes in system MAGETWO-73696 Sorting by price column in admin doesn't count disabled products MAGETWO-84967 Set auto increment to 3 for Performance test plan MAGETWO-87445 FATAL error on compiler generation on PAT 2.2 Trend
- Loading branch information
Showing
11 changed files
with
376 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| namespace Magento\Catalog\Ui\DataProvider\Product; | ||
|
|
||
| /** | ||
| * Collection which is used for rendering product list in the backend. | ||
| * | ||
| * Used for product grid and customizes behavior of the default Product collection for grid needs. | ||
| */ | ||
| class ProductCollection extends \Magento\Catalog\Model\ResourceModel\Product\Collection | ||
| { | ||
| /** | ||
| * Disables using of price index for grid rendering | ||
| * | ||
| * Admin area shouldn't use price index and should rely on actual product data instead. | ||
| * | ||
| * @codeCoverageIgnore | ||
| * @return \Magento\Catalog\Model\ResourceModel\Product\Collection | ||
| */ | ||
| protected function _productLimitationJoinPrice() | ||
| { | ||
| $this->_productLimitationFilters->setUsePriceIndex(false); | ||
| return $this->_productLimitationPrice(true); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
158 changes: 158 additions & 0 deletions
158
app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Entity/Attribute/CollectionTest.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,158 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| namespace Magento\Eav\Test\Unit\Model\ResourceModel\Entity\Attribute; | ||
|
|
||
| use Magento\Framework\Data\Collection\Db\FetchStrategyInterface; | ||
| use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; | ||
|
|
||
| /** | ||
| * Test for \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection class. | ||
| * | ||
| * @SuppressWarnings(PHPMD.CouplingBetweenObjects) | ||
| */ | ||
| class CollectionTest extends \PHPUnit\Framework\TestCase | ||
| { | ||
| /** | ||
| * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection | ||
| */ | ||
| private $model; | ||
|
|
||
| /** | ||
| * @var \Magento\Framework\Data\Collection\EntityFactory|\PHPUnit_Framework_MockObject_MockObject | ||
| */ | ||
| private $entityFactoryMock; | ||
|
|
||
| /** | ||
| * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject | ||
| */ | ||
| private $loggerMock; | ||
|
|
||
| /** | ||
| * @var \Magento\Framework\Data\Collection\Db\FetchStrategyInterface|\PHPUnit_Framework_MockObject_MockObject | ||
| */ | ||
| private $fetchStrategyMock; | ||
|
|
||
| /** | ||
| * @var \Magento\Framework\Data\Collection\EntityFactory|\PHPUnit_Framework_MockObject_MockObject | ||
| */ | ||
| private $eventManagerMock; | ||
|
|
||
| /** | ||
| * @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject | ||
| */ | ||
| private $eavConfigMock; | ||
|
|
||
| /** | ||
| * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject | ||
| */ | ||
| private $storeManagerMock; | ||
|
|
||
| /** | ||
| * @var \Magento\Framework\DB\Adapter\AdapterInterface|\PHPUnit_Framework_MockObject_MockObject | ||
| */ | ||
| private $connectionMock; | ||
|
|
||
| /** | ||
| * @var \Magento\Framework\Model\ResourceModel\Db\AbstractDb|\PHPUnit_Framework_MockObject_MockObject | ||
| */ | ||
| private $resourceMock; | ||
|
|
||
| /** | ||
| * @var \Magento\Framework\DB\Select|\PHPUnit_Framework_MockObject_MockObject | ||
| */ | ||
| private $selectMock; | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| protected function setUp() | ||
| { | ||
| $this->entityFactoryMock = $this->getMockBuilder(\Magento\Framework\Data\Collection\EntityFactory::class) | ||
| ->disableOriginalConstructor() | ||
| ->getMock(); | ||
|
|
||
| $this->loggerMock = $this->getMockBuilder(\Psr\Log\LoggerInterface::class) | ||
| ->disableOriginalConstructor() | ||
| ->getMock(); | ||
|
|
||
| $this->fetchStrategyMock = $this->getMockBuilder(FetchStrategyInterface::class) | ||
| ->disableOriginalConstructor() | ||
| ->getMock(); | ||
|
|
||
| $this->eventManagerMock = $this->getMockBuilder(\Magento\Framework\Event\ManagerInterface::class) | ||
| ->disableOriginalConstructor() | ||
| ->getMock(); | ||
|
|
||
| $this->eavConfigMock = $this->getMockBuilder(\Magento\Eav\Model\Config::class) | ||
| ->disableOriginalConstructor() | ||
| ->getMock(); | ||
|
|
||
| $this->connectionMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\Pdo\Mysql::class) | ||
| ->disableOriginalConstructor() | ||
| ->getMock(); | ||
|
|
||
| $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class) | ||
| ->disableOriginalConstructor() | ||
| ->getMock(); | ||
|
|
||
| $this->resourceMock = $this->getMockBuilder(\Magento\Framework\Model\ResourceModel\Db\AbstractDb::class) | ||
| ->setMethods(['__wakeup', 'getConnection', 'getMainTable', 'getTable']) | ||
| ->disableOriginalConstructor() | ||
| ->getMockForAbstractClass(); | ||
|
|
||
| $this->resourceMock->expects($this->any())->method('getConnection')->willReturn($this->connectionMock); | ||
| $this->resourceMock->expects($this->any())->method('getMainTable')->willReturn('eav_entity_attribute'); | ||
|
|
||
| $this->selectMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class) | ||
| ->disableOriginalConstructor() | ||
| ->getMock(); | ||
|
|
||
| $this->connectionMock->expects($this->any())->method('select')->willReturn($this->selectMock); | ||
|
|
||
| $objectManager = new ObjectManager($this); | ||
| $this->model = $objectManager->getObject( | ||
| \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection::class, | ||
| [ | ||
| 'entityFactory' => $this->entityFactoryMock, | ||
| 'logger' => $this->loggerMock, | ||
| 'fetchStrategy' => $this->fetchStrategyMock, | ||
| 'eventManager' => $this->eventManagerMock, | ||
| 'eavConfig' => $this->eavConfigMock, | ||
| 'connection' => $this->connectionMock, | ||
| 'resource' => $this->resourceMock, | ||
| ] | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * Test method \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection::setInAllAttributeSetsFilter | ||
| * | ||
| * @return void | ||
| */ | ||
| public function testSetInAllAttributeSetsFilter() | ||
| { | ||
| $setIds = [1, 2, 3]; | ||
|
|
||
| $this->selectMock->expects($this->atLeastOnce()) | ||
| ->method('where') | ||
| ->with('entity_attribute.attribute_set_id IN (?)', $setIds) | ||
| ->willReturnSelf(); | ||
| $this->selectMock->expects($this->atLeastOnce())->method('join')->with( | ||
| ['entity_attribute' => $this->model->getTable('eav_entity_attribute')], | ||
| 'entity_attribute.attribute_id = main_table.attribute_id', | ||
| ['count' => new \Zend_Db_Expr('COUNT(*)')] | ||
| )->willReturnSelf(); | ||
|
|
||
| $this->selectMock->expects($this->atLeastOnce())->method('group')->with('entity_attribute.attribute_id') | ||
| ->willReturnSelf(); | ||
|
|
||
| $this->selectMock->expects($this->atLeastOnce())->method('having')->with('count = ' . count($setIds)) | ||
| ->willReturnSelf(); | ||
|
|
||
| $this->model->setInAllAttributeSetsFilter($setIds); | ||
| } | ||
| } |
Oops, something went wrong.