Spring/spring-data-r2dbc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Oracle JDBC driver 21.4.0.0.1.

Browse Source 
See #710
This commit is contained in:
Mark Paluch
2022-01-27 09:21:49 +01:00
parent 81ccfb3d12
commit cf3f7c251c
5 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -217,7 +217,7 @@
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc11</artifactId>
<version>21.1.0.0</version>
<version>21.4.0.0.1</version>
<scope>test</scope>
</dependency>

5
src/test/java/org/springframework/data/r2dbc/core/OracleDatabaseClientIntegrationTests.java
View File

@@ -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() {}
}

2
src/test/java/org/springframework/data/r2dbc/repository/OracleR2dbcRepositoryIntegrationTests.java
View File

@@ -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();

2
src/test/java/org/springframework/data/r2dbc/repository/OracleR2dbcRepositoryWithMixedCaseNamesIntegrationTests.java
View File

@@ -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 {

5
src/test/java/org/springframework/data/r2dbc/testing/OracleTestSupport.java
View File

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