#72 Upgrade to Metabase v0.47.3 (#74)

Author: kaklakariada

.github/workflows/broken_links_checker.yml

@@ -15,7 +15,7 @@ jobs:
       group: ${{ github.workflow }}-${{ github.ref }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Configure broken links checker
         run: |
           mkdir -p ./target
@@ -24,4 +24,4 @@ jobs:
         with:
           use-quiet-mode: 'yes'
           use-verbose-mode: 'yes'
-          config-file: ./target/broken_links_checker.json
+          config-file: ./target/broken_links_checker.json

.github/workflows/ci-build.yml

@@ -15,16 +15,16 @@ jobs:
       cancel-in-progress: true
     runs-on: ubuntu-latest
     env:
-      METABASE_TAG: v0.46.5
+      METABASE_TAG: v0.47.3
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           path: metabase-driver
 
       - name: Checkout the Metabase repository at tag ${{ env.METABASE_TAG }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
           repository: metabase/metabase
@@ -38,9 +38,9 @@ jobs:
           java-version: 11
 
       - name: Install clojure tools
-        uses: DeLaGuardo/setup-clojure@7.0
+        uses: DeLaGuardo/setup-clojure@12.1
         with:
-          cli: latest
+          cli: '1.11.1.1262'
 
       - name: Cache Maven repository
         uses: actions/cache@v3
@@ -83,4 +83,3 @@ jobs:
           cd "$GITHUB_WORKSPACE/metabase-driver"
           mkdir -p .clj-kondo/.cache
           clojure -M:clj-kondo --lint src test --debug
-

.github/workflows/integration-tests.yml

@@ -11,35 +11,39 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        exasol_version: ["7.1.17", "8.18.1"]
+        exasol_version: ["7.1.17", "8.18.1"] # Must be supported by integration-test-docker-environment
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.exasol_version }}
       cancel-in-progress: true
     name: "Build with Exasol ${{ matrix.exasol_version }}"
     runs-on: ubuntu-latest
     env:
-      METABASE_TAG: v0.46.5
+      METABASE_TAG: v0.47.3
     steps:
+      - name: Free Disk Space
+        run: |
+          sudo rm -rf /usr/local/lib/android
+          sudo rm -rf /usr/share/dotnet
       - name: Checkout the repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
           path: 'metabase-driver'
 
       - name: Checkout the Metabase repository at tag ${{ env.METABASE_TAG }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
           repository: 'metabase/metabase'
           path: 'metabase'
           ref: ${{ env.METABASE_TAG }}
 
       - name: Checkout integration test docker environment
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
           repository: 'exasol/integration-test-docker-environment'
-          ref: "1.7.1"
+          ref: "2.0.0"
           path: 'integration-test-docker-environment'
 
       - name: Set up JDK 11
@@ -49,9 +53,9 @@ jobs:
           java-version: 11
 
       - name: Install clojure tools
-        uses: DeLaGuardo/setup-clojure@7.0
+        uses: DeLaGuardo/setup-clojure@12.1
         with:
-          cli: latest
+          cli: '1.11.1.1262'
 
       - name: Cache Maven repository
         uses: actions/cache@v3
@@ -90,8 +94,9 @@ jobs:
 
       - name: Run integration tests
         run: |
+          cat $GITHUB_WORKSPACE/integration-test-docker-environment/.build_output/cache/environments/test/environment_info.sh
           source $GITHUB_WORKSPACE/integration-test-docker-environment/.build_output/cache/environments/test/environment_info.sh
-          EXASOL_HOST=$ENVIRONMENT_DATABASE_HOST \
-            EXASOL_PORT=$ENVIRONMENT_DATABASE_DB_PORT \
+          EXASOL_HOST=$ITDE_DATABASE_HOST \
+            EXASOL_PORT=$ITDE_DATABASE_DB_PORT \
             EXASOL_USER=sys EXASOL_PASSWORD=exasol \
             $GITHUB_WORKSPACE/metabase-driver/scripts/run-integration-tests.sh

.github/workflows/release_droid_upload_github_release_assets.yml

@@ -11,16 +11,16 @@ jobs:
   build:
     runs-on: ubuntu-latest
     env:
-      METABASE_TAG: v0.46.5
+      METABASE_TAG: v0.47.3
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
           path: metabase-driver
 
       - name: Checkout the Metabase repository at tag ${{ env.METABASE_TAG }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
           repository: metabase/metabase
@@ -34,9 +34,9 @@ jobs:
           java-version: 11
 
       - name: Install clojure tools
-        uses: DeLaGuardo/setup-clojure@7.0
+        uses: DeLaGuardo/setup-clojure@12.1
         with:
-          cli: latest
+          cli: '1.11.1.1262'
 
       - name: Cache Maven repository
         uses: actions/cache@v3

deps.edn

@@ -11,9 +11,9 @@
  :aliases
  {:dev
   {:extra-deps
-   {io.github.metabase/metabase {:git/tag "v0.46.5" :git/sha "0ca7df3"}}}
+   {io.github.metabase/metabase {:git/tag "v0.47.3" :git/sha "0ca7df3"}}}
 
   ; clojure -M:clj-kondo --lint src test --debug
   :clj-kondo
   {:replace-deps {clj-kondo/clj-kondo {:mvn/version "2023.03.17"}}
-   :main-opts ["-m" "clj-kondo.main"]}}}
+   :main-opts ["-m" "clj-kondo.main"]}}}

