root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '1.3.x'

This commit is contained in:
Stephane Nicoll 2016-06-09 14:17:49 +02:00
parent 091664078f ec4c8bf50d
commit 72e4064230
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBuilder.java
View File

@ -84,7 +84,10 @@ public class DataSourceBuilder {
private void bind(DataSource result) { private void bind(DataSource result) {
MutablePropertyValues properties = new MutablePropertyValues(this.properties); MutablePropertyValues properties = new MutablePropertyValues(this.properties);
new RelaxedDataBinder(result).withAlias("url", "jdbcUrl").bind(properties); new RelaxedDataBinder(result)
.withAlias("url", "jdbcUrl")
.withAlias("username", "user")
.bind(properties);
} }
public DataSourceBuilder type(Class<? extends DataSource> type) { public DataSourceBuilder type(Class<? extends DataSource> type) {