Merge pull request #5 from buserbrasil/add_devcontainer

add devcontainer and make possible to build v0.47.3

Author: schumannc

.devcontainer/devcontainer.json

@@ -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"
+            ]
+        }
+    }
+}

.gitignore

@@ -12,9 +12,11 @@ pom.xml.asc
 .hg/
 .lsp
 .clj-kondo
+.calva
 /plugins
 .cpcache
 
 # vscode
 .vscode
-.idea
+.idea
+*.iml

Dockerfile

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

Makefile

@@ -1,11 +1,13 @@
 
 ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
+METABASE_VERSION=v0.47.3
 
 build:
 	@echo "build"
-	./bin/build.sh
-	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,11 +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
-
-first-run:
-	docker pull metabase/metabase:latest
-	make run
+	--mount source=metabase_data,destination=/metabase.db \
+	--name metabase metabase/metabase:$(METABASE_VERSION)

README.md

@@ -4,21 +4,24 @@
 
 Beginning with Metabase 0.32, drivers must be stored in a `plugins` directory in the same directory where `metabase.jar` is, or you can specify the directory by setting the environment variable `MB_PLUGINS_DIR`. There are a few options to get up and running with a custom driver.
 
-You can find jar file on the [release page](https://github.com/schumannc/databricks-sql-driver/releases) or you can build it locally.
+You can find jar file on the [release page](https://github.com/buserbrasil/databricks-sql-driver/releases) or you can build it locally.
 ## Build
 
-In order to build it locally, you're gonna need [metabase](https://github.com/metabase/metabase) project to build this project, so make sure you clone it in a parent directory. 
+Run the following command to build plugin jar file:
 
 ```
 make build
 ```
 
+If all succeed you will find the driver jar under ./plugins folder. 
+
+
 ## Run Locally
 
 ```
-make first-run
+make run
 ```
-Once the Metabase startup completes, you can access your Metabase at `localhost:3000`, which pulls metabase docker image and then start this project. Next time you need to run this project again, you can use `make run` command.
+Once the Metabase startup completes, you can access your Metabase at `localhost:3000`, which pulls metabase docker image and then start this project.
 
 ## Add Data
 
@@ -31,3 +34,18 @@ When you first access, fill some basic info and then go to "Add your data" secti
 ![](screenshots/databricks-sql.png)
 ![](screenshots/metabase-form.png)
 
+## Hacking the Driver whtin devcontainer
+
+For further development try to use devcontainer setup. 
+
+To start a (n)REPL:
+
+```
+./bin/cli.sh
+
+Menu Options:
+[1] nrepl  - start an nREPL
+[2] repl   - start regular repl
+[3] exit   - exit the script
+Enter your choice (1/2/3):
+```

bin/build.sh

@@ -4,11 +4,15 @@
 DRIVER_PATH="$(pwd)"
 
 # switch to the local checkout of the Metabase repo
-cd ../metabase
+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\"}"
+  "{: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/cli.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+cp /driver/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/deps.edn

@@ -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"]}}}

databricks-sql-driver.iml

@@ -2,8 +2,8 @@
  ["src" "resources"]
 
  :deps
- {org.clojure/core.logic {:mvn/version "1.0.0"}
-  com.databricks/databricks-jdbc {:mvn/version "2.6.32"}}
+ {org.clojure.clr/core.logic {:mvn/version "1.0.1"}
+  com.databricks/databricks-jdbc {:mvn/version "2.6.34"}}
 
  ;; 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
@@ -16,4 +16,4 @@
  :aliases
  {:dev
   {:extra-deps
-   {io.github.metabase/metabase {:git/tag "v0.46.0-RC2", :git/sha "32977a42"}}}}}
+   {io.github.metabase/metabase {:git/tag "v0.47.3", :git/sha "4202328"}}}}}