ACP2E-3230: Modifying column length via db_schema.xml doesn't work in case of foreign keys

Author: o-iegorov

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

@@ -9,6 +9,7 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\ConnectionException;
 use Magento\Framework\DB\Adapter\SqlVersionProvider;
+use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaWriterInterface;
 use Magento\Framework\Setup\Declaration\Schema\Db\Statement;
 use Magento\Framework\Setup\Declaration\Schema\Db\StatementAggregator;
@@ -298,25 +299,7 @@ public function compile(StatementAggregator $statementAggregator, $dryRun)
                     )
                 );
             } else {
-                if ($this->isNeedToSplitSql()) {
-                    foreach ($statementsSql as $statementSql) {
-                        $adapter->query(
-                            sprintf(
-                                $this->statementDirectives[$statement->getType()],
-                                $adapter->quoteIdentifier($statement->getTableName()),
-                                $statementSql
-                            )
-                        );
-                    }
-                } else {
-                    $adapter->query(
-                        sprintf(
-                            $this->statementDirectives[$statement->getType()],
-                            $adapter->quoteIdentifier($statement->getTableName()),
-                            implode(", ", $statementsSql)
-                        )
-                    );
-                }
+                $this->doQuery($adapter, $statementsSql, $statement);
                 //Do post update, like SQL DML operations or etc...
                 foreach ($statement->getTriggers() as $trigger) {
                     call_user_func($trigger);
@@ -339,12 +322,66 @@ private function isNeedToSplitSql() : bool
         return str_contains($this->sqlVersionProvider->getSqlVersion(), SqlVersionProvider::MARIA_DB_10_VERSION);
     }
 
+    /**
+     * Perform queries based on statements
+     *
+     * @param AdapterInterface $adapter
+     * @param array $statementsSql
+     * @param Statement $statement
+     * @return void
+     * @throws ConnectionException
+     */
+    private function doQuery(
+        AdapterInterface $adapter,
+        array $statementsSql,
+        Statement $statement
+    ) : void {
+        if ($this->isNeedToSplitSql()) {
+            $canBeCombinedStatements = [];
+            $separatedStatements = [];
+            foreach ($statementsSql as $statementSql) {
+                if (str_contains($statementSql, 'FOREIGN KEY')) {
+                    $separatedStatements[] = $statementSql;
+                } else {
+                    $canBeCombinedStatements[] = $statementSql;
+                }
+            }
+            if (!empty($canBeCombinedStatements)) {
+                $adapter->query(
+                    sprintf(
+                        $this->statementDirectives[$statement->getType()],
+                        $adapter->quoteIdentifier($statement->getTableName()),
+                        implode(", ", $canBeCombinedStatements)
+                    )
+                );
+            }
+            foreach ($separatedStatements as $separatedStatement) {
+                $adapter->query(
+                    sprintf(
+                        $this->statementDirectives[$statement->getType()],
+                        $adapter->quoteIdentifier($statement->getTableName()),
+                        $separatedStatement
+                    )
+                );
+            }
+        } else {
+            $adapter->query(
+                sprintf(
+                    $this->statementDirectives[$statement->getType()],
+                    $adapter->quoteIdentifier($statement->getTableName()),
+                    implode(", ", $statementsSql)
+                )
+            );
+        }
+    }
+
     /**
      * Retrieve next value for AUTO_INCREMENT column.
      *
      * @param string $tableName
      * @param string $resource
      * @return int
+     * @throws \Zend_Db_Statement_Exception
      */
     private function getNextAutoIncrementValue(string $tableName, string $resource): int
     {
@@ -359,6 +396,5 @@ private function getNextAutoIncrementValue(string $tableName, string $resource):
         } else {
             return 1;
         }
-
     }
 }