From cf3f7c251c21a61c861b98437bfa2a6ec63c5dca Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 27 Jan 2022 09:21:49 +0100 Subject: [PATCH] Upgrade to Oracle JDBC driver 21.4.0.0.1. See #710 --- pom.xml | 2 +- .../r2dbc/core/OracleDatabaseClientIntegrationTests.java | 5 ----- .../repository/OracleR2dbcRepositoryIntegrationTests.java | 2 -- ...cleR2dbcRepositoryWithMixedCaseNamesIntegrationTests.java | 2 -- .../data/r2dbc/testing/OracleTestSupport.java | 5 +++-- 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index cf5940d..66c237f 100644 --- a/pom.xml +++ b/pom.xml @@ -217,7 +217,7 @@ com.oracle.database.jdbc ojdbc11 - 21.1.0.0 + 21.4.0.0.1 test diff --git a/src/test/java/org/springframework/data/r2dbc/core/OracleDatabaseClientIntegrationTests.java b/src/test/java/org/springframework/data/r2dbc/core/OracleDatabaseClientIntegrationTests.java index 42b0b43..bb78243 100644 --- a/src/test/java/org/springframework/data/r2dbc/core/OracleDatabaseClientIntegrationTests.java +++ b/src/test/java/org/springframework/data/r2dbc/core/OracleDatabaseClientIntegrationTests.java @@ -19,7 +19,6 @@ import io.r2dbc.spi.ConnectionFactory; import javax.sql.DataSource; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.data.r2dbc.testing.EnabledOnClass; @@ -32,7 +31,6 @@ import org.springframework.data.r2dbc.testing.OracleTestSupport; * @author Mark Paluch */ @EnabledOnClass("oracle.r2dbc.impl.OracleConnectionFactoryProviderImpl") -@Disabled("See https://github.com/oracle/oracle-r2dbc/issues/63") public class OracleDatabaseClientIntegrationTests extends AbstractDatabaseClientIntegrationTests { @RegisterExtension public static final ExternalDatabase database = OracleTestSupport.database(); @@ -52,7 +50,4 @@ public class OracleDatabaseClientIntegrationTests extends AbstractDatabaseClient return OracleTestSupport.CREATE_TABLE_LEGOSET; } - @Override - @Disabled("https://github.com/oracle/oracle-r2dbc/issues/9") - public void executeSelectNamedParameters() {} } diff --git a/src/test/java/org/springframework/data/r2dbc/repository/OracleR2dbcRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/r2dbc/repository/OracleR2dbcRepositoryIntegrationTests.java index 5465876..660ccf7 100644 --- a/src/test/java/org/springframework/data/r2dbc/repository/OracleR2dbcRepositoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/r2dbc/repository/OracleR2dbcRepositoryIntegrationTests.java @@ -21,7 +21,6 @@ import reactor.core.publisher.Mono; import javax.sql.DataSource; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.RegisterExtension; @@ -46,7 +45,6 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; @ExtendWith(SpringExtension.class) @ContextConfiguration @EnabledOnClass("oracle.r2dbc.impl.OracleConnectionFactoryProviderImpl") -@Disabled("See https://github.com/oracle/oracle-r2dbc/issues/63") public class OracleR2dbcRepositoryIntegrationTests extends AbstractR2dbcRepositoryIntegrationTests { @RegisterExtension public static final ExternalDatabase database = OracleTestSupport.database(); diff --git a/src/test/java/org/springframework/data/r2dbc/repository/OracleR2dbcRepositoryWithMixedCaseNamesIntegrationTests.java b/src/test/java/org/springframework/data/r2dbc/repository/OracleR2dbcRepositoryWithMixedCaseNamesIntegrationTests.java index dc343dc..b2560e1 100644 --- a/src/test/java/org/springframework/data/r2dbc/repository/OracleR2dbcRepositoryWithMixedCaseNamesIntegrationTests.java +++ b/src/test/java/org/springframework/data/r2dbc/repository/OracleR2dbcRepositoryWithMixedCaseNamesIntegrationTests.java @@ -21,7 +21,6 @@ import java.util.Optional; import javax.sql.DataSource; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.RegisterExtension; @@ -49,7 +48,6 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; @ExtendWith(SpringExtension.class) @ContextConfiguration @EnabledOnClass("oracle.r2dbc.impl.OracleConnectionFactoryProviderImpl") -@Disabled("See https://github.com/oracle/oracle-r2dbc/issues/63") public class OracleR2dbcRepositoryWithMixedCaseNamesIntegrationTests extends AbstractR2dbcRepositoryWithMixedCaseNamesIntegrationTests { diff --git a/src/test/java/org/springframework/data/r2dbc/testing/OracleTestSupport.java b/src/test/java/org/springframework/data/r2dbc/testing/OracleTestSupport.java index ac4a95c..47c599a 100644 --- a/src/test/java/org/springframework/data/r2dbc/testing/OracleTestSupport.java +++ b/src/test/java/org/springframework/data/r2dbc/testing/OracleTestSupport.java @@ -55,7 +55,7 @@ public class OracleTestSupport { + " id INTEGER GENERATED by default on null as IDENTITY PRIMARY KEY,\n" // + " version INTEGER NULL,\n" // + " name VARCHAR2(255) NOT NULL,\n" // - + " flag Boolean NULL,\n" // + + " flag INTEGER NULL,\n" // + " manual INTEGER NULL\n" // + ")"; @@ -65,6 +65,7 @@ public class OracleTestSupport { + " \"Manual\" INTEGER NULL\n" // + ")"; public static final String DROP_TABLE_LEGOSET_WITH_MIXED_CASE_NAMES = "DROP TABLE \"LegoSet\""; + /** * Returns a database either hosted locally or running inside Docker. * @@ -162,9 +163,9 @@ public class OracleTestSupport { DriverManagerDataSource dataSource = new DriverManagerDataSource(); + dataSource.setUrl(database.getJdbcUrl().replace(":xe", "/XEPDB1")); dataSource.setUsername(database.getUsername()); dataSource.setPassword(database.getPassword()); - dataSource.setUrl(database.getJdbcUrl().replace(":xe", "/XEPDB1")); return dataSource; }