Skip to content

Commit

Permalink
Chore/releasing (#3)
Browse files Browse the repository at this point in the history
* fix: bad aliasing

* feat: utilities + version

* chore: handle databricks V2

* chore :added ignore

* remove jar

* fix: respect metabase version guideline

---------

Co-authored-by: Stefani <>
  • Loading branch information
shrodingers authored Feb 2, 2024
1 parent fb53083 commit 514d271
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@ target/checksum.txt
repo
.cpcache
.lsp
.clj-kondo
.clj-kondo
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ WORKDIR /build/metabase
# Now build the driver
FROM stg_base as stg_build
RUN clojure \
-Sdeps "{:aliases {:sparksql-databricks {:extra-deps {com.metabase/sparksql-databricks {:local/root \"/build/driver\"}}}}}" \
-X:build:sparksql-databricks \
-Sdeps "{:aliases {:sparksql-databricks-v2 {:extra-deps {com.metabase/sparksql-databricks {:local/root \"/build/driver\"}}}}}" \
-X:build:sparksql-databricks-v2 \
build-drivers.build-driver/build-driver! \
"{:driver :sparksql-databricks, :project-dir \"/build/driver\", :target-dir \"/build/driver/target\"}"

Expand Down
6 changes: 3 additions & 3 deletions resources/metabase-plugin.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
info:
name: Metabase Databricks Spark SQL Driver
name: Metabase Databricks Spark SQL Driver (v2)
version: 1.0.0-SNAPSHOT
description: Allows Metabase to connect to Databricks Spark SQL databases.
driver:
- name: hive-like
lazy-load: true
abstract: true
parent: sql-jdbc
- name: sparksql-databricks
display-name: Databricks
- name: sparksql-databricks-v2
display-name: Databricks SQL (v2)
lazy-load: true
parent: hive-like
connection-properties:
Expand Down
7 changes: 7 additions & 0 deletions scripts/extract_plugin.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)

docker buildx build --build-arg METABASE_VERSION=v0.48.3 --target stg_export --platform "linux/arm64" -t metabase:databricks-plugin "$SCRIPT_DIR/.."
container_id=$(docker create "metabase:databricks-plugin" /bin/bash)
docker cp "$container_id:/sparksql-databricks.metabase-driver.jar" "$SCRIPT_DIR/../dist/sparksql-databricks.metabase-driver.jar"
docker rm "$container_id"

6 changes: 4 additions & 2 deletions src/metabase/driver/sparksql_databricks.clj
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
[metabase.util.honey-sql-2 :as h2x])
(:import [java.sql Connection ResultSet]))

(driver/register! :sparksql-databricks, :parent :hive-like)
(driver/register! :sparksql-databricks-v2, :parent :hive-like)

;;; ------------------------------------------ Custom HoneySQL Clause Impls ------------------------------------------

Expand Down Expand Up @@ -114,6 +114,8 @@
:OAuth2Secret app-secret}
(dissoc opts :host :port :db :jdbc-flags :http-path :app-id :app-secret :catalog)))

(defn sparksql-databricks-v2 [params] (sparksql-databricks params))

(defmethod sql-jdbc.conn/connection-details->spec :sparksql-databricks
[_ details]
(-> details
Expand Down Expand Up @@ -228,4 +230,4 @@
(when-not (get (methods driver/supports?) [:sparksql-databricks :foreign-keys])
(defmethod driver/supports? [:sparksql-databricks :foreign-keys] [_ _] true))

(defmethod sql.qp/quote-style :sparksql-databricks [_] :mysql)
(defmethod sql.qp/quote-style :sparksql-databricks [_] :mysql)

0 comments on commit 514d271

Please sign in to comment.