exclude mariaDB from database queue support for new SKIP LOCKED

themsaid · themsaid · commit fff96e7df7de · 2020-02-20T12:45:58.000+02:00
diff --git a/src/Illuminate/Queue/DatabaseQueue.php b/src/Illuminate/Queue/DatabaseQueue.php
@@ -234,7 +234,7 @@ protected function getLockForPopping()
         $databaseEngine = $this->database->getPdo()->getAttribute(PDO::ATTR_DRIVER_NAME);
         $databaseVersion = $this->database->getPdo()->getAttribute(PDO::ATTR_SERVER_VERSION);
 
-        if ($databaseEngine == 'mysql' && version_compare($databaseVersion, '8.0.1', '>=') ||
+        if ($databaseEngine == 'mysql' && ! strpos($databaseVersion, 'MariaDB') && version_compare($databaseVersion, '8.0.1', '>=') ||
             $databaseEngine == 'pgsql' && version_compare($databaseVersion, '9.5', '>=')) {
             return 'FOR UPDATE SKIP LOCKED';
         }

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ protected function getLockForPopping()`
`234`	`234`	`$databaseEngine = $this->database->getPdo()->getAttribute(PDO::ATTR_DRIVER_NAME);`
`235`	`235`	`$databaseVersion = $this->database->getPdo()->getAttribute(PDO::ATTR_SERVER_VERSION);`
`236`	`236`
`237`		`- if ($databaseEngine == 'mysql' && version_compare($databaseVersion, '8.0.1', '>=') \|\|`
	`237`	`+ if ($databaseEngine == 'mysql' && ! strpos($databaseVersion, 'MariaDB') && version_compare($databaseVersion, '8.0.1', '>=') \|\|`
`238`	`238`	`$databaseEngine == 'pgsql' && version_compare($databaseVersion, '9.5', '>=')) {`
`239`	`239`	`return 'FOR UPDATE SKIP LOCKED';`
`240`	`240`	`}`