Skip to content

Commit 36a1400

Browse files
committed
Build against Borca snapshots.
Remove MySQL support as the MySQL driver is not yet published. Update groupId for Postgres driver to org.postgresql. See #710
1 parent 8893a46 commit 36a1400

12 files changed

+55
-670
lines changed

pom.xml

+2-8
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<r2dbc-spi-test.version>0.8.5.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>
36-
<r2dbc-releasetrain.version>Arabba-SR12</r2dbc-releasetrain.version>
36+
<r2dbc-releasetrain.version>Borca-BUILD-SNAPSHOT</r2dbc-releasetrain.version>
3737
<reactive-streams.version>1.0.3</reactive-streams.version>
3838
<netty>4.1.63.Final</netty>
3939
</properties>
@@ -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/connectionfactory/init/H2DatabasePopulatorIntegrationTests.java

+6
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
import org.junit.jupiter.api.Test;
2525

26+
import org.springframework.core.io.Resource;
27+
2628
/**
2729
* Integration tests for {@link DatabasePopulator} using H2.
2830
*
@@ -40,6 +42,10 @@ ConnectionFactory getConnectionFactory() {
4042
return this.connectionFactory;
4143
}
4244

45+
Resource usersSchema() {
46+
return resource("users-schema-h2.sql");
47+
}
48+
4349
@Test
4450
void shouldRunScript() {
4551

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

+6
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
import javax.sql.DataSource;
2929

30+
import org.junit.jupiter.api.Disabled;
3031
import org.junit.jupiter.api.Test;
3132
import org.junit.jupiter.api.extension.RegisterExtension;
3233

@@ -146,6 +147,11 @@ public void shouldApplyCustomConverters() {
146147
.verifyComplete();
147148
}
148149

150+
@Override
151+
@Test
152+
@Disabled
153+
public void insertTypedObjectWithBinary() {}
154+
149155
@Table("boolean_mapping")
150156
@Data
151157
static class BooleanMapping {

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

-186
This file was deleted.

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

-79
This file was deleted.

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;
@@ -40,13 +38,10 @@ void shouldResolveDatabaseType() {
4038
MssqlConnectionFactory mssql = new MssqlConnectionFactory(MssqlConnectionConfiguration.builder().host("localhost")
4139
.database("foo").username("bar").password("password").build());
4240
H2ConnectionFactory h2 = new H2ConnectionFactory(H2ConnectionConfiguration.builder().inMemory("mem").build());
43-
MySqlConnectionFactory mysql = MySqlConnectionFactory
44-
.from(MySqlConnectionConfiguration.builder().host("localhost").username("mysql").build());
4541

4642
assertThat(DialectResolver.getDialect(postgres)).isEqualTo(PostgresDialect.INSTANCE);
4743
assertThat(DialectResolver.getDialect(mssql)).isEqualTo(SqlServerDialect.INSTANCE);
4844
assertThat(DialectResolver.getDialect(h2)).isEqualTo(H2Dialect.INSTANCE);
49-
assertThat(DialectResolver.getDialect(mysql)).isEqualTo(MySqlDialect.INSTANCE);
5045
}
5146

5247
@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;

0 commit comments

Comments
 (0)