Skip to content

Commit 4864919

Browse files
committed
Fix schema file name for Batch auto-configuration tests
Closes gh-29648
1 parent 080de85 commit 4864919

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -227,7 +227,7 @@ void testRenamePrefix() {
227227
.withUserConfiguration(TestConfiguration.class, EmbeddedDataSourceConfiguration.class,
228228
HibernateJpaAutoConfiguration.class)
229229
.withPropertyValues("spring.datasource.generate-unique-name=true",
230-
"spring.batch.jdbc.schema:classpath:batch/custom-schema-hsql.sql",
230+
"spring.batch.jdbc.schema:classpath:batch/custom-schema.sql",
231231
"spring.batch.jdbc.tablePrefix:PREFIX_")
232232
.run(assertCustomTablePrefix());
233233
}
@@ -239,8 +239,7 @@ void testRenamePrefixWithDeprecatedProperty() {
239239
.withUserConfiguration(TestConfiguration.class, EmbeddedDataSourceConfiguration.class,
240240
HibernateJpaAutoConfiguration.class)
241241
.withPropertyValues("spring.datasource.generate-unique-name=true",
242-
"spring.batch.schema:classpath:batch/custom-schema-hsql.sql",
243-
"spring.batch.tablePrefix:PREFIX_")
242+
"spring.batch.schema:classpath:batch/custom-schema.sql", "spring.batch.tablePrefix:PREFIX_")
244243
.run(assertCustomTablePrefix());
245244
}
246245

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationWithoutJpaTests.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -75,7 +75,7 @@ void jdbcWithDefaultSettings() {
7575
void jdbcWithCustomPrefix() {
7676
this.contextRunner.withUserConfiguration(DefaultConfiguration.class, EmbeddedDataSourceConfiguration.class)
7777
.withPropertyValues("spring.datasource.generate-unique-name=true",
78-
"spring.batch.jdbc.schema:classpath:batch/custom-schema-hsql.sql",
78+
"spring.batch.jdbc.schema:classpath:batch/custom-schema.sql",
7979
"spring.batch.jdbc.tablePrefix:PREFIX_")
8080
.run(assertCustomPrefix());
8181
}
@@ -85,8 +85,7 @@ void jdbcWithCustomPrefix() {
8585
void jdbcWithCustomPrefixWithDeprecatedProperties() {
8686
this.contextRunner.withUserConfiguration(DefaultConfiguration.class, EmbeddedDataSourceConfiguration.class)
8787
.withPropertyValues("spring.datasource.generate-unique-name=true",
88-
"spring.batch.schema:classpath:batch/custom-schema-hsql.sql",
89-
"spring.batch.tablePrefix:PREFIX_")
88+
"spring.batch.schema:classpath:batch/custom-schema.sql", "spring.batch.tablePrefix:PREFIX_")
9089
.run(assertCustomPrefix());
9190
}
9291

spring-boot-project/spring-boot-autoconfigure/src/test/resources/batch/custom-schema-hsql.sql renamed to spring-boot-project/spring-boot-autoconfigure/src/test/resources/batch/custom-schema.sql

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
-- Autogenerated: do not edit this file
2-
31
CREATE TABLE PREFIX_JOB_INSTANCE (
42
JOB_INSTANCE_ID BIGINT IDENTITY NOT NULL PRIMARY KEY ,
53
VERSION BIGINT ,

0 commit comments

Comments
 (0)