Skip to content

Commit cf3f7c2

Browse files
committed
Upgrade to Oracle JDBC driver 21.4.0.0.1.
See #710
1 parent 81ccfb3 commit cf3f7c2

File tree

5 files changed

+4
-12
lines changed

5 files changed

+4
-12
lines changed

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@
217217
<dependency>
218218
<groupId>com.oracle.database.jdbc</groupId>
219219
<artifactId>ojdbc11</artifactId>
220-
<version>21.1.0.0</version>
220+
<version>21.4.0.0.1</version>
221221
<scope>test</scope>
222222
</dependency>
223223

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

-5
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import javax.sql.DataSource;
2121

22-
import org.junit.jupiter.api.Disabled;
2322
import org.junit.jupiter.api.extension.RegisterExtension;
2423

2524
import org.springframework.data.r2dbc.testing.EnabledOnClass;
@@ -32,7 +31,6 @@
3231
* @author Mark Paluch
3332
*/
3433
@EnabledOnClass("oracle.r2dbc.impl.OracleConnectionFactoryProviderImpl")
35-
@Disabled("See https://github.com/oracle/oracle-r2dbc/issues/63")
3634
public class OracleDatabaseClientIntegrationTests extends AbstractDatabaseClientIntegrationTests {
3735

3836
@RegisterExtension public static final ExternalDatabase database = OracleTestSupport.database();
@@ -52,7 +50,4 @@ protected String getCreateTableStatement() {
5250
return OracleTestSupport.CREATE_TABLE_LEGOSET;
5351
}
5452

55-
@Override
56-
@Disabled("https://github.com/oracle/oracle-r2dbc/issues/9")
57-
public void executeSelectNamedParameters() {}
5853
}

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

-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import javax.sql.DataSource;
2323

24-
import org.junit.jupiter.api.Disabled;
2524
import org.junit.jupiter.api.extension.ExtendWith;
2625
import org.junit.jupiter.api.extension.RegisterExtension;
2726

@@ -46,7 +45,6 @@
4645
@ExtendWith(SpringExtension.class)
4746
@ContextConfiguration
4847
@EnabledOnClass("oracle.r2dbc.impl.OracleConnectionFactoryProviderImpl")
49-
@Disabled("See https://github.com/oracle/oracle-r2dbc/issues/63")
5048
public class OracleR2dbcRepositoryIntegrationTests extends AbstractR2dbcRepositoryIntegrationTests {
5149

5250
@RegisterExtension public static final ExternalDatabase database = OracleTestSupport.database();

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

-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import javax.sql.DataSource;
2323

24-
import org.junit.jupiter.api.Disabled;
2524
import org.junit.jupiter.api.extension.ExtendWith;
2625
import org.junit.jupiter.api.extension.RegisterExtension;
2726

@@ -49,7 +48,6 @@
4948
@ExtendWith(SpringExtension.class)
5049
@ContextConfiguration
5150
@EnabledOnClass("oracle.r2dbc.impl.OracleConnectionFactoryProviderImpl")
52-
@Disabled("See https://github.com/oracle/oracle-r2dbc/issues/63")
5351
public class OracleR2dbcRepositoryWithMixedCaseNamesIntegrationTests
5452
extends AbstractR2dbcRepositoryWithMixedCaseNamesIntegrationTests {
5553

src/test/java/org/springframework/data/r2dbc/testing/OracleTestSupport.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public class OracleTestSupport {
5555
+ " id INTEGER GENERATED by default on null as IDENTITY PRIMARY KEY,\n" //
5656
+ " version INTEGER NULL,\n" //
5757
+ " name VARCHAR2(255) NOT NULL,\n" //
58-
+ " flag Boolean NULL,\n" //
58+
+ " flag INTEGER NULL,\n" //
5959
+ " manual INTEGER NULL\n" //
6060
+ ")";
6161

@@ -65,6 +65,7 @@ public class OracleTestSupport {
6565
+ " \"Manual\" INTEGER NULL\n" //
6666
+ ")";
6767
public static final String DROP_TABLE_LEGOSET_WITH_MIXED_CASE_NAMES = "DROP TABLE \"LegoSet\"";
68+
6869
/**
6970
* Returns a database either hosted locally or running inside Docker.
7071
*
@@ -162,9 +163,9 @@ public static DataSource createDataSource(ExternalDatabase database) {
162163

163164
DriverManagerDataSource dataSource = new DriverManagerDataSource();
164165

166+
dataSource.setUrl(database.getJdbcUrl().replace(":xe", "/XEPDB1"));
165167
dataSource.setUsername(database.getUsername());
166168
dataSource.setPassword(database.getPassword());
167-
dataSource.setUrl(database.getJdbcUrl().replace(":xe", "/XEPDB1"));
168169

169170
return dataSource;
170171
}

0 commit comments

Comments
 (0)