From 2c43f78e4766bc4ebe4ceb898f01d25131209b0f Mon Sep 17 00:00:00 2001 From: John Tims Date: Sun, 31 May 2020 06:35:14 -0600 Subject: [PATCH 1/6] Create demodb when cubrid starts --- travis/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/travis/docker-compose.yml b/travis/docker-compose.yml index 5ae24d33d..487360b3c 100644 --- a/travis/docker-compose.yml +++ b/travis/docker-compose.yml @@ -40,6 +40,7 @@ services: cubrid: image: lighthopper/cubrid:9.2.26.0004 + command: "./create-start-demodb.sh" ports: - "33000:33000" - "30000:30000" From 8373d486244540007329e836de253d2693c86dbf Mon Sep 17 00:00:00 2001 From: John Tims Date: Sun, 31 May 2020 06:35:34 -0600 Subject: [PATCH 2/6] Run tests against cubrid --- .github/workflows/ci.yml | 3 ++- pom.xml | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 798c7c54e..0cb7b479c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,6 +12,7 @@ on: - '*' paths-ignore: - README.md + env: MAVEN_OPTS: -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn @@ -23,7 +24,7 @@ jobs: target: [test-without-scala, test-scala] include: - target: test-without-scala - containers: db2 mysql postgresql mongo sqlserver oracle + containers: db2 mysql postgresql mongo sqlserver oracle cubrid maven-args: --activate-profiles all,travis,examples --projects !querydsl-scala - target: test-scala diff --git a/pom.xml b/pom.xml index 47c1b95d0..b196d012c 100644 --- a/pom.xml +++ b/pom.xml @@ -688,7 +688,6 @@ com.querydsl.core.testutil.ReportingOnly, com.querydsl.core.testutil.Teradata, - com.querydsl.core.testutil.CUBRID, com.querydsl.core.testutil.Firebird From d0c7dec53bbd8fd3edd01b2919bedbd63517e18c Mon Sep 17 00:00:00 2001 From: John Tims Date: Sun, 31 May 2020 07:26:36 -0600 Subject: [PATCH 3/6] Add cubrid health check --- .../src/test/java/com/querydsl/sql/InsertBase.java | 2 +- travis/docker-compose.yml | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/InsertBase.java b/querydsl-sql/src/test/java/com/querydsl/sql/InsertBase.java index 6cb1650d5..4c251fff8 100644 --- a/querydsl-sql/src/test/java/com/querydsl/sql/InsertBase.java +++ b/querydsl-sql/src/test/java/com/querydsl/sql/InsertBase.java @@ -65,7 +65,7 @@ public class InsertBase extends AbstractBaseTest { } @Test - @ExcludeIn(SQLITE) // https://bitbucket.org/xerial/sqlite-jdbc/issue/133/prepstmtsetdate-int-date-calendar-seems + @ExcludeIn({CUBRID, SQLITE}) // https://bitbucket.org/xerial/sqlite-jdbc/issue/133/prepstmtsetdate-int-date-calendar-seems public void insert_dates() { QDateTest dateTest = QDateTest.qDateTest; LocalDate localDate = new LocalDate(1978, 1, 2); diff --git a/travis/docker-compose.yml b/travis/docker-compose.yml index 487360b3c..1d511798b 100644 --- a/travis/docker-compose.yml +++ b/travis/docker-compose.yml @@ -4,6 +4,8 @@ services: block-until-healthy: image: alpine:latest depends_on: + cubrid: + condition: service_healthy db2: condition: service_healthy sqlserver: @@ -47,6 +49,11 @@ services: - "8001:8001" - "8002:8002" - "1523:1523" + healthcheck: + test: csql demodb -c "SELECT 1" + interval: 5s + timeout: 60s + start_period: 60s mongo: image: mongo:3.6.1 From 4c6aa2b21fce908f2588d443a80eadb8cd8448a5 Mon Sep 17 00:00:00 2001 From: John Tims Date: Sun, 31 May 2020 08:48:51 -0600 Subject: [PATCH 4/6] Run tests against firebird --- .github/workflows/ci.yml | 6 +++--- .../src/test/java/com/querydsl/sql/Connections.java | 2 +- travis/docker-compose.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0cb7b479c..78fc4d836 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: target: [test-without-scala, test-scala] include: - target: test-without-scala - containers: db2 mysql postgresql mongo sqlserver oracle cubrid + containers: db2 mysql postgresql mongo sqlserver oracle cubrid firebird maven-args: --activate-profiles all,travis,examples --projects !querydsl-scala - target: test-scala @@ -46,8 +46,8 @@ jobs: run: | cd travis/ &&\ docker-compose up --detach ${{ matrix.containers }} &&\ - docker ps &&\ - time docker-compose up block-until-healthy + time docker-compose up block-until-healthy &&\ + docker ps - name: Initialize cache uses: actions/cache@v1 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 250b38e1e..57d7bf7e1 100644 --- a/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java +++ b/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java @@ -101,7 +101,7 @@ public final class Connections { private static Connection getFirebird() throws SQLException, ClassNotFoundException { Class.forName("org.firebirdsql.jdbc.FBDriver"); - String url = "jdbc:firebirdsql:localhost/3050:/databases/querydsl.fdb"; + String url = "jdbc:firebirdsql:localhost/3050:/firebird/data/querydsl.fdb"; return DriverManager.getConnection(url, "sysdba", "masterkey"); } diff --git a/travis/docker-compose.yml b/travis/docker-compose.yml index 1d511798b..d86697cee 100644 --- a/travis/docker-compose.yml +++ b/travis/docker-compose.yml @@ -93,7 +93,7 @@ services: start_period: 60s firebird: - image: jacobalberty/firebird:2.5.6-ss + image: jacobalberty/firebird:2.5.9-ss ports: - "3050:3050" environment: From 63a8237474faf80922dd8dd10e34627495d7364a Mon Sep 17 00:00:00 2001 From: John Tims Date: Sun, 31 May 2020 08:49:45 -0600 Subject: [PATCH 5/6] Exclude addMonths test for Oracle --- querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ef16f22b5..12adfb4ee 100644 --- a/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java +++ b/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java @@ -533,7 +533,7 @@ public class SelectBase extends AbstractBaseTest { DateTimeExpression dt = Expressions.currentTimestamp(); add(exprs, SQLExpressions.addYears(dt, 1)); - add(exprs, SQLExpressions.addMonths(dt, 1)); + add(exprs, SQLExpressions.addMonths(dt, 1), ORACLE); add(exprs, SQLExpressions.addDays(dt, 1)); add(exprs, SQLExpressions.addHours(dt, 1), TERADATA); add(exprs, SQLExpressions.addMinutes(dt, 1), TERADATA); From b41ca3d63e5120f2845d56eb5e261e1f2cec1b1a Mon Sep 17 00:00:00 2001 From: John Tims Date: Sun, 31 May 2020 09:52:36 -0600 Subject: [PATCH 6/6] Run Firebird tests in CI --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b196d012c..ae5dc5a88 100644 --- a/pom.xml +++ b/pom.xml @@ -687,8 +687,7 @@ com.querydsl.core.testutil.Performance, com.querydsl.core.testutil.ReportingOnly, - com.querydsl.core.testutil.Teradata, - com.querydsl.core.testutil.Firebird + com.querydsl.core.testutil.Teradata