Merge pull request #2 from db-caioishizaka/catalog_support

Catalog support

Author: db-caioishizaka

.DS_Store

@@ -0,0 +1,24 @@
+{
+    "name": "clojure",
+    "build": {
+        "dockerfile": "../Dockerfile"
+    },
+    "forwardPorts": [
+        3000
+    ],
+    "workspaceFolder": "/driver",
+    "mounts": [
+        {
+            "source": "${localWorkspaceFolder}",
+            "target": "${containerWorkspaceFolder}",
+            "type": "bind"
+        }
+    ],
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "betterthantomorrow.calva"
+            ]
+        }
+    }
+}

.devcontainer/devcontainer.json

@@ -0,0 +1,12 @@
+FROM clojure:tools-deps-1.11.1.1413
+
+COPY . /driver
+
+RUN apt-get update && apt-get install -y \
+curl
+
+ARG METABASE_VERSION="v0.49.3"
+
+RUN curl -Lo - https://github.com/metabase/metabase/archive/refs/tags/${METABASE_VERSION}.tar.gz | tar -xz && mv metabase-* /metabase
+
+WORKDIR /driver

Dockerfile

@@ -1,11 +1,13 @@
 
 ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
+METABASE_VERSION=v0.49.3
 
 build:
 	@echo "build"
-	clj -X:build :project-dir "\"$(ROOT_DIR)\""
-	mkdir -p ./plugins
-	cp ./target/databricks-sql.metabase-driver.jar ./plugins
+	docker build . -t build-driver
+	docker run -it \
+	--mount type=bind,source=$(ROOT_DIR),destination=/driver \
+	build-driver:latest bash ./bin/build.sh
 
 cleanup:
 	@echo "cleanup"
@@ -16,7 +18,7 @@ cleanup:
 run: cleanup
 	@echo "deploy metabase with databricks-sql driver"
 	chmod 777 ./plugins
-	docker run -d -p 3000:3000 \
+	docker run -it -p 3000:3000 \
 	--mount type=bind,source=$(ROOT_DIR)/plugins,destination=/plugins \
-	--mount source=metabase,destination=/metabase.db \
-	--name metabase metabase/metabase
+	--mount source=metabase_data,destination=/metabase.db \
+	--name metabase metabase/metabase:$(METABASE_VERSION)

Makefile

@@ -16,17 +16,15 @@ make build
 ## Run Locally
 
 ```
-docker pull metabase/metabase:latest
-
 make run
 ```
 Once the Metabase startup completes, you can access your Metabase at `localhost:3000`.
 
 ## Usage
 
-Copy `host`, `http-path` and your `personal-access-token` to metabase form.
+Copy `host`, `http-path`, `personal-access-token`, `Catalog` and `database` to metabase form.
 
 
 ![](screenshots/databricks-sql.png)
-![](screenshots/metabase-form.png)
+![](screenshots/metabase-form-2.png)
 

README.md

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# get absolute path to the driver project directory
+DRIVER_PATH="$(pwd)"
+
+# switch to the local checkout of the Metabase repo
+cd /metabase
+
+# Build driver. See explanation below
+clojure \
+  -Sdeps "{:aliases {:databricks-sql {:extra-deps {com.metabase/databricks-sql-driver {:local/root \"$DRIVER_PATH\"}}}}}"  \
+  -X:build:databricks-sql \
+  build-drivers.build-driver/build-driver! \
+  "{:driver :databricks-sql, :project-dir \"$DRIVER_PATH\", :target-dir \"$DRIVER_PATH/target\"}"
+
+mkdir -p $DRIVER_PATH/plugins
+
+cp $DRIVER_PATH/target/databricks-sql.metabase-driver.jar $DRIVER_PATH/plugins

bin/build.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+#cp ./bin/deps.edn ~/.clojure/deps.edn
+cd ../metabase
+
+function nrepl() {
+    clojure -M:user/databricks-sql:nrepl
+}
+
+function repl() {
+    clojure -M:user/databricks-sql
+}
+
+function options() {
+    echo "Menu Options:"
+    echo "[1] nrepl  - start an nREPL"
+    echo "[2] repl   - start regular repl"
+    echo "[3] exit   - exit the script"
+}
+
+# Main loop
+while true; do
+  options
+  read -p "Enter your choice (1/2/3): " choice
+
+  case $choice in
+    1)
+      nrepl
+      ;;
+    2)
+      repl
+      ;;
+    *)
+      echo "Exiting the script."
+      cd /driver
+      exit 0
+      ;;
+  esac
+done

bin/cli.sh

@@ -0,0 +1,5 @@
+;; ~/.clojure/deps.edn
+{:aliases
+ {:user/databricks-sql
+  {:extra-deps {metabase/databricks-sql {:local/root "/driver"}}
+   :jvm-opts   ["-Dmb.dev.additional.driver.manifest.paths=/driver/resources/metabase-plugin.yaml"]}}}

bin/deps.edn

@@ -2,14 +2,17 @@
  ["src" "resources"]
 
  :deps
- {com.databricks/databricks-jdbc {:mvn/version "2.6.27"}}
+ {com.databricks/databricks-jdbc {:mvn/version "2.6.36" :exclusion [log4j/log4j]}}
+
+ ;; the stuff below is only for hacking on the driver locally and is not needed if you follow the instructions in the
+ ;; README and create a `:local/root` dep for the driver and launch the REPL from the Metabase project rather than
+ ;; from here
+
+ ;;; needed for Metabase as a local dep for local development
+ :mvn/repos
+ {"opensaml" {:url "https://build.shibboleth.net/nexus/content/repositories/releases/"}}
 
- ;; build the driver with clojure -X:build
  :aliases
- {:build
-  {:extra-deps {metabase/metabase-core {:local/root "../metabase"}
-                metabase/build-drivers {:local/root "../metabase/bin/build-drivers"}}
-   :exec-fn    build-drivers.build-driver/build-driver!
-   :exec-args  {:driver      :databricks-sql
-                :project-dir "."
-                :target-dir  "./target"}}}}
+ {:dev
+  {:extra-deps
+   {io.github.metabase/metabase {:git/tag "v0.49.3", :git/sha "dba0992"}}}}}

deps.edn

@@ -14,15 +14,21 @@ driver:
       - name: http-path 
         display-name: HTTP path
         required: true
-      - name: token
+      - name: password
         display-name: Personal Access Token
         required: true 
       - name: db
-        display-name: Database
+        display-name: Catalog
+        default: hive_metastore
+        required: true
+      - name: schema
+        display-name: Database        
         default: default
-        required: true 
+        required: true
+      - advanced-options-start
+      - default-advanced-options
 init:
   - step: load-namespace
     namespace: metabase.driver.databricks-sql
   - step: register-jdbc-driver
-    class: com.databricks.client.jdbc.Driver
+    class: com.databricks.client.jdbc.Driver