From b5e2bff1a45d22c9585b0f249fd2ee9fe032152d Mon Sep 17 00:00:00 2001
From: Vedran Pavic <vedran.pavic@gmail.com>
Date: Tue, 2 Aug 2016 17:52:38 +0200
Subject: [PATCH 1/2] Fix aliases for database names in
 `JdbcSessionDatabaseInitializer`

See gh-6354
---
 .../session/JdbcSessionDatabaseInitializer.java              | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionDatabaseInitializer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionDatabaseInitializer.java
index dbd3cbba26..96aecc69fc 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionDatabaseInitializer.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionDatabaseInitializer.java
@@ -42,8 +42,9 @@ public class JdbcSessionDatabaseInitializer {
 
 	static {
 		Map<String, String> aliases = new HashMap<String, String>();
-		aliases.put("hsql", "hsqldb");
-		aliases.put("postgres", "postgresql");
+		aliases.put("apache derby", "derby");
+		aliases.put("hsql database engine", "hsqldb");
+		aliases.put("microsoft sql server", "sqlserver");
 		ALIASES = Collections.unmodifiableMap(aliases);
 	}
 

From 90c67daec1aaac22e0c105dff4f36279e4cd232f Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Tue, 2 Aug 2016 14:19:28 -0700
Subject: [PATCH 2/2] Polish contribution

Closes gh-6534
---
 .../autoconfigure/session/JdbcSessionDatabaseInitializer.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionDatabaseInitializer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionDatabaseInitializer.java
index 96aecc69fc..a1d94dd96a 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionDatabaseInitializer.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionDatabaseInitializer.java
@@ -45,6 +45,7 @@ public class JdbcSessionDatabaseInitializer {
 		aliases.put("apache derby", "derby");
 		aliases.put("hsql database engine", "hsqldb");
 		aliases.put("microsoft sql server", "sqlserver");
+		aliases.put("postgres", "postgresql");
 		ALIASES = Collections.unmodifiableMap(aliases);
 	}