Merge remote-tracking branch 'l3/ACP2E-633' into PR_L3_22_04_2022

Author: veloraven

app/code/Magento/CatalogRule/Model/Indexer/IndexerTableSwapper.php

@@ -91,6 +91,7 @@ public function swapIndexTables(array $originalTablesNames)
         $toDrop = [];
         /** @var string[] $temporaryTablesRenamed */
         $temporaryTablesRenamed = [];
+        $restoreTriggerQueries = [];
         //Renaming temporary tables to original tables' names, dropping old
         //tables.
         foreach ($originalTablesNames as $tableName) {
@@ -99,6 +100,7 @@ public function swapIndexTables(array $originalTablesNames)
                 $tableName . $this->generateRandomSuffix()
             );
             $temporaryTableName = $this->getWorkingTableName($tableName);
+            $restoreTriggerQueries[] = $this->getRestoreTriggerQueries($tableName);
             $toRename[] = [
                 'oldName' => $tableName,
                 'newName' => $temporaryOriginalName,
@@ -121,6 +123,41 @@ public function swapIndexTables(array $originalTablesNames)
         foreach ($toDrop as $tableName) {
             $this->resourceConnection->getConnection()->dropTable($tableName);
         }
+
+        //Restoring triggers
+        $restoreTriggerQueries = array_merge([], ...$restoreTriggerQueries);
+        foreach ($restoreTriggerQueries as $restoreTriggerQuery) {
+            $this->resourceConnection->getConnection()->multiQuery($restoreTriggerQuery);
+        }
+    }
+
+    /**
+     * Get queries for table triggers restoring.
+     *
+     * @param string $tableName
+     * @return array
+     */
+    private function getRestoreTriggerQueries(string $tableName): array
+    {
+        $triggers = $this->resourceConnection->getConnection()
+            ->query('SHOW TRIGGERS LIKE \''. $tableName . '\'')
+            ->fetchAll();
+
+        if (!$triggers) {
+            return [];
+        }
+
+        $result = [];
+        foreach ($triggers as $trigger) {
+            // phpcs:ignore Magento2.SQL.RawQuery.FoundRawSql
+            $result[] = 'DROP TRIGGER IF EXISTS ' . $trigger['Trigger'];
+            $triggerData = $this->resourceConnection->getConnection()
+                ->query('SHOW CREATE TRIGGER '. $trigger['Trigger'])
+                ->fetch();
+            $result[]  = preg_replace('/DEFINER=[^\s]*/', '', $triggerData['SQL Original Statement']);
+        }
+
+        return $result;
     }
 
     /**

app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexerTableSwapperTest.php

@@ -48,6 +48,11 @@ protected function setUp(): void
 
         $this->adapterInterfaceMock = $this->getMockBuilder(AdapterInterface::class)
             ->getMockForAbstractClass();
+        $zendDbStatementInterfaceMock = $this->getMockBuilder(\Zend_Db_Statement_Interface::class)
+            ->getMockForAbstractClass();
+        $this->adapterInterfaceMock->expects($this->any())
+            ->method('query')
+            ->willReturn($zendDbStatementInterfaceMock);
         /** @var \Zend_Db_Statement_Interface $statementInterfaceMock */
         $this->statementInterfaceMock = $this->getMockBuilder(\Zend_Db_Statement_Interface::class)
             ->getMockForAbstractClass();

dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/IndexerBuilderTest.php

@@ -6,6 +6,8 @@
 namespace Magento\CatalogRule\Model\Indexer;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Indexer\Product\Price\Processor;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
@@ -46,6 +48,16 @@ class IndexerBuilderTest extends \PHPUnit\Framework\TestCase
      */
     private $productRepository;
 
+    /**
+     * @var ResourceConnection
+     */
+    private $connection;
+
+    /**
+     * @var Processor
+     */
+    private $indexProductProcessor;
+
     protected function setUp(): void
     {
         $this->indexerBuilder = Bootstrap::getObjectManager()->get(
@@ -55,6 +67,8 @@ protected function setUp(): void
         $this->product = Bootstrap::getObjectManager()->get(\Magento\Catalog\Model\Product::class);
         $this->storeManager = Bootstrap::getObjectManager()->get(StoreManagerInterface::class);
         $this->productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
+        $this->connection = Bootstrap::getObjectManager()->get(ResourceConnection::class);
+        $this->indexProductProcessor = Bootstrap::getObjectManager()->get(Processor::class);
     }
 
     protected function tearDown(): void
@@ -171,6 +185,45 @@ public function testReindexFull()
         $this->assertFalse($this->resourceRule->getRulePrice(new \DateTime(), 1, 1, $this->productThird->getId()));
     }
 
+    /**
+     * Tests restoring triggers on `catalogrule_product_price` table after full reindexing in 'Update by schedule' mode.
+     *
+     * @magentoDbIsolation disabled
+     * @magentoAppIsolation enabled
+     */
+    public function testRestoringTriggersAfterFullReindex()
+    {
+        $tableName = $this->connection->getTableName('catalogrule_product_price');
+
+        $this->indexProductProcessor->getIndexer()->setScheduled(false);
+        $this->assertEquals(0, $this->getTriggersCount($tableName));
+
+        $this->indexProductProcessor->getIndexer()->setScheduled(true);
+        $this->assertGreaterThan(0, $this->getTriggersCount($tableName));
+
+        $this->indexerBuilder->reindexFull();
+        $this->assertGreaterThan(0, $this->getTriggersCount($tableName));
+
+        $this->indexProductProcessor->getIndexer()->setScheduled(false);
+        $this->assertEquals(0, $this->getTriggersCount($tableName));
+    }
+
+    /**
+     * Returns triggers count.
+     *
+     * @param string $tableName
+     * @return int
+     * @throws \Zend_Db_Statement_Exception
+     */
+    private function getTriggersCount(string $tableName): int
+    {
+        return count(
+            $this->connection->getConnection()
+                ->query('SHOW TRIGGERS LIKE \''. $tableName . '\'')
+                ->fetchAll()
+        );
+    }
+
     protected function prepareProducts()
     {
         $product = $this->product->loadByAttribute('sku', 'simple');