From 53a7e193b7af726dda30e0cb4783f5648482bdbf Mon Sep 17 00:00:00 2001 From: John Tims Date: Thu, 28 May 2020 11:24:01 -0600 Subject: [PATCH 1/2] Update reference to oracle docker image --- travis/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/docker-compose.yml b/travis/docker-compose.yml index 588f1d210..84785684c 100644 --- a/travis/docker-compose.yml +++ b/travis/docker-compose.yml @@ -32,7 +32,7 @@ services: - POSTGRES_DB=querydsl oracle: - image: wnameless/oracle-xe-11g:16.04 + image: wnameless/oracle-xe-11g-r2:latest ports: - "1521:1521" From 83c5a094590452b878717c6a092d5852093134da Mon Sep 17 00:00:00 2001 From: John Tims Date: Thu, 28 May 2020 11:29:06 -0600 Subject: [PATCH 2/2] Run tests against oracle --- .github/workflows/ci.yml | 4 ++-- pom.xml | 1 - .../src/test/java/com/querydsl/jpa/AbstractJPATest.java | 4 ++-- querydsl-jpa/src/test/resources/META-INF/persistence.xml | 4 ++-- querydsl-sql/src/test/java/com/querydsl/sql/Connections.java | 2 +- querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java | 4 ++-- travis/docker-compose.yml | 2 ++ 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 855fdcce7..3bd99fd82 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: target: [test-without-scala, test-scala, test-hibernate-5] include: - target: test-without-scala - containers: db2 mysql postgresql mongo sqlserver + containers: db2 mysql postgresql mongo sqlserver oracle maven-args: --activate-profiles all,travis,examples --projects !querydsl-scala - target: test-scala @@ -31,7 +31,7 @@ jobs: maven-args: --activate-profiles all,travis --projects querydsl-scala --resume-from querydsl-scala - target: test-hibernate-5 - containers: db2 mysql postgresql mongo sqlserver + containers: db2 mysql postgresql mongo sqlserver oracle maven-args: --activate-profiles jpa,hibernate5,travis,examples --projects !querydsl-jpa-codegen runs-on: ubuntu-latest diff --git a/pom.xml b/pom.xml index b3216a9ba..3df59a740 100644 --- a/pom.xml +++ b/pom.xml @@ -696,7 +696,6 @@ com.querydsl.core.testutil.ReportingOnly, com.querydsl.core.testutil.Teradata, - com.querydsl.core.testutil.Oracle, com.querydsl.core.testutil.CUBRID, com.querydsl.core.testutil.Firebird diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractJPATest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractJPATest.java index 2905525dd..7d2a48841 100644 --- a/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractJPATest.java +++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractJPATest.java @@ -1679,7 +1679,7 @@ public abstract class AbstractJPATest { @Test @NoEclipseLink @NoOpenJPA @NoBatooJPA - @ExcludeIn(SQLSERVER) + @ExcludeIn({ORACLE, SQLSERVER}) public void test() { Cat kitten = savedCats.get(0); Cat noKitten = savedCats.get(savedCats.size() - 1); @@ -1827,7 +1827,7 @@ public abstract class AbstractJPATest { } @Test - @ExcludeIn(DERBY) + @ExcludeIn({DERBY, ORACLE}) public void byte_array() { QSimpleTypes simpleTypes = QSimpleTypes.simpleTypes; assertEquals(ImmutableList.of(), query().from(simpleTypes) diff --git a/querydsl-jpa/src/test/resources/META-INF/persistence.xml b/querydsl-jpa/src/test/resources/META-INF/persistence.xml index b1a506255..3b5b0bf82 100644 --- a/querydsl-jpa/src/test/resources/META-INF/persistence.xml +++ b/querydsl-jpa/src/test/resources/META-INF/persistence.xml @@ -285,8 +285,8 @@ - - + + diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java b/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java index 8e1ef8555..250b38e1e 100644 --- a/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java +++ b/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java @@ -126,7 +126,7 @@ public final class Connections { private static Connection getOracle() throws SQLException, ClassNotFoundException { Class.forName("oracle.jdbc.driver.OracleDriver"); String url = "jdbc:oracle:thin:@localhost:1521:xe"; - return DriverManager.getConnection(url, "system", "oracle"); + return DriverManager.getConnection(url, "querydsl", "querydsl"); } private static Connection getPostgreSQL() throws ClassNotFoundException, SQLException { diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java b/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java index a89537364..ef16f22b5 100644 --- a/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java +++ b/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java @@ -2119,7 +2119,7 @@ public class SelectBase extends AbstractBaseTest { } @Test - @ExcludeIn({DB2, DERBY, SQLSERVER}) + @ExcludeIn({DB2, DERBY, ORACLE, SQLSERVER}) public void groupConcat() { List expected = ImmutableList.of("Mike,Mary", "Joe,Peter,Steve,Jim", "Jennifer,Helen,Daisy,Barbara"); if (Connections.getTarget() == POSTGRESQL) { @@ -2133,7 +2133,7 @@ public class SelectBase extends AbstractBaseTest { } @Test - @ExcludeIn({DB2, DERBY, SQLSERVER}) + @ExcludeIn({DB2, DERBY, ORACLE, SQLSERVER}) public void groupConcat2() { List expected = ImmutableList.of("Mike-Mary", "Joe-Peter-Steve-Jim", "Jennifer-Helen-Daisy-Barbara"); if (Connections.getTarget() == POSTGRESQL) { diff --git a/travis/docker-compose.yml b/travis/docker-compose.yml index 84785684c..5ae24d33d 100644 --- a/travis/docker-compose.yml +++ b/travis/docker-compose.yml @@ -35,6 +35,8 @@ services: image: wnameless/oracle-xe-11g-r2:latest ports: - "1521:1521" + volumes: + - "../devops/sql-snippets/oracle.sql:/docker-entrypoint-initdb.d/oracle.sql" cubrid: image: lighthopper/cubrid:9.2.26.0004