Merge branch 'ACP2E-1882' of https://github.com/magento-l3/magento2ce into PR-L3-2023-05-11

Author: vkolesny

app/code/Magento/Backup/Model/ResourceModel/Db.php

@@ -301,7 +301,7 @@ public function rollBackTransaction()
      */
     public function runCommand($command)
     {
-        $this->connection->query($command);
+        $this->connection->multiQuery($command);
         return $this;
     }
 }

dev/tests/integration/testsuite/Magento/Framework/Backup/DbTest.php

@@ -7,11 +7,12 @@
 namespace Magento\Framework\Backup;
 
 use Magento\Backup\Helper\Data;
+use Magento\Backup\Model\ResourceModel\Db;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Module\Setup;
 use Magento\TestFramework\Helper\Bootstrap;
-use PHPUnit\Framework\TestCase;
+use Magento\Framework\Backup\BackupInterface;
 
 /**
  * Provide tests for \Magento\Framework\Backup\Db.
@@ -32,16 +33,17 @@ public static function setUpBeforeClass(): void
     }
 
     /**
-     * Test db backup includes triggers.
+     * Test db backup and rollback including triggers.
      *
      * @magentoConfigFixture default/system/backup/functionality_enabled 1
      * @magentoDataFixture Magento/Framework/Backup/_files/trigger.php
      * @magentoDbIsolation disabled
      */
-    public function testBackupIncludesCustomTriggers()
+    public function testBackupAndRollbackIncludesCustomTriggers()
     {
         $helper = Bootstrap::getObjectManager()->get(Data::class);
         $time = time();
+        /** BackupInterface $backupManager */
         $backupManager = Bootstrap::getObjectManager()->get(Factory::class)->create(
             Factory::TYPE_DB
         )->setBackupExtension(
@@ -60,6 +62,12 @@ public function testBackupIncludesCustomTriggers()
             '/CREATE  TRIGGER `?test_custom_trigger`? AFTER INSERT ON `?'. $tableName . '`? FOR EACH ROW/',
             $content
         );
+
+        // Test rollback
+        $backupResourceModel = Bootstrap::getObjectManager()->get(Db::class);
+        $backupManager->setResourceModel($backupResourceModel);
+        $backupManager->rollback();
+
         //Clean up.
         $write->delete('/backups/' . $time . '_db_testbackup.sql');
     }

lib/internal/Magento/Framework/Backup/Filesystem/Iterator/File.php

@@ -19,6 +19,13 @@ class File extends \SplFileObject
      */
     protected $_currentStatement = '';
 
+    /**
+     * Store current statement delimiter.
+     *
+     * @var string
+     */
+    private string $statementDelimiter = ';';
+
     /**
      * Return current sql statement
      *
@@ -41,15 +48,35 @@ public function next()
         $this->_currentStatement = '';
         while (!$this->eof()) {
             $line = $this->fgets();
-            if (strlen(trim($line))) {
-                $this->_currentStatement .= $line;
-                if ($this->_isLineLastInCommand($line)) {
+            $trimmedLine = trim($line);
+            if (!empty($trimmedLine) && !$this->isDelimiterChanged($trimmedLine)) {
+                $statementFinalLine = '/(?<statement>.*)' . preg_quote($this->statementDelimiter, '/') . '$/';
+                if (preg_match($statementFinalLine, $trimmedLine, $matches)) {
+                    $this->_currentStatement .= $matches['statement'];
                     break;
+                } else {
+                    $this->_currentStatement .= $line;
                 }
             }
         }
     }
 
+    /**
+     * Check whether statement delimiter has been changed.
+     *
+     * @param string $line
+     * @return bool
+     */
+    private function isDelimiterChanged(string $line): bool
+    {
+        if (preg_match('/^delimiter\s+(?<delimiter>.+)$/i', $line, $matches)) {
+            $this->statementDelimiter = $matches['delimiter'];
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Return to first statement
      *
@@ -72,26 +99,4 @@ protected function _isComment($line)
     {
         return $line[0] == '#' || ($line && substr($line, 0, 2) == '--');
     }
-
-    /**
-     * Check is line a last in sql command
-     *
-     * @param string $line
-     * @return bool
-     */
-    protected function _isLineLastInCommand($line)
-    {
-        $cleanLine = trim($line);
-        $lineLength = strlen($cleanLine);
-
-        $returnResult = false;
-        if ($lineLength > 0) {
-            $lastSymbolIndex = $lineLength - 1;
-            if ($cleanLine[$lastSymbolIndex] == ';') {
-                $returnResult = true;
-            }
-        }
-
-        return $returnResult;
-    }
 }