Skip to content

Treat MariaDB as an independent database type #28355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Treat MariaDB as an independent database type #28355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2022 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.
Expand Down Expand Up @@ -49,6 +49,7 @@
*
* @author Thomas Risberg
* @author Juergen Hoeller
* @author Ben Blinebury
*/
public abstract class JdbcUtils {

Expand Down Expand Up @@ -455,9 +456,6 @@ public static String commonDatabaseName(@Nullable String source) {
if (source != null && source.startsWith("DB2")) {
name = "DB2";
}
else if ("MariaDB".equals(source)) {
name = "MySQL";
}
else if ("Sybase SQL Server".equals(source) ||
"Adaptive Server Enterprise".equals(source) ||
"ASE".equals(source) ||
Expand Down
4 changes: 3 additions & 1 deletion spring-jdbc/src/test/java/org/springframework/jdbc/support/JdbcUtilsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2022 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.
Expand Down Expand Up @@ -27,6 +27,7 @@
*
* @author Thomas Risberg
* @author Juergen Hoeller
* @author Ben Blinebury
*/
public class JdbcUtilsTests {

Expand All @@ -37,6 +38,7 @@ public void commonDatabaseName() {
assertThat(JdbcUtils.commonDatabaseName("Sybase SQL Server")).isEqualTo("Sybase");
assertThat(JdbcUtils.commonDatabaseName("Adaptive Server Enterprise")).isEqualTo("Sybase");
assertThat(JdbcUtils.commonDatabaseName("MySQL")).isEqualTo("MySQL");
assertThat(JdbcUtils.commonDatabaseName("MariaDB")).isEqualTo("MariaDB");
}

@Test
Expand Down