-
Notifications
You must be signed in to change notification settings - Fork 38.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Support property placeholders in @Sql script paths
Prior to this commit, paths configured via the scripts attribute in @Sql were required to be final paths without dynamic placeholders; however, being able to make script paths dependent on the current environment can be useful in certain testing scenarios. This commit introduces support for property placeholders (${...}) in @Sql script paths which will be replaced by properties available in the Environment of the test's ApplicationContext. Closes gh-33114
- Loading branch information
Showing
8 changed files
with
100 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 61 additions & 0 deletions
61
...c/test/java/org/springframework/test/context/jdbc/PropertyPlaceholderSqlScriptsTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
/* | ||
* Copyright 2002-2024 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. | ||
* You may obtain a copy of the License at | ||
* | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.springframework.test.context.jdbc; | ||
|
||
import org.junit.jupiter.api.Nested; | ||
import org.junit.jupiter.api.Test; | ||
|
||
import org.springframework.test.annotation.DirtiesContext; | ||
import org.springframework.test.context.ContextConfiguration; | ||
import org.springframework.test.context.TestPropertySource; | ||
|
||
/** | ||
* Integration tests that verify support for property placeholders in SQL script locations. | ||
* | ||
* @author Sam Brannen | ||
* @since 6.2 | ||
*/ | ||
@ContextConfiguration(classes = PopulatedSchemaDatabaseConfig.class) | ||
class PropertyPlaceholderSqlScriptsTests { | ||
|
||
private static final String SCRIPT_LOCATION = "classpath:org/springframework/test/context/jdbc/${vendor}/data.sql"; | ||
|
||
@Nested | ||
@TestPropertySource(properties = "vendor = db1") | ||
@DirtiesContext | ||
class DatabaseOneTests extends AbstractTransactionalTests { | ||
|
||
@Test | ||
@Sql(SCRIPT_LOCATION) | ||
void placeholderIsResolvedInScriptLocation() { | ||
assertUsers("Dilbert 1"); | ||
} | ||
} | ||
|
||
@Nested | ||
@TestPropertySource(properties = "vendor = db2") | ||
@DirtiesContext | ||
class DatabaseTwoTests extends AbstractTransactionalTests { | ||
|
||
@Test | ||
@Sql(SCRIPT_LOCATION) | ||
void placeholderIsResolvedInScriptLocation() { | ||
assertUsers("Dilbert 2"); | ||
} | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
spring-test/src/test/resources/org/springframework/test/context/jdbc/db1/data.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
INSERT INTO user VALUES('Dilbert 1'); |
1 change: 1 addition & 0 deletions
1
spring-test/src/test/resources/org/springframework/test/context/jdbc/db2/data.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
INSERT INTO user VALUES('Dilbert 2'); |