CodeCow/querydsl
1
0
Fork 0
mirror of https://github.com/querydsl/querydsl.git synced 2026-06-04 21:01:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3404 from rdicroce/oracle-jdbc-driver

Browse Source 
Oracle: upgrade JDBC driver to latest. Maven coordinates changed.
This commit is contained in:
Jan-Willem Gmelig Meyling 2022-10-06 22:19:00 +02:00 committed by GitHub
commit f8053dcc9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -45,7 +45,7 @@
<hsqldb.version>2.6.0</hsqldb.version>
<h2.version>1.4.197</h2.version>
<postgresql.version>42.3.4</postgresql.version>
<oracle.version>11.2.0.4</oracle.version>
<oracle.version>21.7.0.0</oracle.version>
<mysql.version>8.0.29</mysql.version>
<mssql.version>11.2.1.jre8</mssql.version>
<cubrid.version>9.3.9.0002</cubrid.version>
@ -432,7 +432,7 @@
<exclude>org.apche.derby:derby:*:*:compile</exclude>
<exclude>mysql:mysql-connector-java:*:*:compile</exclude>
<exclude>com.microsoft.sqlserver:mssql-jdbc:*:*:compile</exclude>
<exclude>com.oracle:ojdbc6:*:*:compile</exclude>
<exclude>com.oracle:ojdbc8:*:*:compile</exclude>
<exclude>org.postgresql:postgresql:*:*:compile</exclude>
<exclude>cubrid:cubrid-jdbc:*:*:compile</exclude>
<exclude>org.firebirdsql.jdbc:jaybird:*:*:compile</exclude>

2
querydsl-jpa/pom.xml
View File

@ -194,7 +194,7 @@
</dependency>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc6</artifactId>
<artifactId>ojdbc8</artifactId>
<version>${oracle.version}</version>
<scope>test</scope>
</dependency>

16
querydsl-jpa/src/test/java/com/querydsl/jpa/suites/OracleSuiteTest.java
View File

@ -1,5 +1,8 @@
package com.querydsl.jpa.suites;
import java.util.TimeZone;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.experimental.categories.Category;
@ -17,10 +20,23 @@ public class OracleSuiteTest extends AbstractSuite {
public static class Hibernate extends HibernateBase { }
public static class HibernateSQL extends HibernateSQLBase { }
private static TimeZone defaultZone;
@BeforeClass
public static void setUp() throws Exception {
Mode.mode.set("oracle");
Mode.target.set(Target.ORACLE);
// change time zone to work around ORA-01882
// see https://gist.github.com/jarek-przygodzki/cbea3cedae3aef2bbbe0ff6b057e8321
// the test may work fine on your machine without this, but it fails when the GitHub runner executes it
defaultZone = TimeZone.getDefault();
TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
}
@AfterClass
public static void tearDown() {
TimeZone.setDefault(defaultZone);
}
}

2
querydsl-sql-codegen/pom.xml
View File

@ -97,7 +97,7 @@
</dependency>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc6</artifactId>
<artifactId>ojdbc8</artifactId>
<version>${oracle.version}</version>
<scope>test</scope>
</dependency>

13
querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportOracleTest.java
View File

@ -13,6 +13,8 @@
*/
package com.querydsl.sql.codegen;
import java.util.TimeZone;
import org.junit.BeforeClass;
import org.junit.experimental.categories.Category;
@ -24,7 +26,16 @@ public class ExportOracleTest extends ExportBaseTest {
@BeforeClass
public static void setUpClass() throws Exception {
Connections.initOracle();
TimeZone tz = TimeZone.getDefault();
try {
// change time zone to work around ORA-01882
// see https://gist.github.com/jarek-przygodzki/cbea3cedae3aef2bbbe0ff6b057e8321
// the test may work fine on your machine without this, but it fails when the GitHub runner executes it
TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
Connections.initOracle();
} finally {
TimeZone.setDefault(tz);
}
}
@Override

2
querydsl-sql-spatial/pom.xml
View File

@ -119,7 +119,7 @@
</dependency>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc6</artifactId>
<artifactId>ojdbc8</artifactId>
<version>${oracle.version}</version>
<scope>test</scope>
</dependency>

2
querydsl-sql/pom.xml
View File

@ -107,7 +107,7 @@
</dependency>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc6</artifactId>
<artifactId>ojdbc8</artifactId>
<version>${oracle.version}</version>
<scope>test</scope>
</dependency>