diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 6f3bb13..13a7ba0 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -15,7 +15,7 @@ jobs: cancel-in-progress: true runs-on: ubuntu-latest env: - METABASE_TAG: v0.43.1 + METABASE_TAG: v0.43.3 steps: - name: Checkout the repository uses: actions/checkout@v3 @@ -23,7 +23,7 @@ jobs: fetch-depth: 0 path: metabase-driver - - name: Checkout the Metabase repository + - name: Checkout the Metabase repository at tag ${{ env.METABASE_TAG }} uses: actions/checkout@v3 with: fetch-depth: 1 @@ -38,12 +38,12 @@ jobs: java-version: 11 - name: Install clojure tools - uses: DeLaGuardo/setup-clojure@5.1 + uses: DeLaGuardo/setup-clojure@7.0 with: cli: latest - name: Cache Maven repository - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('metabase-driver/deps.edn', 'metabase/**/deps.edn') }} @@ -51,7 +51,7 @@ jobs: ${{ runner.os }}-maven- - name: Cache clj-kondo - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: .clj-kondo/.cache key: clj-kondo-cache diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 4deab12..b7d0693 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -15,7 +15,7 @@ jobs: cancel-in-progress: true runs-on: ubuntu-latest env: - METABASE_TAG: v0.43.1 + METABASE_TAG: v0.43.3 steps: - name: Checkout the repository uses: actions/checkout@v3 @@ -23,7 +23,7 @@ jobs: fetch-depth: 1 path: 'metabase-driver' - - name: Checkout the Metabase repository + - name: Checkout the Metabase repository at tag ${{ env.METABASE_TAG }} uses: actions/checkout@v3 with: fetch-depth: 1 @@ -45,7 +45,7 @@ jobs: java-version: 11 - name: Install clojure tools - uses: DeLaGuardo/setup-clojure@5.1 + uses: DeLaGuardo/setup-clojure@7.0 with: cli: latest diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md index c0ad2a9..4910908 100644 --- a/doc/changes/changelog.md +++ b/doc/changes/changelog.md @@ -1,5 +1,6 @@ # Changes +* [1.0.2](changes_1.0.2.md) * [1.0.1](changes_1.0.1.md) * [1.0.0](changes_1.0.0.md) * [0.3.0](changes_0.3.0.md) diff --git a/doc/changes/changes_1.0.2.md b/doc/changes/changes_1.0.2.md new file mode 100644 index 0000000..92f2e25 --- /dev/null +++ b/doc/changes/changes_1.0.2.md @@ -0,0 +1,11 @@ +# metabase-driver 1.0.2, released 2022-??-?? + +Code name: Adapt to Metabase 0.43.3 + +## Summary + +In this release we tested the driver with Metabase version 0.43.3. This release was only tested with Metabase 0.43.3. If you use an older version of Metabase please use metabase-driver 1.0.0. + +## Refactoring + +* #39: Reactivated failing test in Metabase diff --git a/doc/developer_guide/developer_guide.md b/doc/developer_guide/developer_guide.md index 2699831..31a912f 100644 --- a/doc/developer_guide/developer_guide.md +++ b/doc/developer_guide/developer_guide.md @@ -45,7 +45,7 @@ clojure --version git clone https://github.com/metabase/metabase.git cd metabase git fetch --all --tags - export METABASE_VERSION=0.43.1 + export METABASE_VERSION=0.43.3 git checkout "tags/v${METABASE_VERSION}" -b "v${METABASE_VERSION}-branch" # Build (this will take ~15min) ./bin/build diff --git a/scripts/exclude_tests.diff b/scripts/exclude_tests.diff index 1b63b1e..4ba45c5 100644 --- a/scripts/exclude_tests.diff +++ b/scripts/exclude_tests.diff @@ -25,27 +25,37 @@ index 018ec0446b..accbb02ed1 100644 (= driver/*driver* :presto) "2018-04-18" diff --git a/test/metabase/driver/sql_jdbc/connection_test.clj b/test/metabase/driver/sql_jdbc/connection_test.clj -index f05ebd53a0..46bea0c74d 100644 +index f05ebd53a0..ff03a1b63c 100644 --- a/test/metabase/driver/sql_jdbc/connection_test.clj +++ b/test/metabase/driver/sql_jdbc/connection_test.clj -@@ -105,7 +105,7 @@ - (assoc :new-config "something")))))) +@@ -1,5 +1,6 @@ + (ns metabase.driver.sql-jdbc.connection-test + (:require [clojure.java.jdbc :as jdbc] ++ [clojure.string :as str] + [clojure.test :refer :all] + [metabase.db.spec :as db.spec] + [metabase.driver :as driver] +@@ -93,6 +94,9 @@ + :redshift + (assoc details :additional-options "defaultRowFetchSize=1000") - (deftest connection-pool-invalidated-on-details-change -- (mt/test-drivers (sql-jdbc.tu/sql-jdbc-drivers) -+ (mt/test-drivers (disj (sql-jdbc.tu/sql-jdbc-drivers) :exasol) ; https://github.com/exasol/metabase-driver/issues/39 - (testing "db->pooled-connection-spec marks a connection pool invalid if the db details map changes\n" - (let [db (mt/db) - hash-change-called-times (atom 0) ++ :exasol ;; Test fail when using a hostname other than localhost or 127.0.0.1 e.g. when the DB runs in a VM. ++ (assoc details :certificate-fingerprint (str/lower-case (:certificate-fingerprint details))) ++ + (cond-> details + ;; swap localhost and 127.0.0.1 + (= "localhost" (:host details)) diff --git a/test/metabase/driver/sql_jdbc_test.clj b/test/metabase/driver/sql_jdbc_test.clj -index dce2cb2600..2db1365558 100644 +index dce2cb2600..f679a5a0e8 100644 --- a/test/metabase/driver/sql_jdbc_test.clj +++ b/test/metabase/driver/sql_jdbc_test.clj -@@ -195,7 +195,7 @@ +@@ -194,8 +194,8 @@ + (is (= 3 (spliced-count-of :checkins [:= $date "2014-03-05"])))))) - ;; Oracle, Redshift, and SparkSQL don't have 'Time' types +- ;; Oracle, Redshift, and SparkSQL don't have 'Time' types - (mt/test-drivers (disj (sql-jdbc.tu/sql-jdbc-drivers) :oracle :redshift :sparksql) ++ ;; Oracle, Redshift, SparkSQL and Exasol don't have 'Time' types + (mt/test-drivers (disj (sql-jdbc.tu/sql-jdbc-drivers) :oracle :redshift :sparksql :exasol) ; Exasol does not support TIME data type (testing "splicing a time" (is (= 2