Skip to content

LiquibaseEndpoint always uses defaultSchema instead of liquibaseSchema #47300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
+23 −3
Closed

LiquibaseEndpoint always uses defaultSchema instead of liquibaseSchema #47300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
405c2c3
Fix LiquibaseEndpoint to respect liquibase-schema property
xyraclius Sep 23, 2025
e1293de
Merge branch 'spring-projects:main' into 47290
xyraclius Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions ...iquibase/src/main/java/org/springframework/boot/liquibase/endpoint/LiquibaseEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
* {@link Endpoint @Endpoint} to expose liquibase info.
*
* @author Eddú Meléndez
* @author Nabil Fawwaz Elqayyim
* @since 4.0.0
*/
@Endpoint(id = "liquibase")
Expand Down Expand Up @@ -80,9 +81,12 @@ private LiquibaseBeanDescriptor createReport(SpringLiquibase liquibase, Database
Database database = null;
try {
database = factory.findCorrectDatabaseImplementation(connection);
String defaultSchema = liquibase.getDefaultSchema();
if (StringUtils.hasText(defaultSchema)) {
database.setDefaultSchemaName(defaultSchema);
String schemaToUse = liquibase.getLiquibaseSchema();
if (!StringUtils.hasText(schemaToUse)) { // Use liquibase-schema if set, otherwise fall back to default-schema
schemaToUse = liquibase.getDefaultSchema();
}
if (StringUtils.hasText(schemaToUse)) {
database.setDefaultSchemaName(schemaToUse);
}
database.setDatabaseChangeLogTableName(liquibase.getDatabaseChangeLogTable());
database.setDatabaseChangeLogLockTableName(liquibase.getDatabaseChangeLogLockTable());
Expand Down
16 changes: 16 additions & 0 deletions ...test/java/org/springframework/boot/liquibase/actuate/endpoint/LiquibaseEndpointTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
* @author Andy Wilkinson
* @author Stephane Nicoll
* @author Leo Li
* @author Nabil Fawwaz Elqayyim
*/
@WithResource(name = "db/changelog/db.changelog-master.yaml", content = """
databaseChangeLog:
Expand Down Expand Up @@ -120,6 +121,21 @@ void invokeWithCustomTables() {
});
}

@Test
@WithResource(name = "db/create-custom-schema.sql", content = "CREATE SCHEMA LIQUIBASE_SCHEMA;")
void invokeWithLiquibaseSchema() {
this.contextRunner.withUserConfiguration(Config.class, DataSourceWithSchemaConfiguration.class)
.withPropertyValues("spring.liquibase.liquibase-schema=LIQUIBASE_SCHEMA")
.run((context) -> {
Map<String, LiquibaseBeanDescriptor> liquibaseBeans = context.getBean(LiquibaseEndpoint.class)
.liquibaseBeans()
.getContexts()
.get(context.getId())
.getLiquibaseBeans();
assertThat(liquibaseBeans.get("liquibase").getChangeSets()).hasSize(1);
});
}

@Test
void connectionAutoCommitPropertyIsReset() {
this.contextRunner.withUserConfiguration(Config.class).run((context) -> {
Expand Down