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

Author: glo17680

dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeInstallerTest.php

@@ -208,6 +208,8 @@ public function testInstallationWithConstraintsModification()
             ['Magento_TestSetupDeclarationModule1']
         );
         $this->updateDbSchemaRevision('constraint_modifications');
+        $adapter = $this->resourceConnection->getConnection("default");
+        $adapter->query("SET @OLD_RESTRICT_FK_ON_NON_STANDARD_KEY=@@GLOBAL.RESTRICT_FK_ON_NON_STANDARD_KEY, @@GLOBAL.RESTRICT_FK_ON_NON_STANDARD_KEY=0");
         $this->cliCommand->upgrade();
 
         $diff = $this->schemaDiff->diff(
@@ -217,6 +219,7 @@ public function testInstallationWithConstraintsModification()
         self::assertNull($diff->getAll());
         $shardData = $this->describeTable->describeShard(Sharding::DEFAULT_CONNECTION);
         $this->assertTableCreationStatements($this->getTrimmedData(), $shardData);
+        $adapter->query("SET @@GLOBAL.RESTRICT_FK_ON_NON_STANDARD_KEY=IF(@OLD_RESTRICT_FK_ON_NON_STANDARD_KEY=0, 0, 1)");
     }
 
     /**

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

@@ -910,16 +910,10 @@ public function installSchema(array $request)
         $this->assertDbAccessible();
         $setup = $this->setupFactory->create($this->context->getResources());
         $this->setupModuleRegistry($setup);
-
-        $this->disableRestrictFKOnNonStandardKey($setup);
-
         $this->setupCoreTables($setup);
         $this->cleanMemoryTables($setup);
         $this->log->logMeta('Schema creation/updates:');
         $this->declarativeInstallSchema($request);
-
-        $this->revertRestrictFKOnNonStandardKey($setup);
-
         $this->handleDBSchemaData($setup, 'schema', $request);
         /** @var Mysql $adapter */
         $adapter = $setup->getConnection();
@@ -1833,31 +1827,4 @@ 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=@@GLOBAL.RESTRICT_FK_ON_NON_STANDARD_KEY,
-                @@GLOBAL.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 @@GLOBAL.RESTRICT_FK_ON_NON_STANDARD_KEY=IF(@OLD_RESTRICT_FK_ON_NON_STANDARD_KEY=0, 0, 1)"
-//        );
-    }
 }