MAGETWO-65657: Block "Recently Viewed Products" fatals on category scheduled updates preview

- Fixed merge conflict

Author: isavchuk-magento

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

@@ -1842,55 +1842,12 @@ protected function _productLimitationJoinStore()
             $this->getSelect()->columns('visibility', 'cat_index');
         }
 
-        $fromPart = $this->getSelect()->getPart(\Magento\Framework\DB\Select::FROM);
-        if (!isset($fromPart['store_index'])) {
-            $this->getSelect()->joinLeft(
-                ['store_index' => $this->getTable('store')],
-                'store_index.store_id = ' . $filters['store_table'] . '.store_id',
-                []
-            );
-        }
-        if (!isset($fromPart['store_group_index'])) {
-            $this->getSelect()->joinLeft(
-                ['store_group_index' => $this->getTable('store_group')],
-                'store_index.group_id = store_group_index.group_id',
-                []
-            );
-        }
-        if (!isset($fromPart['store_cat_index'])) {
-            $this->getSelect()->joinLeft(
-                ['store_cat_index' => $this->categoryProductIndexerFrontend->getMainTable()],
-                join(
-                    ' AND ',
-                    [
-                        'store_cat_index.product_id = e.entity_id',
-                        'store_cat_index.store_id = ' . $filters['store_table'] . '.store_id',
-                        'store_cat_index.category_id=store_group_index.root_category_id'
-                    ]
-                ),
-                ['store_visibility' => 'visibility']
-            );
-        }
         // Avoid column duplication problems
         $this->_resourceHelper->prepareColumnsList($this->getSelect());
 
-        $whereCond = join(
-            ' OR ',
-            [
-                $this->getConnection()->quoteInto('cat_index.visibility IN(?)', $filters['visibility']),
-                $this->getConnection()->quoteInto('store_cat_index.visibility IN(?)', $filters['visibility'])
-            ]
-        );
-
+        $whereCond = $this->getConnection()->quoteInto('cat_index.visibility IN(?)', $filters['visibility']);
         $wherePart = $this->getSelect()->getPart(\Magento\Framework\DB\Select::WHERE);
-        $hasCond = false;
-        foreach ($wherePart as $cond) {
-            if ($cond == '(' . $whereCond . ')') {
-                $hasCond = true;
-            }
-        }
-
-        if (!$hasCond) {
+        if (array_search('(' . $whereCond . ')', $wherePart) === false) {
             $this->getSelect()->where($whereCond);
         }
 

dev/tests/integration/framework/Magento/TestFramework/ObjectManager.php

@@ -1,13 +1,13 @@
 <?php
 /**
- * Test object manager
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\TestFramework;
 
+/**
+ * ObjectManager for integration test framework.
+ */
 class ObjectManager extends \Magento\Framework\App\ObjectManager
 {
     /**
@@ -35,7 +35,7 @@ class ObjectManager extends \Magento\Framework\App\ObjectManager
     ];
 
     /**
-     * Clear InstanceManager cache
+     * Clear InstanceManager cache.
      *
      * @return \Magento\TestFramework\ObjectManager
      */
@@ -59,33 +59,52 @@ public function clearCache()
         }
         $this->_sharedInstances = $sharedInstances;
         $this->_config->clean();
+        $this->clearMappedTableNames();
 
         return $this;
     }
 
     /**
-     * Add shared instance
+     * Clear mapped table names list.
+     *
+     * @return void
+     */
+    private function clearMappedTableNames()
+    {
+        $resourceConnection = $this->get(\Magento\Framework\App\ResourceConnection::class);
+        if ($resourceConnection) {
+            $reflection = new \ReflectionClass($resourceConnection);
+            $dataProperty = $reflection->getProperty('mappedTableNames');
+            $dataProperty->setAccessible(true);
+            $dataProperty->setValue($resourceConnection, null);
+        }
+    }
+
+    /**
+     * Add shared instance.
      *
      * @param mixed $instance
      * @param string $className
+     * @return void
      */
     public function addSharedInstance($instance, $className)
     {
         $this->_sharedInstances[$className] = $instance;
     }
 
     /**
-     * Remove shared instance
+     * Remove shared instance.
      *
      * @param string $className
+     * @return void
      */
     public function removeSharedInstance($className)
     {
         unset($this->_sharedInstances[$className]);
     }
 
     /**
-     * Set objectManager
+     * Set objectManager.
      *
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @return \Magento\Framework\ObjectManagerInterface