Merge branch '1.5.x'

Author: snicoll

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpoint.java

@@ -32,6 +32,7 @@
 import org.springframework.boot.actuate.endpoint.LiquibaseEndpoint.LiquibaseReport;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 /**
  * {@link Endpoint} to expose liquibase info.
@@ -67,6 +68,10 @@ public List<LiquibaseReport> invoke() {
 				try {
 					Database database = factory
 							.findCorrectDatabaseImplementation(connection);
+					String defaultSchema = entry.getValue().getDefaultSchema();
+					if (StringUtils.hasText(defaultSchema)) {
+						database.setDefaultSchemaName(defaultSchema);
+					}
 					reports.add(new LiquibaseReport(entry.getKey(),
 							service.queryDatabaseChangeLogTable(database)));
 				}

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpointTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -19,8 +19,10 @@
 import liquibase.integration.spring.SpringLiquibase;
 import org.junit.Test;
 
-import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
+import org.springframework.boot.test.util.TestPropertyValues;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -44,8 +46,20 @@ public void invoke() throws Exception {
 		assertThat(getEndpointBean().invoke()).hasSize(1);
 	}
 
+	@Test
+	public void invokeWithCustomSchema() throws Exception {
+		this.context = new AnnotationConfigApplicationContext();
+		TestPropertyValues.of("liquibase.default-schema=CUSTOMSCHEMA",
+				"spring.datasource.generate-unique-name=true",
+				"spring.datasource.schema=classpath:/db/create-custom-schema.sql")
+				.applyTo(this.context);
+		this.context.register(Config.class);
+		this.context.refresh();
+		assertThat(getEndpointBean().invoke()).hasSize(1);
+	}
+
 	@Configuration
-	@Import({ EmbeddedDataSourceConfiguration.class, LiquibaseAutoConfiguration.class })
+	@Import({ DataSourceAutoConfiguration.class, LiquibaseAutoConfiguration.class })
 	public static class Config {
 
 		private final SpringLiquibase liquibase;

spring-boot-actuator/src/test/resources/db/create-custom-schema.sql

@@ -0,0 +1 @@
+CREATE SCHEMA CUSTOMSCHEMA;