From 2ab7ece36dd6863ce3c4458404ceba41ae2e5892 Mon Sep 17 00:00:00 2001 From: Mark Rotteveel Date: Mon, 4 Feb 2019 12:48:24 +0100 Subject: [PATCH 1/2] 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")) From 82f33adba594b23142a6cdb6b4c81a4d6264eb82 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 12 Feb 2019 10:32:27 +0100 Subject: [PATCH 2/2] Polish "Add support for jdbc:firebird: url prefix" Closes gh-15841 --- .../main/java/org/springframework/boot/jdbc/DatabaseDriver.java | 2 +- .../java/org/springframework/boot/jdbc/DatabaseDriverTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 b232591bb0b..fbda7f2cfc2 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 the original author or authors. + * Copyright 2012-2019 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. 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 8e666bdc16f..816815b45c8 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 the original author or authors. + * Copyright 2012-2019 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.