Merge remote-tracking branch 'origin/AC-11995' into Hammer-Platform-Health-Delivery-13Aug24

Author: glo71317

app/etc/di.xml

@@ -1858,6 +1858,7 @@
         <arguments>
             <argument name="supportedVersionPatterns" xsi:type="array">
                 <item name="MySQL-8" xsi:type="string">^8\.0\.</item>
+                <item name="MySQL-8.4" xsi:type="string">^8\.4\.</item>
                 <item name="MySQL-5.7" xsi:type="string">^5\.7\.</item>
                 <item name="MariaDB-(10.2-10.6)" xsi:type="string">^10\.[2-6]\.</item>
             </argument>

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

@@ -251,6 +251,13 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface, Rese
      */
     private $parentConnections = [];
 
+    /***
+     * Get exact version of MySQL
+     *
+     * @var string
+     */
+    private $mysqlversion;
+    
     /**
      * Constructor
      *
@@ -3069,7 +3076,11 @@ public function startSetup()
         $this->rawQuery("SET SQL_MODE=''");
         $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'");
-
+        $this->mysqlversion = $this->fetchPairs("SHOW variables LIKE 'version'")['version'] ?? '';
+        if ($this->isMysql8EngineUsed() && str_contains($this->mysqlversion, '8.4')) {
+            $this->rawQuery("SET @OLD_RESTRICT_FK_ON_NON_STANDARD_KEY=@@RESTRICT_FK_ON_NON_STANDARD_KEY");
+            $this->rawQuery("SET RESTRICT_FK_ON_NON_STANDARD_KEY=0");
+        }
         return $this;
     }
 
@@ -3082,7 +3093,9 @@ public function endSetup()
     {
         $this->rawQuery("SET SQL_MODE=IFNULL(@OLD_SQL_MODE,'')");
         $this->rawQuery("SET FOREIGN_KEY_CHECKS=IF(@OLD_FOREIGN_KEY_CHECKS=0, 0, 1)");
-
+        if ($this->isMysql8EngineUsed() && str_contains($this->mysqlversion, '8.4')) {
+            $this->rawQuery("SET RESTRICT_FK_ON_NON_STANDARD_KEY=IF(@OLD_RESTRICT_FK_ON_NON_STANDARD_KEY=0, 0, 1)");
+        }
         return $this;
     }
 

lib/internal/Magento/Framework/DB/Adapter/SqlVersionProvider.php

@@ -35,6 +35,8 @@ class SqlVersionProvider
 
     public const MARIA_DB_10_4_27_VERSION = '10.4.27';
 
+    public const MYSQL_8_4_VERSION = '8.4.';
+
     /**#@-*/
 
     /**

lib/internal/Magento/Framework/Test/Unit/DB/Adapter/SqlVersionProviderTest.php

@@ -49,6 +49,7 @@ class SqlVersionProviderTest extends TestCase
      */
     private $supportedVersionPatterns = [
         'MySQL-8' => '^8\.0\.',
+        'MySQL-8.4' => '^8\.4\.',
         'MySQL-5.7' => '^5\.7\.',
         'MariaDB-(10.2-10.6)' => '^10\.[2-6]\.'
     ];
@@ -126,6 +127,10 @@ public static function executeDataProvider(): array
                 ['version' => '8.0.19'],
                 SqlVersionProvider::MYSQL_8_0_VERSION,
             ],
+            'MySQL-8.4' => [
+                ['version' => '8.4.0'],
+                SqlVersionProvider::MYSQL_8_4_VERSION,
+            ],
             'Percona' => [
                 ['version' => '5.7.29-32'],
                 SqlVersionProvider::MYSQL_5_7_VERSION,