AC-11995:Add compatibility with MySQL 8.4 LTS for Magento CE

Author: glo17680

lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php

@@ -251,11 +251,6 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface, Rese
      */
     private $parentConnections = [];
 
-    /***
-     * const MYSQL_8_4_VERSION
-     */
-    public const MYSQL_8_4_VERSION = '8.4';
-
     /**
      * Constructor
      *
@@ -3075,10 +3070,6 @@ public function startSetup()
         $this->rawQuery("SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0");
         $this->rawQuery("SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO'");
 
-        $version = $this->fetchPairs("SHOW variables LIKE 'version'")['version'] ?? '';
-        if (str_contains($version, self::MYSQL_8_4_VERSION)) {
-            $this->rawQuery("SET RESTRICT_FK_ON_NON_STANDARD_KEY=0");
-        }
         return $this;
     }
 

setup/src/Magento/Setup/Model/Installer.php

@@ -911,10 +911,12 @@ public function installSchema(array $request)
         $setup = $this->setupFactory->create($this->context->getResources());
         $this->setupModuleRegistry($setup);
         $this->setupCoreTables($setup);
+        $this->disableRestrictFKOnNonStandardKey($setup);
         $this->cleanMemoryTables($setup);
         $this->log->logMeta('Schema creation/updates:');
         $this->declarativeInstallSchema($request);
         $this->handleDBSchemaData($setup, 'schema', $request);
+        $this->revertRestrictFKOnNonStandardKey($setup);
         /** @var Mysql $adapter */
         $adapter = $setup->getConnection();
         $schemaListener = $adapter->getSchemaListener();
@@ -1827,4 +1829,31 @@ private function setIndexerModeSchedule(): void
             $this->log->log(__("We couldn't change indexer(s)' mode because of an error: ".$e->getMessage()));
         }
     }
+
+    /***
+     * use of non-unique or partial keys as foreign keys is deprecated in MySQL8.4
+     *
+     * @param $setup
+     * @return void
+     */
+    private function disableRestrictFKOnNonStandardKey($setup): void
+    {
+        $setup->getConnection()->query("
+                SET @OLD_RESTRICT_FK_ON_NON_STANDARD_KEY=RESTRICT_FK_ON_NON_STANDARD_KEY,
+                RESTRICT_FK_ON_NON_STANDARD_KEY=0
+        ");
+    }
+
+    /***
+     * revert RESTRICT_FK_ON_NON_STANDARD_KEY to previous saved db value
+     *
+     * @param $setup
+     * @return void
+     */
+    private function revertRestrictFKOnNonStandardKey($setup): void
+    {
+        $setup->getConnection()->query("
+            SET RESTRICT_FK_ON_NON_STANDARD_KEY=IF(@OLD_RESTRICT_FK_ON_NON_STANDARD_KEY=0, 0, 1)"
+        );
+    }
 }