Skip to content

Commit 907f486

Browse files
committed
Upgrade to R2DBC 0.9.
Remove MySQL support as the MySQL driver is not yet published. Update groupId for Postgres driver to org.postgresql. See #710
1 parent b951610 commit 907f486

File tree

9 files changed

+46
-406
lines changed

9 files changed

+46
-406
lines changed

pom.xml

+2-8
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<degraph-check.version>0.1.4</degraph-check.version>
3131
<postgresql.version>42.2.5</postgresql.version>
3232
<mysql.version>8.0.21</mysql.version>
33-
<r2dbc-spi-test.version>0.8.5.RELEASE</r2dbc-spi-test.version>
33+
<r2dbc-spi-test.version>0.9.1.RELEASE</r2dbc-spi-test.version>
3434
<mssql-jdbc.version>7.1.2.jre8-preview</mssql-jdbc.version>
3535
<mariadb-jdbc.version>2.5.4</mariadb-jdbc.version>
3636
<r2dbc-releasetrain.version>Borca-RELEASE</r2dbc-releasetrain.version>
@@ -224,7 +224,7 @@
224224
<!-- R2DBC Drivers -->
225225

226226
<dependency>
227-
<groupId>io.r2dbc</groupId>
227+
<groupId>org.postgresql</groupId>
228228
<artifactId>r2dbc-postgresql</artifactId>
229229
<optional>true</optional>
230230
</dependency>
@@ -241,12 +241,6 @@
241241
<scope>test</scope>
242242
</dependency>
243243

244-
<dependency>
245-
<groupId>dev.miku</groupId>
246-
<artifactId>r2dbc-mysql</artifactId>
247-
<scope>test</scope>
248-
</dependency>
249-
250244
<dependency>
251245
<groupId>org.mariadb</groupId>
252246
<artifactId>r2dbc-mariadb</artifactId>

src/test/java/org/springframework/data/r2dbc/core/ReactiveDataAccessStrategyTestSupport.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
import static org.assertj.core.api.Assertions.*;
1919
import static org.mockito.Mockito.*;
2020

21+
import io.r2dbc.spi.Parameters;
22+
import io.r2dbc.spi.R2dbcType;
2123
import io.r2dbc.spi.Row;
2224
import io.r2dbc.spi.RowMetadata;
2325
import io.r2dbc.spi.test.MockColumnMetadata;
@@ -198,7 +200,7 @@ private <T> void testType(BiConsumer<PrimitiveTypes, T> setter, Function<Primiti
198200
ReactiveDataAccessStrategy strategy = getStrategy();
199201
Row rowMock = mock(Row.class);
200202
RowMetadata metadataMock = MockRowMetadata.builder()
201-
.columnMetadata(MockColumnMetadata.builder().name(fieldname).build()).build();
203+
.columnMetadata(MockColumnMetadata.builder().name(fieldname).type(Parameters.in(testValue.getClass()).getType()).build()).build();
202204

203205
PrimitiveTypes toSave = new PrimitiveTypes();
204206
setter.accept(toSave, testValue);

src/test/java/org/springframework/data/r2dbc/dialect/DialectResolverUnitTests.java

-5
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import static org.assertj.core.api.Assertions.*;
44

5-
import dev.miku.r2dbc.mysql.MySqlConnectionConfiguration;
6-
import dev.miku.r2dbc.mysql.MySqlConnectionFactory;
75
import io.r2dbc.h2.H2ConnectionConfiguration;
86
import io.r2dbc.h2.H2ConnectionFactory;
97
import io.r2dbc.mssql.MssqlConnectionConfiguration;
@@ -41,13 +39,10 @@ void shouldResolveDatabaseType() {
4139
MssqlConnectionFactory mssql = new MssqlConnectionFactory(MssqlConnectionConfiguration.builder().host("localhost")
4240
.database("foo").username("bar").password("password").build());
4341
H2ConnectionFactory h2 = new H2ConnectionFactory(H2ConnectionConfiguration.builder().inMemory("mem").build());
44-
MySqlConnectionFactory mysql = MySqlConnectionFactory
45-
.from(MySqlConnectionConfiguration.builder().host("localhost").username("mysql").build());
4642

4743
assertThat(DialectResolver.getDialect(postgres)).isEqualTo(PostgresDialect.INSTANCE);
4844
assertThat(DialectResolver.getDialect(mssql)).isEqualTo(SqlServerDialect.INSTANCE);
4945
assertThat(DialectResolver.getDialect(h2)).isEqualTo(H2Dialect.INSTANCE);
50-
assertThat(DialectResolver.getDialect(mysql)).isEqualTo(MySqlDialect.INSTANCE);
5146
}
5247

5348
@Test // gh-20, gh-104

src/test/java/org/springframework/data/r2dbc/repository/AbstractR2dbcRepositoryIntegrationTests.java

+5
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import lombok.Setter;
2525
import lombok.Value;
2626
import reactor.core.publisher.Flux;
27+
import reactor.core.publisher.Hooks;
2728
import reactor.core.publisher.Mono;
2829
import reactor.test.StepVerifier;
2930

@@ -60,6 +61,10 @@
6061
*/
6162
public abstract class AbstractR2dbcRepositoryIntegrationTests extends R2dbcIntegrationTestSupport {
6263

64+
static {
65+
Hooks.onOperatorDebug();
66+
}
67+
6368
@Autowired private LegoSetRepository repository;
6469
@Autowired private ConnectionFactory connectionFactory;
6570
protected JdbcTemplate jdbc;

src/test/java/org/springframework/data/r2dbc/repository/MySqlR2dbcRepositoryIntegrationTests.java

-137
This file was deleted.

src/test/java/org/springframework/data/r2dbc/repository/MySqlR2dbcRepositoryWithMixedCaseNamesIntegrationTests.java

-95
This file was deleted.

0 commit comments

Comments
 (0)