Merge pull request #4 from db-caioishizaka/jdbc_options

Added support to additional options

Author: db-caioishizaka

Dockerfile

@@ -5,7 +5,7 @@ COPY . /driver
 RUN apt-get update && apt-get install -y \
 curl
 
-ARG METABASE_VERSION="v0.50.4"
+ARG METABASE_VERSION="v0.50.13"
 
 RUN curl -Lo - https://github.com/metabase/metabase/archive/refs/tags/${METABASE_VERSION}.tar.gz | tar -xz && mv metabase-* /metabase
 

Makefile

@@ -1,6 +1,6 @@
 
 ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
-METABASE_VERSION=v0.50.4
+METABASE_VERSION=v0.50.13
 
 build:
 	@echo "build"

README.md

@@ -26,6 +26,10 @@ Copy `host`, `http-path`, `personal-access-token`, `Catalog` from your Databrick
 
 Since 0.1.0, you don't need to specify the schema/database. Now you can opt between bringing all schemas, just a few named schemas, or all schemas but a selected few.
 
+You can add any supported properties on Additional Options. You can find [supported properties on our guide](https://docs.databricks.com/en/_extras/documents/Databricks-JDBC-Driver-Install-and-Configuration-Guide.pdf). Properties not supported will be attempted to be applied as Spark server-side property.
+
+One example of Spark server-side property is `statement_timeout`. If you add `STATEMENT_TIMEOUT=3600`, for instance, all statements run by metabase in that connection will have a timeout of 3600s. That will not change the default statement timeout of the warehouse nor the workspace.
+
 ## Compatibility
 
 Latest version (0.1.0) is compatible with Metabase 0.50 onwards, it is not back compatible with 0.49. For earlier versions check previous releases

deps.edn

@@ -15,4 +15,4 @@
  :aliases
  {:dev
   {:extra-deps
-   {io.github.metabase/metabase {:git/tag "v0.50.4", :git/sha "8ec7490"}}}}}
+   {io.github.metabase/metabase {:git/tag "v0.50.13", :git/sha "57b54ebd2b60e8fc52ba332062d9130f60489aba33aa56b9e639d4ad450c815b"}}}}}

resources/metabase-plugin.yaml

@@ -1,6 +1,6 @@
 info:
   name: Metabase Databricks SQL Driver
-  version: 0.1.0
+  version: 0.1.1
   description: Allows Metabase to connect to Databricks SQL werehouse
 dependencies:
   - plugin: Metabase Spark SQL Driver
@@ -24,6 +24,10 @@ driver:
       - name: schema-filters
         type: schema-filters
         display-name: Schemas  
+      - merge:
+        - additional-options
+        - name: jdbc-flags
+          placeholder: ';option=value'
       - advanced-options-start
       - default-advanced-options
 init:

src/metabase/driver/databricks_sql.clj

@@ -24,10 +24,10 @@
 (driver/register! :databricks-sql, :parent :sql-jdbc)
 
 (defmethod sql-jdbc.conn/connection-details->spec :databricks-sql
-  [_ {:keys [host http-path password schema db]}]
+  [_ {:keys [host http-path password schema db jdbc-flags]}]
   {:classname        "com.databricks.client.jdbc.Driver"
    :subprotocol      "databricks"
-   :subname          (str "//" host ":443/" schema)
+   :subname          (str "//" host ":443/" schema jdbc-flags)
    :transportMode    "http"
    :ssl              1
    :AuthMech         3