From 2ab7ece36dd6863ce3c4458404ceba41ae2e5892 Mon Sep 17 00:00:00 2001 From: Mark Rotteveel Date: Mon, 4 Feb 2019 12:48:24 +0100 Subject: [PATCH] Add support for jdbc:firebird: url prefix See gh-15841 --- .../main/java/org/springframework/boot/jdbc/DatabaseDriver.java | 2 +- .../java/org/springframework/boot/jdbc/DatabaseDriverTests.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java index 473e1628d36..b232591bb0b 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java @@ -140,7 +140,7 @@ public enum DatabaseDriver { @Override protected Collection getUrlPrefixes() { - return Collections.singleton("firebirdsql"); + return Arrays.asList("firebirdsql", "firebird"); } @Override diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverTests.java index 92d538334b3..8e666bdc16f 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverTests.java @@ -129,6 +129,8 @@ public class DatabaseDriverTests { .isEqualTo(DatabaseDriver.SQLSERVER); assertThat(DatabaseDriver.fromJdbcUrl("jdbc:firebirdsql://localhost/sample")) .isEqualTo(DatabaseDriver.FIREBIRD); + assertThat(DatabaseDriver.fromJdbcUrl("jdbc:firebird://localhost/sample")) + .isEqualTo(DatabaseDriver.FIREBIRD); assertThat(DatabaseDriver.fromJdbcUrl("jdbc:db2://localhost:50000/sample ")) .isEqualTo(DatabaseDriver.DB2); assertThat(DatabaseDriver.fromJdbcUrl("jdbc:as400://localhost"))