Spring/spring-data-relational
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrades MySql for testing to 8.0.24.

Browse Source 
This version of the docker container doesn't allow to use `root` as the database user name.
We still have to connect as `root` so we can create alternative schemata.
This commit is contained in:
Jens Schauder
2021-05-05 16:03:42 +02:00
parent fc8acde7a0
commit 91ca16ffef
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/MySqlDataSourceConfiguration.java
View File

@@ -52,9 +52,9 @@ class MySqlDataSourceConfiguration extends DataSourceConfiguration {
if (MYSQL_CONTAINER == null) {
MySQLContainer<?> container = new MySQLContainer<>()
.withUsername("root")
.withPassword("")
MySQLContainer<?> container = new MySQLContainer<>("mysql:8.0.24")
.withUsername("test")
.withPassword("test")
.withConfigurationOverride("");
container.start();
@@ -64,7 +64,7 @@ class MySqlDataSourceConfiguration extends DataSourceConfiguration {
MysqlDataSource dataSource = new MysqlDataSource();
dataSource.setUrl(MYSQL_CONTAINER.getJdbcUrl());
dataSource.setUser(MYSQL_CONTAINER.getUsername());
dataSource.setUser("root");
dataSource.setPassword(MYSQL_CONTAINER.getPassword());
dataSource.setDatabaseName(MYSQL_CONTAINER.getDatabaseName());
@@ -79,4 +79,15 @@ class MySqlDataSourceConfiguration extends DataSourceConfiguration {
new ByteArrayResource("DROP DATABASE test;CREATE DATABASE test;".getBytes()));
}
}
private DataSource createRootDataSource() {
MysqlDataSource dataSource = new MysqlDataSource();
dataSource.setUrl(MYSQL_CONTAINER.getJdbcUrl());
dataSource.setUser("root");
dataSource.setPassword(MYSQL_CONTAINER.getPassword());
dataSource.setDatabaseName(MYSQL_CONTAINER.getDatabaseName());
return dataSource;
}
}