Fix code to address different connection strings for MariaDB (#39374)

As per noted in #39311
laravel · Oct 26, 2021 · b9fc4df · b9fc4df
1 parent 07fe597
commit b9fc4df
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Illuminate/Queue/DatabaseQueue.php b/src/Illuminate/Queue/DatabaseQueue.php
@@ -256,8 +256,8 @@ protected function getLockForPopping()
         $databaseVersion = $this->database->getConfig('version') ??
                            $this->database->getPdo()->getAttribute(PDO::ATTR_SERVER_VERSION);
 
-        if (($databaseEngine === 'mysql' && version_compare($databaseVersion, '8.0.1', '>=')) ||
-            (strpos($databaseVersion, 'MariaDB') && version_compare(Str::after($databaseVersion, '-'), '10.6.0', '>=')) ||
+        if (($databaseEngine === 'mysql' && ! strpos($databaseVersion, 'MariaDB') && version_compare($databaseVersion, '8.0.1', '>=')) ||
+            (strpos($databaseVersion, 'MariaDB') && version_compare(Str::after($databaseVersion, '5.5.5-'), '10.6.0', '>=')) ||
             ($databaseEngine === 'pgsql' && version_compare($databaseVersion, '9.5', '>='))) {
             return 'FOR UPDATE SKIP LOCKED';
         }