Merge remote-tracking branch 'origin/MC-19566' into 2.3.3-develop-pr72

zakdma · zakdma · commit 09f53c728db9 · 2019-08-22T14:42:39.000+03:00
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
@@ -254,10 +254,12 @@ protected function _updateRelationProducts($storeId, $productIds = null)
      *
      * @param int $storeId
      * @return \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     protected function _cleanRelationProducts($storeId)
     {
-        if (!$this->_productIndexerHelper->isAddChildData()) {
+        if (!$this->_productIndexerHelper->isAddChildData() || !$this->_isFlatTableExists($storeId)) {
             return $this;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -254,10 +254,12 @@ protected function _updateRelationProducts($storeId, $productIds = null)`
`254`	`254`	`*`
`255`	`255`	`* @param int $storeId`
`256`	`256`	`* @return \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction`
	`257`	`+ *`
	`258`	`+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)`
`257`	`259`	`*/`
`258`	`260`	`protected function _cleanRelationProducts($storeId)`
`259`	`261`	`{`
`260`		`- if (!$this->_productIndexerHelper->isAddChildData()) {`
	`262`	`+ if (!$this->_productIndexerHelper->isAddChildData() \|\| !$this->_isFlatTableExists($storeId)) {`
`261`	`263`	`return $this;`
`262`	`264`	`}`
`263`	`265`