Browse Source
Remove MySQL support as the MySQL driver is not yet published. Update groupId for Postgres driver to org.postgresql. See #710pull/1188/head
Mark Paluch
4 years ago
9 changed files with 46 additions and 406 deletions
@ -1,137 +0,0 @@
@@ -1,137 +0,0 @@
|
||||
/* |
||||
* Copyright 2019-2021 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.data.r2dbc.repository; |
||||
|
||||
import io.r2dbc.spi.ConnectionFactory; |
||||
import lombok.AllArgsConstructor; |
||||
import lombok.Data; |
||||
import reactor.core.publisher.Flux; |
||||
import reactor.core.publisher.Mono; |
||||
import reactor.test.StepVerifier; |
||||
|
||||
import java.time.LocalDateTime; |
||||
|
||||
import javax.sql.DataSource; |
||||
|
||||
import org.junit.jupiter.api.Test; |
||||
import org.junit.jupiter.api.extension.ExtendWith; |
||||
import org.junit.jupiter.api.extension.RegisterExtension; |
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired; |
||||
import org.springframework.context.annotation.Bean; |
||||
import org.springframework.context.annotation.ComponentScan.Filter; |
||||
import org.springframework.context.annotation.Configuration; |
||||
import org.springframework.context.annotation.FilterType; |
||||
import org.springframework.dao.DataAccessException; |
||||
import org.springframework.data.annotation.Id; |
||||
import org.springframework.data.r2dbc.config.AbstractR2dbcConfiguration; |
||||
import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories; |
||||
import org.springframework.data.r2dbc.repository.support.R2dbcRepositoryFactory; |
||||
import org.springframework.data.r2dbc.testing.ExternalDatabase; |
||||
import org.springframework.data.r2dbc.testing.MySqlTestSupport; |
||||
import org.springframework.data.repository.reactive.ReactiveCrudRepository; |
||||
import org.springframework.jdbc.core.JdbcTemplate; |
||||
import org.springframework.test.context.ContextConfiguration; |
||||
import org.springframework.test.context.junit.jupiter.SpringExtension; |
||||
|
||||
/** |
||||
* Integration tests for {@link LegoSetRepository} using {@link R2dbcRepositoryFactory} against MySQL. |
||||
* |
||||
* @author Mark Paluch |
||||
*/ |
||||
@ExtendWith(SpringExtension.class) |
||||
@ContextConfiguration |
||||
public class MySqlR2dbcRepositoryIntegrationTests extends AbstractR2dbcRepositoryIntegrationTests { |
||||
|
||||
@RegisterExtension public static final ExternalDatabase database = MySqlTestSupport.database(); |
||||
|
||||
@Autowired DateTestsRepository dateTestsRepository; |
||||
|
||||
@Configuration |
||||
@EnableR2dbcRepositories(considerNestedRepositories = true, |
||||
includeFilters = { @Filter(classes = MySqlLegoSetRepository.class, type = FilterType.ASSIGNABLE_TYPE), |
||||
@Filter(classes = DateTestsRepository.class, type = FilterType.ASSIGNABLE_TYPE) }) |
||||
static class IntegrationTestConfiguration extends AbstractR2dbcConfiguration { |
||||
|
||||
@Bean |
||||
@Override |
||||
public ConnectionFactory connectionFactory() { |
||||
return MySqlTestSupport.createConnectionFactory(database); |
||||
} |
||||
} |
||||
|
||||
@Override |
||||
protected DataSource createDataSource() { |
||||
return MySqlTestSupport.createDataSource(database); |
||||
} |
||||
|
||||
@Override |
||||
protected ConnectionFactory createConnectionFactory() { |
||||
return MySqlTestSupport.createConnectionFactory(database); |
||||
} |
||||
|
||||
@Override |
||||
protected String getCreateTableStatement() { |
||||
return MySqlTestSupport.CREATE_TABLE_LEGOSET_WITH_ID_GENERATION; |
||||
} |
||||
|
||||
@Override |
||||
protected Class<? extends LegoSetRepository> getRepositoryInterfaceType() { |
||||
return MySqlLegoSetRepository.class; |
||||
} |
||||
|
||||
@Test |
||||
public void shouldUserJsr310Types() { |
||||
|
||||
JdbcTemplate jdbcTemplate = createJdbcTemplate(createDataSource()); |
||||
|
||||
try { |
||||
jdbcTemplate.execute("DROP TABLE date_tests"); |
||||
} catch (DataAccessException e) {} |
||||
|
||||
jdbcTemplate.execute("CREATE TABLE date_tests (id int, created_timestamp TIMESTAMP, created_date datetime);"); |
||||
|
||||
dateTestsRepository.save(new DateTests(null, LocalDateTime.now(), LocalDateTime.now())).as(StepVerifier::create) |
||||
.expectNextCount(1).verifyComplete(); |
||||
} |
||||
|
||||
@Data |
||||
@AllArgsConstructor |
||||
static class DateTests { |
||||
@Id Integer id; |
||||
LocalDateTime createdTimestamp; |
||||
LocalDateTime createdDate; |
||||
} |
||||
|
||||
interface MySqlLegoSetRepository extends LegoSetRepository { |
||||
|
||||
@Override |
||||
@Query("SELECT name FROM legoset") |
||||
Flux<Named> findAsProjection(); |
||||
|
||||
@Override |
||||
@Query("SELECT * FROM legoset WHERE manual = :manual") |
||||
Mono<LegoSet> findByManual(int manual); |
||||
|
||||
@Override |
||||
@Query("SELECT id FROM legoset") |
||||
Flux<Integer> findAllIds(); |
||||
} |
||||
|
||||
interface DateTestsRepository extends ReactiveCrudRepository<DateTests, Integer> { |
||||
|
||||
} |
||||
} |
||||
@ -1,95 +0,0 @@
@@ -1,95 +0,0 @@
|
||||
/* |
||||
* Copyright 2021 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.data.r2dbc.repository; |
||||
|
||||
import io.r2dbc.spi.ConnectionFactory; |
||||
|
||||
import java.util.Optional; |
||||
|
||||
import javax.sql.DataSource; |
||||
|
||||
import org.junit.jupiter.api.extension.ExtendWith; |
||||
import org.junit.jupiter.api.extension.RegisterExtension; |
||||
|
||||
import org.springframework.context.annotation.Bean; |
||||
import org.springframework.context.annotation.ComponentScan.Filter; |
||||
import org.springframework.context.annotation.Configuration; |
||||
import org.springframework.context.annotation.FilterType; |
||||
import org.springframework.data.r2dbc.config.AbstractR2dbcConfiguration; |
||||
import org.springframework.data.r2dbc.convert.R2dbcCustomConversions; |
||||
import org.springframework.data.r2dbc.mapping.R2dbcMappingContext; |
||||
import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories; |
||||
import org.springframework.data.r2dbc.testing.ExternalDatabase; |
||||
import org.springframework.data.r2dbc.testing.MySqlTestSupport; |
||||
import org.springframework.data.relational.core.mapping.NamingStrategy; |
||||
import org.springframework.test.context.ContextConfiguration; |
||||
import org.springframework.test.context.junit.jupiter.SpringExtension; |
||||
|
||||
/** |
||||
* Integration tests for {@link LegoSetRepository} with table and column names that contain upper and lower case |
||||
* characters against MySql. |
||||
* |
||||
* @author Jens Schauder |
||||
*/ |
||||
@ExtendWith(SpringExtension.class) |
||||
@ContextConfiguration |
||||
public class MySqlR2dbcRepositoryWithMixedCaseNamesIntegrationTests |
||||
extends AbstractR2dbcRepositoryWithMixedCaseNamesIntegrationTests { |
||||
|
||||
@RegisterExtension public static final ExternalDatabase database = MySqlTestSupport.database(); |
||||
|
||||
@Configuration |
||||
@EnableR2dbcRepositories(considerNestedRepositories = true, |
||||
includeFilters = @Filter(classes = { LegoSetRepository.class }, type = FilterType.ASSIGNABLE_TYPE)) |
||||
static class IntegrationTestConfiguration extends AbstractR2dbcConfiguration { |
||||
|
||||
@Bean |
||||
@Override |
||||
public ConnectionFactory connectionFactory() { |
||||
return MySqlTestSupport.createConnectionFactory(database); |
||||
} |
||||
|
||||
@Override |
||||
public R2dbcMappingContext r2dbcMappingContext(Optional<NamingStrategy> namingStrategy, |
||||
R2dbcCustomConversions r2dbcCustomConversions) { |
||||
|
||||
R2dbcMappingContext r2dbcMappingContext = super.r2dbcMappingContext(namingStrategy, r2dbcCustomConversions); |
||||
r2dbcMappingContext.setForceQuote(true); |
||||
|
||||
return r2dbcMappingContext; |
||||
} |
||||
} |
||||
|
||||
@Override |
||||
protected DataSource createDataSource() { |
||||
return MySqlTestSupport.createDataSource(database); |
||||
} |
||||
|
||||
@Override |
||||
protected ConnectionFactory createConnectionFactory() { |
||||
return MySqlTestSupport.createConnectionFactory(database); |
||||
} |
||||
|
||||
@Override |
||||
protected String getCreateTableStatement() { |
||||
return MySqlTestSupport.CREATE_TABLE_LEGOSET_WITH_MIXED_CASE_NAMES; |
||||
} |
||||
|
||||
@Override |
||||
protected String getDropTableStatement() { |
||||
return MySqlTestSupport.DROP_TABLE_LEGOSET_WITH_MIXED_CASE_NAMES; |
||||
} |
||||
} |
||||
@ -1,160 +0,0 @@
@@ -1,160 +0,0 @@
|
||||
/* |
||||
* Copyright 2019-2021 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.data.r2dbc.testing; |
||||
|
||||
import dev.miku.r2dbc.mysql.MySqlConnectionFactoryProvider; |
||||
import io.r2dbc.spi.ConnectionFactory; |
||||
import io.r2dbc.spi.ConnectionFactoryOptions; |
||||
|
||||
import java.util.function.Supplier; |
||||
import java.util.stream.Stream; |
||||
|
||||
import javax.sql.DataSource; |
||||
|
||||
import org.springframework.data.r2dbc.testing.ExternalDatabase.ProvidedDatabase; |
||||
|
||||
import org.testcontainers.containers.MySQLContainer; |
||||
|
||||
import com.mysql.cj.jdbc.MysqlDataSource; |
||||
|
||||
/** |
||||
* Utility class for testing against MySQL. |
||||
* |
||||
* @author Mark Paluch |
||||
* @author Bogdan Ilchyshyn |
||||
* @author Jens Schauder |
||||
*/ |
||||
public class MySqlTestSupport { |
||||
|
||||
private static ExternalDatabase testContainerDatabase; |
||||
|
||||
public static String CREATE_TABLE_LEGOSET = "CREATE TABLE legoset (\n" //
|
||||
+ " id integer PRIMARY KEY,\n" //
|
||||
+ " version integer NULL,\n" //
|
||||
+ " name varchar(255) NOT NULL,\n" //
|
||||
+ " manual integer NULL\n," //
|
||||
+ " cert varbinary(255) NULL\n" //
|
||||
+ ") ENGINE=InnoDB;"; |
||||
|
||||
public static String CREATE_TABLE_LEGOSET_WITH_ID_GENERATION = "CREATE TABLE legoset (\n" //
|
||||
+ " id integer AUTO_INCREMENT PRIMARY KEY,\n" //
|
||||
+ " version integer NULL,\n" //
|
||||
+ " name varchar(255) NOT NULL,\n" //
|
||||
+ " flag boolean NULL,\n" //
|
||||
+ " manual integer NULL\n" //
|
||||
+ ") ENGINE=InnoDB;"; |
||||
|
||||
|
||||
public static final String CREATE_TABLE_LEGOSET_WITH_MIXED_CASE_NAMES = "CREATE TABLE `LegoSet` (\n" //
|
||||
+ " `Id` integer AUTO_INCREMENT PRIMARY KEY,\n" //
|
||||
+ " `Name` varchar(255) NOT NULL,\n" //
|
||||
+ " `Manual` integer NULL\n" //
|
||||
+ ") ENGINE=InnoDB;"; |
||||
|
||||
public static final String DROP_TABLE_LEGOSET_WITH_MIXED_CASE_NAMES = "DROP TABLE LegoSet"; |
||||
/** |
||||
* Returns a database either hosted locally or running inside Docker. |
||||
* |
||||
* @return information about the database. Guaranteed to be not {@literal null}. |
||||
*/ |
||||
public static ExternalDatabase database() { |
||||
|
||||
if (Boolean.getBoolean("spring.data.r2dbc.test.preferLocalDatabase")) { |
||||
|
||||
return getFirstWorkingDatabase( //
|
||||
MySqlTestSupport::local, //
|
||||
MySqlTestSupport::testContainer //
|
||||
); |
||||
} else { |
||||
|
||||
return getFirstWorkingDatabase( //
|
||||
MySqlTestSupport::testContainer, //
|
||||
MySqlTestSupport::local //
|
||||
); |
||||
} |
||||
} |
||||
|
||||
@SafeVarargs |
||||
private static ExternalDatabase getFirstWorkingDatabase(Supplier<ExternalDatabase>... suppliers) { |
||||
|
||||
return Stream.of(suppliers).map(Supplier::get) //
|
||||
.filter(ExternalDatabase::checkValidity) //
|
||||
.findFirst() //
|
||||
.orElse(ExternalDatabase.unavailable()); |
||||
} |
||||
|
||||
/** |
||||
* Returns a locally provided database. |
||||
*/ |
||||
private static ExternalDatabase local() { |
||||
|
||||
return ProvidedDatabase.builder() //
|
||||
.hostname("localhost") //
|
||||
.port(3306) //
|
||||
.database("mysql") //
|
||||
.username("root") //
|
||||
.password("my-secret-pw") //
|
||||
.jdbcUrl("jdbc:mysql://localhost:3306/mysql?allowPublicKeyRetrieval=true") //
|
||||
.build(); |
||||
} |
||||
|
||||
/** |
||||
* Returns a database provided via Testcontainers. |
||||
*/ |
||||
private static ExternalDatabase testContainer() { |
||||
|
||||
if (testContainerDatabase == null) { |
||||
|
||||
try { |
||||
MySQLContainer container = new MySQLContainer("mysql:8.0.24"); |
||||
container.start(); |
||||
|
||||
testContainerDatabase = ProvidedDatabase.builder(container) //
|
||||
.database(container.getDatabaseName()) //
|
||||
.username("root") //
|
||||
.build(); |
||||
} catch (IllegalStateException ise) { |
||||
// docker not available.
|
||||
testContainerDatabase = ExternalDatabase.unavailable(); |
||||
} |
||||
} |
||||
|
||||
return testContainerDatabase; |
||||
} |
||||
|
||||
/** |
||||
* Creates a new R2DBC MySQL {@link ConnectionFactory} configured from the {@link ExternalDatabase}. |
||||
*/ |
||||
public static ConnectionFactory createConnectionFactory(ExternalDatabase database) { |
||||
|
||||
ConnectionFactoryOptions options = ConnectionUtils.createOptions("mysql", database); |
||||
return new MySqlConnectionFactoryProvider().create(options); |
||||
} |
||||
|
||||
/** |
||||
* Creates a new {@link DataSource} configured from the {@link ExternalDatabase}. |
||||
*/ |
||||
public static DataSource createDataSource(ExternalDatabase database) { |
||||
|
||||
MysqlDataSource dataSource = new MysqlDataSource(); |
||||
|
||||
dataSource.setUser(database.getUsername()); |
||||
dataSource.setPassword(database.getPassword()); |
||||
dataSource.setURL(database.getJdbcUrl() + "?useSSL=false&allowPublicKeyRetrieval=true"); |
||||
|
||||
return dataSource; |
||||
} |
||||
} |
||||
Loading…
Reference in new issue