From 1a9bc8cbb494c9939aab8e62c164491624580059 Mon Sep 17 00:00:00 2001 From: Sean Corfield Date: Fri, 3 Sep 2021 11:13:13 -0700 Subject: [PATCH] update JDBC deps for testing --- .github/workflows/test.yml | 6 +++--- CHANGELOG.md | 3 +++ deps.edn | 18 +++++++++--------- run-tests.sh | 5 +++++ 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3448e1e..67aac92 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,7 +18,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - tools-deps: '1.10.3.933' + tools-deps: '1.10.3.967' - name: Run Tests run: clojure -T:build ci @@ -38,7 +38,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - tools-deps: '1.10.3.933' + tools-deps: '1.10.3.967' - name: Run Tests run: clojure -T:build ci @@ -58,6 +58,6 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - tools-deps: '1.10.3.933' + tools-deps: '1.10.3.967' - name: Run Tests run: clojure -T:build ci diff --git a/CHANGELOG.md b/CHANGELOG.md index 817a6cf..2b8b7ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ Only accretive/fixative changes will be made from now on. +* 1.2.next in progress + * Update most of the JDBC drivers for testing; make it easier to test MariaDB's driver; + * 1.2.709 -- 2021-08-30 * Fix #174 by removing `:property-separator` from "etc" map and defaulting H2 to `";"` for this. * Switch to `tools.build` for running tests and JAR building etc. diff --git a/deps.edn b/deps.edn index a5d8f20..f948950 100644 --- a/deps.edn +++ b/deps.edn @@ -28,17 +28,17 @@ ;; compatible only with JDK9+: ;; org.apache.derby/derby {:mvn/version "10.15.2.0"} ;; org.apache.derby/derbyshared {:mvn/version "10.15.2.0"} - org.hsqldb/hsqldb {:mvn/version "2.5.0"} + org.hsqldb/hsqldb {:mvn/version "2.6.0"} com.h2database/h2 {:mvn/version "1.4.200"} net.sourceforge.jtds/jtds {:mvn/version "1.3.1"} - org.mariadb.jdbc/mariadb-java-client {:mvn/version "2.5.4"} - mysql/mysql-connector-java {:mvn/version "8.0.19"} - org.postgresql/postgresql {:mvn/version "42.2.10"} - io.zonky.test/embedded-postgres {:mvn/version "1.2.10"} - io.zonky.test.postgres/embedded-postgres-binaries-darwin-amd64 {:mvn/version "13.1.0-1"} - io.zonky.test.postgres/embedded-postgres-binaries-linux-amd64 {:mvn/version "13.1.0-1"} - io.zonky.test.postgres/embedded-postgres-binaries-windows-amd64 {:mvn/version "13.1.0-1"} - org.xerial/sqlite-jdbc {:mvn/version "3.30.1"} + org.mariadb.jdbc/mariadb-java-client {:mvn/version "2.7.4"} + mysql/mysql-connector-java {:mvn/version "8.0.26"} + org.postgresql/postgresql {:mvn/version "42.2.23"} + io.zonky.test/embedded-postgres {:mvn/version "1.3.1"} + io.zonky.test.postgres/embedded-postgres-binaries-darwin-amd64 {:mvn/version "13.4.0"} + io.zonky.test.postgres/embedded-postgres-binaries-linux-amd64 {:mvn/version "13.4.0"} + io.zonky.test.postgres/embedded-postgres-binaries-windows-amd64 {:mvn/version "13.4.0"} + org.xerial/sqlite-jdbc {:mvn/version "3.36.0.3"} com.microsoft.sqlserver/mssql-jdbc {:mvn/version "8.2.1.jre8"} ;; supplementary test stuff ;; use log4j 2.x: diff --git a/run-tests.sh b/run-tests.sh index 26226cf..bb7ca81 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -23,6 +23,11 @@ then # assumes you already have a MySQL instance running locally NEXT_JDBC_TEST_MYSQL=yes clojure -X:test next.jdbc.test-fixtures/create-clojure-test fi +if test "$1" = "maria" +then + NEXT_JDBC_TEST_MSSQL=yes MSSQL_SA_PASSWORD=Str0ngP4ssw0rd \ + NEXT_JDBC_TEST_MYSQL=yes NEXT_JDBC_TEST_MARIADB=yes clojure -X:test +fi if test "$1" = "" then NEXT_JDBC_TEST_MSSQL=yes MSSQL_SA_PASSWORD=Str0ngP4ssw0rd \