Merge remote-tracking branch 'origin/MAGETWO-24366' into S67

Author: Andrii Kasian

app/code/Magento/CatalogSearch/Model/Resource/Fulltext.php

@@ -49,7 +49,7 @@ protected function _construct()
     public function resetSearchResults()
     {
         $adapter = $this->_getWriteAdapter();
-        $adapter->update($this->getTable('search_query'), ['is_processed' => 0]);
+        $adapter->update($this->getTable('search_query'), ['is_processed' => 0], ['is_processed != 0']);
         $this->_eventManager->dispatch('catalogsearch_reset_search_result');
         return $this;
     }

app/code/Magento/CatalogSearch/Test/Unit/Model/Resource/FulltextTest.php

@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogSearch\Test\Unit\Model\Resource;
+
+
+use Magento\CatalogSearch\Model\Resource\Fulltext;
+use Magento\Framework\App\Resource;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\Model\Resource\Db\Context;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class FulltextTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $adapter;
+    /**
+     * @var Resource|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resource;
+    /**
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $context;
+    /**
+     * @var Fulltext
+     */
+    private $target;
+
+    protected function setUp()
+    {
+        $this->context = $this->getMockBuilder('\Magento\Framework\Model\Resource\Db\Context')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resource = $this->getMockBuilder('\Magento\Framework\App\Resource')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->context->expects($this->once())
+            ->method('getResources')
+            ->willReturn($this->resource);
+        $this->adapter = $this->getMockBuilder('\Magento\Framework\DB\Adapter\AdapterInterface')
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->resource->expects($this->once())
+            ->method('getConnection')
+            ->with('core_write')
+            ->willReturn($this->adapter);
+
+        $objectManager = new ObjectManager($this);
+        $this->target = $objectManager->getObject(
+            '\Magento\CatalogSearch\Model\Resource\Fulltext',
+            [
+                'context' => $this->context,
+            ]
+        );
+    }
+
+    public function testResetSearchResult()
+    {
+        $this->resource->expects($this->once())
+            ->method('getTableName')
+            ->with('search_query', 'core_read')
+            ->willReturn('table_name_search_query');
+        $this->adapter->expects($this->once())
+            ->method('update')
+            ->with('table_name_search_query', ['is_processed' => 0], ['is_processed != 0'])
+            ->willReturn(10);
+        $result = $this->target->resetSearchResults();
+        $this->assertEquals($this->target, $result);
+    }
+}

app/code/Magento/Search/Setup/UpgradeSchema.php

@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Search\Setup;
+
+
+use Magento\Framework\Module\ModuleListInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\Setup\UpgradeSchemaInterface;
+
+class UpgradeSchema implements UpgradeSchemaInterface
+{
+
+    /**
+     * @var ModuleListInterface
+     */
+    private $moduleList;
+
+    /**
+     * @param ModuleListInterface $moduleList
+     */
+    public function __construct(ModuleListInterface $moduleList)
+    {
+        $this->moduleList = $moduleList;
+    }
+
+    /**
+     * Upgrades DB schema for a module
+     *
+     * @param SchemaSetupInterface $setup
+     * @param ModuleContextInterface $context
+     * @return void
+     */
+    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
+    {
+        if (version_compare($context->getVersion(), '2.0.0.1') < 0) {
+            $setup->startSetup();
+            $connection = $setup->getConnection();
+            $tableName = $setup->getTable('search_query');
+            $idxName = $setup->getIdxName('search_query', ['is_processed']);
+            $connection->addIndex($tableName, $idxName, ['is_processed']);
+            $setup->endSetup();
+        }
+    }
+}

app/code/Magento/Search/etc/module.xml

@@ -7,7 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
-    <module name="Magento_Search" setup_version="2.0.0">
+    <module name="Magento_Search" setup_version="2.0.0.1">
         <sequence>
             <module name="Magento_Backend" />
         </sequence>