doc/changes/changes_1.0.6.md

@@ -1,10 +1,15 @@
-# metabase-driver 1.0.6, released 2023-06-??
+# metabase-driver 1.0.6, released 2023-10-09
 
-Code name: Test with Exasol 8
+Code name: Test with Exasol 8, upgrade to Metabase v0.47.3
 
 ## Summary
 
-This release adds tests for Exasol version 8 and adapts the driver to Metabase v0.46.5.
+This release adds tests for Exasol version 8 and adapts the driver to Metabase v0.47.3.
+
+## Features
+
+* #72: Upgraded to Metabase v0.47.3
+* #71: Upgraded JDBC driver to 7.1.20
 
 ## Tests
 

doc/developer_guide/developer_guide.md

@@ -45,17 +45,17 @@ clojure --version
     git clone https://github.com/metabase/metabase.git
     cd metabase
     git fetch --all --tags
-    export METABASE_VERSION=v0.46.5
+    export METABASE_VERSION=v0.47.3
     git reset --hard
-    rm -vf target/patch_excluded_test_applied target/patch_fix_metabase_build_applied
+    rm -vf target/patch_excluded_test_applied
     git checkout "tags/${METABASE_VERSION}" -b "${METABASE_VERSION}-branch"
     # Build (this will take ~15min)
     ./bin/build.sh
     # Run
     clojure -M:run
     ```
 
-2. Download the Exasol JDBC driver from the [Download Portal](https://www.exasol.com/portal/display/DOWNLOAD/) and install it:
+2. Download the Exasol JDBC driver from the [Download Portal](https://downloads.exasol.com/clients-and-drivers) and install it:
 
     ```bash
     cp exajdbc.jar "$METABASE_DIR/plugins"
@@ -112,6 +112,14 @@ clojure -M:run
 
 You need to have metabase checked out next to this repository.
 
+Start Exasol docker container:
+
+```shell
+docker run --publish 8563:8563 --publish 2580:2580 --publish 443:443 --detach --privileged --stop-timeout 120 exasol/docker-db:7.1.23
+```
+
+Start integration tests:
+
 ```shell
 EXASOL_HOST=<hostname> EXASOL_PORT=8563 EXASOL_USER=sys EXASOL_PASSWORD=exasol ./scripts/run-integration-tests.sh
 ```
@@ -180,7 +188,7 @@ When the patch file has changed or you updated to a new Metabase release, do the
 
 ```shell
 cd $METABASE_DIR
-git reset --hard && rm -vf target/patch_excluded_test_applied target/patch_fix_metabase_build_applied
+git reset --hard && rm -vf target/patch_excluded_test_applied
 ```
 
 ## Linting

scripts/build.sh

@@ -8,8 +8,6 @@ exasol_driver_dir="$( cd "$(dirname "$0")/.." >/dev/null 2>&1 ; pwd -P )"
 
 source "$exasol_driver_dir/scripts/common.sh"
 
-patch_metbase_build_scripts
-
 log_info "Building exasol driver in $exasol_driver_dir using Metabase $metabase_dir..."
 cd "$metabase_dir"
 DRIVER_PATH=$exasol_driver_dir

scripts/common.sh

@@ -52,23 +52,3 @@ patch_excluded_tests() {
         log_trace "Test exclusion patch already applied"
     fi
 }
-
-patch_metbase_build_scripts() {
-    local patch_applied="$metabase_dir/target/patch_fix_metabase_build_applied"
-    if [ ! -f "$patch_applied" ]; then
-        local patch_file="$exasol_driver_dir/scripts/fix-metabase-build.diff"
-        cd "$metabase_dir"
-        log_info "Check if patch $patch_file can be applied..."
-        if ! git apply --check --verbose "$patch_file" ; then
-            log_error "Error applying patch $patch_file to $metabase_dir"
-            log_error "Please revert your local changes"
-            exit 1
-        fi
-        log_info "Applying patch $patch_file to fix build scripts"
-        git apply --apply --verbose "$patch_file"
-        mkdir -p "$(dirname "$patch_applied")"
-        touch "$patch_applied"
-    else
-        log_trace "Build script patch already applied"
-    fi
-}