From a7433d795a48bbd867bbccd6477f445154591bfd Mon Sep 17 00:00:00 2001 From: Henryk Konsek Date: Mon, 13 May 2019 16:06:01 +0200 Subject: [PATCH 1/2] Added AWS Redshift driver to DatabaseDriver enum. --- .../java/org/springframework/boot/jdbc/DatabaseDriver.java | 5 +++++ 1 file changed, 5 insertions(+) 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 cf94a912abea..f16cf61a4060 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 @@ -99,6 +99,11 @@ public String getId() { POSTGRESQL("PostgreSQL", "org.postgresql.Driver", "org.postgresql.xa.PGXADataSource", "SELECT 1"), + /** + * AWS Redshift. + */ + REDSHIFT("Amazon Redshift", "com.amazon.redshift.jdbc.Driver", null, "SELECT 1"), + /** * HANA - SAP HANA Database - HDB. * @since 2.1.0 From 4aa1a0eb79fdce10f42c773e9d71ae86fdc6af35 Mon Sep 17 00:00:00 2001 From: Henryk Konsek Date: Mon, 13 May 2019 16:19:32 +0200 Subject: [PATCH 2/2] Addded Redshift DB driver tests. --- .../org/springframework/boot/jdbc/DatabaseDriverTests.java | 5 +++++ 1 file changed, 5 insertions(+) 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 da1067b6d836..ebb62d940dd9 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 @@ -81,6 +81,8 @@ public void databaseProductNameLookups() { .isEqualTo(DatabaseDriver.ORACLE); assertThat(DatabaseDriver.fromProductName("PostgreSQL")) .isEqualTo(DatabaseDriver.POSTGRESQL); + assertThat(DatabaseDriver.fromProductName("Amazon Redshift")) + .isEqualTo(DatabaseDriver.REDSHIFT); assertThat(DatabaseDriver.fromProductName("Microsoft SQL Server")) .isEqualTo(DatabaseDriver.SQLSERVER); assertThat(DatabaseDriver.fromProductName("SQL SERVER")) @@ -120,6 +122,9 @@ public void databaseJdbcUrlLookups() { .isEqualTo(DatabaseDriver.ORACLE); assertThat(DatabaseDriver.fromJdbcUrl("jdbc:postgresql://127.0.0.1:5432/sample")) .isEqualTo(DatabaseDriver.POSTGRESQL); + assertThat(DatabaseDriver.fromJdbcUrl( + "jdbc:redshift://foo.bar.us-east-1.redshift.amazonaws.com:5439/postgres")) + .isEqualTo(DatabaseDriver.REDSHIFT); assertThat( DatabaseDriver.fromJdbcUrl("jdbc:jtds:sqlserver://127.0.0.1:1433/sample")) .isEqualTo(DatabaseDriver.JTDS);