Polish "Fix database name detection logic for MariaDB"

See gh-25173

Author: snicoll

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchDataSourceInitializer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,6 +57,9 @@ protected String getDatabaseName() {
 		if ("oracle".equals(databaseName)) {
 			return "oracle10g";
 		}
+		if ("mariadb".equals(databaseName)) {
+			return "mysql";
+		}
 		return databaseName;
 	}
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzDataSourceInitializer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,7 +62,7 @@ protected String getDatabaseName() {
 		if ("db2".equals(databaseName)) {
 			return "db2_v95";
 		}
-		if ("mysql".equals(databaseName)) {
+		if ("mysql".equals(databaseName) || "mariadb".equals(databaseName)) {
 			return "mysql_innodb";
 		}
 		if ("postgresql".equals(databaseName)) {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -71,6 +71,7 @@ public enum DatabaseDriver {
 	 * Maria DB.
 	 */
 	MARIADB("MariaDB", "org.mariadb.jdbc.Driver", "org.mariadb.jdbc.MariaDbDataSource", "SELECT 1") {
+
 		@Override
 		public String getId() {
 			return "mysql";
@@ -121,6 +122,7 @@ protected Collection<String> getUrlPrefixes() {
 	 */
 	SQLSERVER("Microsoft SQL Server", "com.microsoft.sqlserver.jdbc.SQLServerDriver",
 			"com.microsoft.sqlserver.jdbc.SQLServerXADataSource", "SELECT 1") {
+
 		@Override
 		protected boolean matchProductName(String productName) {
 			return super.matchProductName(productName) || "SQL SERVER".equalsIgnoreCase(productName);
@@ -133,6 +135,7 @@ protected boolean matchProductName(String productName) {
 	 */
 	FIREBIRD("Firebird", "org.firebirdsql.jdbc.FBDriver", "org.firebirdsql.ds.FBXADataSource",
 			"SELECT 1 FROM RDB$DATABASE") {
+
 		@Override
 		protected Collection<String> getUrlPrefixes() {
 			return Arrays.asList("firebirdsql", "firebird");
@@ -149,6 +152,7 @@ protected boolean matchProductName(String productName) {
 	 * DB2 Server.
 	 */
 	DB2("DB2", "com.ibm.db2.jcc.DB2Driver", "com.ibm.db2.jcc.DB2XADataSource", "SELECT 1 FROM SYSIBM.SYSDUMMY1") {
+
 		@Override
 		protected boolean matchProductName(String productName) {
 			return super.matchProductName(productName) || productName.toLowerCase(Locale.ENGLISH).startsWith("db2/");
@@ -160,6 +164,7 @@ protected boolean matchProductName(String productName) {
 	 */
 	DB2_AS400("DB2 UDB for AS/400", "com.ibm.as400.access.AS400JDBCDriver",
 			"com.ibm.as400.access.AS400JDBCXADataSource", "SELECT 1 FROM SYSIBM.SYSDUMMY1") {
+
 		@Override
 		public String getId() {
 			return "db2";
@@ -185,6 +190,7 @@ protected boolean matchProductName(String productName) {
 	 * Informix.
 	 */
 	INFORMIX("Informix Dynamic Server", "com.informix.jdbc.IfxDriver", null, "select count(*) from systables") {
+
 		@Override
 		protected Collection<String> getUrlPrefixes() {
 			return Arrays.asList("informix-sqli", "informix-direct");
@@ -202,6 +208,7 @@ protected Collection<String> getUrlPrefixes() {
 	 * Testcontainers.
 	 */
 	TESTCONTAINERS(null, "org.testcontainers.jdbc.ContainerDatabaseDriver") {
+
 		@Override
 		protected Collection<String> getUrlPrefixes() {
 			return Collections.singleton("tc");

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.