MC-36472: Can't upgrade from 2.3.x CE (with MySQL, PHP 7.2, Mysql 5.7 as db engine) to 2.4 B2B (ES7, PHP 7.4, Mysql 8 as db engine) [Module:Magento_CatalogStaging]

Author: viktorpetryk

lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DbSchemaWriterInterface.php

@@ -30,9 +30,9 @@ interface DbSchemaWriterInterface
     /**
      * Create table from SQL fragments, like columns, constraints, foreign keys, indexes, etc.
      *
-     * @param $tableName
-     * @param $resource
-     * @param  array $definition
+     * @param string $tableName
+     * @param string $resource
+     * @param array $definition
      * @param array $options
      * @return Statement
      */
@@ -62,7 +62,7 @@ public function dropTable($tableName, $resource);
     public function addElement($elementName, $resource, $tableName, $elementDefinition, $elementType);
 
     /**
-     * Return statements which reset auto_increment to 1.
+     * Return statements which reset auto_increment to the current maximum AUTO_INCREMENT column value plus one.
      *
      * @param string $tableName
      * @param string $resource
@@ -78,7 +78,7 @@ public function resetAutoIncrement($tableName, $resource);
      * @param string $columnName
      * @param string $resource
      * @param string $tableName
-     * @param  string $columnDefinition
+     * @param string $columnDefinition
      * @return Statement
      */
     public function modifyColumn($columnName, $resource, $tableName, $columnDefinition);

lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DbSchemaWriter.php

@@ -250,7 +250,9 @@ public function dropElement($resource, $elementName, $tableName, $type)
      */
     public function resetAutoIncrement($tableName, $resource)
     {
-        $sql = 'AUTO_INCREMENT = 1';
+        $autoIncrementValue = $this->getNextAutoIncrementValue($tableName, $resource);
+        $sql = "AUTO_INCREMENT = {$autoIncrementValue}";
+
         return $this->statementFactory->create(
             sprintf('RESET_AUTOINCREMENT_%s', $tableName),
             $tableName,
@@ -300,4 +302,21 @@ public function compile(StatementAggregator $statementAggregator, $dryRun)
             }
         }
     }
+
+    /**
+     * Retrieve next value for AUTO_INCREMENT column.
+     *
+     * @param string $tableName
+     * @param string $resource
+     * @return int
+     */
+    private function getNextAutoIncrementValue(string $tableName, string $resource): int
+    {
+        $adapter = $this->resourceConnection->getConnection($resource);
+        $sql = sprintf('SELECT MAX(`%s`) + 1 FROM `%s`', $adapter->getAutoIncrementField($tableName), $tableName);
+        $adapter->resetDdlCache($tableName);
+        $stmt = $adapter->query($sql);
+
+        return (int)$stmt->fetchColumn();
+    }
 }

lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/AddColumn.php

@@ -25,7 +25,7 @@
 class AddColumn implements OperationInterface
 {
     /**
-     * Operation name.
+     * The name of the operation.
      */
     const OPERATION_NAME = 'add_column';
 
@@ -196,7 +196,7 @@ public function doOperation(ElementHistory $elementHistory)
          */
         $element = $elementHistory->getNew();
         $definition = $this->definitionAggregator->toDefinition($element);
-        
+
         $statement = $this->dbSchemaWriter->addElement(
             $element->getName(),
             $element->getTable()->getResource(),
@@ -207,7 +207,7 @@ public function doOperation(ElementHistory $elementHistory)
         $statements = $this->setupTriggersIfExists($statement, $elementHistory);
 
         if ($this->columnIsAutoIncrement($element)) {
-            /** We need to reset auto_increment as new field should goes from 1 */
+            /** We need to reset auto_increment to the current maximum value + one */
             $statements[] = $this->dbSchemaWriter->resetAutoIncrement(
                 $element->getTable()->getName(),
                 $element->getTable()->getResource()