Merge remote-tracking branch 'tango/MAGETWO-95721' into PR-2.2-1

Author: dhorytskyi

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php

@@ -190,7 +190,7 @@ public function getQuery(array $dimensions, string $productType, array $entityId
         $specialFromExpr = "{$specialFrom} IS NULL OR {$specialFromDate} <= {$currentDate}";
         $specialToExpr = "{$specialTo} IS NULL OR {$specialToDate} >= {$currentDate}";
         $specialPriceExpr = $connection->getCheckSql(
-            "{$specialPrice} IS NOT NULL AND {$specialFromExpr} AND {$specialToExpr}",
+            "{$specialPrice} IS NOT NULL AND ({$specialFromExpr}) AND ({$specialToExpr})",
             $specialPrice,
             $maxUnsignedBigint
         );

dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/CollectionTest.php

@@ -127,6 +127,36 @@ public function testGetProductsWithTierPrice()
         $this->assertEquals(5, $tierPrices[2]->getValue());
     }
 
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/products.php
+     * @magentoDbIsolation disabled
+     */
+    public function testGetProductsWithSpecialPrice()
+    {
+        $product = $this->productRepository->get('simple');
+        $originalFinalPrice = $product->getFinalPrice();
+
+        $specialPrice = 9;
+        $product->setSpecialPrice($specialPrice);
+        $product = $this->productRepository->save($product);
+        /** @var \Magento\Catalog\Model\Product $item */
+        $item = $this->collection->addIdFilter($product->getId())
+            ->addPriceData()
+            ->getFirstItem();
+        $item->setPriceCalculation(false);
+        $this->assertEquals($specialPrice, $item->getFinalPrice());
+
+        $product->setSpecialPrice(null);
+        $product = $this->productRepository->save($product);
+        /** @var \Magento\Catalog\Model\Product $item */
+        $item = $this->collection->clear()
+            ->addIdFilter($product->getId())
+            ->addPriceData()
+            ->getFirstItem();
+        $item->setPriceCalculation(false);
+        $this->assertEquals($originalFinalPrice, $item->getFinalPrice());
+    }
+
     /**
      * Test addAttributeToSort() with attribute 'is_saleable' works properly on frontend.
      *