fix(mysql): fix server version regex

itoussies · itoussies · commit 9c987e87cf3b · 2025-06-04T10:24:04.000+02:00
Refs:CTOR-1562
diff --git a/src/database/mysql/dbi.pm b/src/database/mysql/dbi.pm
@@ -36,9 +36,8 @@ sub set_version {
 
     $self->{is_mariadb} = 0;
     $self->{version} = $self->{instance}->get_info(18); # SQL_DBMS_VER
-    # MariaDB: 5.5.5-10.1.36-MariaDB or 10.1.36-MariaDB
-    if ($self->{version} =~ /([0-9\.]*?)-MariaDB/i) {
-        $self->{version} = $1;
+    # MariaDB: 5.5.5-10.1.36-MariaDB, 10.1.36-MariaDB or 11.4.4-2-MariaDB-enterprise-log
+    if ($self->{version} =~ /(?:\d\.\d\.\d-)?(\d+\.\d+\.\d+).*MariaDB/i) {
         $self->{is_mariadb} = 1;
     }
 }
diff --git a/src/database/mysql/mysqlcmd.pm b/src/database/mysql/mysqlcmd.pm
@@ -209,8 +209,8 @@ sub set_version {
 
     $self->{is_mariadb} = 0;
     $self->{version} = $options{version};
-    # MariaDB: 5.5.5-10.1.36-MariaDB or 10.1.36-MariaDB
-    if ($self->{version} =~ /([0-9\.]*?)-MariaDB/i) {
+    # MariaDB: 5.5.5-10.1.36-MariaDB, 10.1.36-MariaDB or 11.4.4-2-MariaDB-enterprise-log
+    if ($self->{version} =~ /(?:\d\.\d\.\d-)?(\d+\.\d+\.\d+).*MariaDB/i) {
         $self->{version} = $1;
         $self->{is_mariadb} = 1;
     }

Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,8 @@ sub set_version {`
`36`	`36`
`37`	`37`	`$self->{is_mariadb} = 0;`
`38`	`38`	`$self->{version} = $self->{instance}->get_info(18); # SQL_DBMS_VER`
`39`		`- # MariaDB: 5.5.5-10.1.36-MariaDB or 10.1.36-MariaDB`
`40`		`- if ($self->{version} =~ /([0-9\.]*?)-MariaDB/i) {`
`41`		`- $self->{version} = $1;`
	`39`	`+ # MariaDB: 5.5.5-10.1.36-MariaDB, 10.1.36-MariaDB or 11.4.4-2-MariaDB-enterprise-log`
	`40`	`+ if ($self->{version} =~ /(?:\d\.\d\.\d-)?(\d+\.\d+\.\d+).*MariaDB/i) {`
`42`	`41`	`$self->{is_mariadb} = 1;`
`43`	`42`	`}`
`44`	`43`	`}`