Merge pull request #9 from buserbrasil/schumann/fix-connection

fix connection

Author: avelino

Dockerfile

@@ -1,8 +1,11 @@
-FROM clojure:tools-deps-1.11.1.1413-focal
+FROM clojure:tools-deps-1.11.1.1435-bookworm
 
 COPY . /driver
 
-ARG METABASE_VERSION="v0.49.3"
+RUN apt-get update && apt-get install -y --no-install-recommends curl && \
+    rm -rf /var/lib/apt/lists/*
+
+ARG METABASE_VERSION="v0.49.15"
 
 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.49.3
+METABASE_VERSION=v0.49.15
 
 build:
 	@echo "build"

deps.edn

@@ -2,17 +2,13 @@
  ["src" "resources"]
 
  :deps
- {com.databricks/databricks-jdbc {:mvn/version "2.6.34" :exclusion [log4j/log4j]}}
+ {com.databricks/databricks-jdbc {:mvn/version "2.6.38"}}
+
 
  ;; 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/"}}
-
  :aliases
  {:dev
   {:extra-deps
-   {io.github.metabase/metabase {:git/tag "v0.49.3", :git/sha "4202328"}}}}}
+   {com.github.metabase/metabase {:git/tag "v0.49.15", :git/sha "77a08d7710d79f82c52c1d1e3cd3d4edc10bd8406d93eec9988d12158334ecc3"}}}}}

src/metabase/driver/databricks_sql.clj

@@ -3,6 +3,8 @@
             [clojure.string :as str]
             [medley.core :as m]
             [metabase.driver :as driver]
+            [metabase.driver.sql-jdbc
+             [common :as sql-jdbc.common]]
             [metabase.driver.sql-jdbc.connection :as sql-jdbc.conn]
             [metabase.driver.sql-jdbc.execute :as sql-jdbc.execute]
             [metabase.driver.sql-jdbc.sync :as sql-jdbc.sync]
@@ -11,23 +13,35 @@
             [metabase.driver.sql.util.unprepare :as unprepare]
             [metabase.mbql.util :as mbql.u]
             [metabase.query-processor.util :as qp.util])
-  (:import [java.sql Connection ResultSet]))
+  (:import 
+   (java.sql Connection ResultSet)))
 
 (set! *warn-on-reflection* true)
 
 (driver/register! :databricks-sql, :parent :sql-jdbc)
 
+(defn- sparksql-databricks
+  "Create a database specification for a Spark SQL database."
+  [{:keys [host db jdbc-flags] :as opts}]
+  (merge
+   {:classname   "metabase.driver.databricks-sql.FixedDatabricksDriver"
+    :subprotocol "databricks"
+    :subname     (str "//" host ":443/" db jdbc-flags)}
+   (dissoc opts :host :db :jdbc-flags)))
+
 (defmethod sql-jdbc.conn/connection-details->spec :databricks-sql
-  [_ {:keys [host http-path token db]}]
-  {:classname        "com.databricks.client.jdbc.Driver"
-   :subprotocol      "databricks"
-   :subname          (str "//" host ":443/" db)
-   :transportMode    "http"
-   :ssl              1
-   :AuthMech         3
-   :httpPath         http-path
-   :uid              "token"
-   :pwd              token})
+  [_ details]
+  (-> details
+      (assoc :jdbc-flags (str ";transportMode=http"
+                              ";ssl=1"
+                              ";AuthMech=3"
+                              ";LogLevel=0"
+                              ";UID=token"
+                              ";PWD=" (:token details)
+                              ";httpPath=" (:http-path details))) 
+      (select-keys [:host :db :jdbc-flags :dbname])
+      sparksql-databricks
+      (sql-jdbc.common/handle-additional-options details)))
 
 ;; The Hive JDBC driver doesn't support `Connection.isValid()`,
 ;; so we need to supply a test query for c3p0 to use to validate

src/metabase/driver/databricks_sql/FixedDatabricksDriver.clj

@@ -0,0 +1,18 @@
+(ns metabase.driver.databricks-sql.FixedDatabricksDriver
+  (:gen-class
+   :extends com.databricks.client.jdbc.Driver
+   :exposes-methods {connect superConnect}
+   :init init
+   :prefix "driver-"
+   :constructors {[] []})
+  (:require [metabase.driver.databricks-sql.connection :as connection]))
+
+(defn driver-init
+  "Initializes the Spark driver"
+  []
+  [[] nil])
+
+(defn driver-connect
+  "Connects to a Spark database, fixing the connection to with Metabase"
+  [^com.databricks.client.jdbc.Driver this, ^String url, ^java.util.Properties info]
+  (connection/decorate-and-fix (.superConnect this url info)))

src/metabase/driver/databricks_sql/connection.clj

@@ -0,0 +1,52 @@
+(ns metabase.driver.databricks-sql.connection
+  (:require [clojure.reflect]
+            [clojure.set])
+  (:import [java.sql ResultSet SQLException]))
+
+(defmacro decorator
+  [clazz proto & fs]
+  (let [proto-name (gensym "proto")
+        methods (->> (clojure.reflect/reflect (resolve clazz))
+                     :members
+                     (filter #(instance? clojure.reflect.Method %))
+                     (map (fn [{:keys [name parameter-types]}]
+                            [name (count parameter-types)]))
+                     set)
+        to-delegate (clojure.set/difference
+                     methods
+                     (->> fs
+                          (map (fn [[name params]]
+                                 [name (count params)]))
+                          set))
+        method-bodies
+        (concat
+         fs ;; these are our own definitions
+         (for [[name n-params] to-delegate]
+           (let [params (->> (range n-params)
+                             (map #(gensym (str "x" %))))]
+             `(~name [~@params]
+                     (. ~proto-name (~name ~@params))) ;; this is where we delegate to the prototype
+             )))]
+    `(let [~proto-name ~proto]
+       (proxy
+        [~clazz] []
+         ~@(->> method-bodies (group-by first) (sort-by first)
+                (map (fn [[name bodies]]
+                       `(~name ~@(for [[name & rest] bodies]
+                                   rest)))))))))
+
+(defn decorate-and-fix
+  [impl]
+  (when impl
+    (decorator
+     java.sql.Connection
+     impl
+     (getHoldability
+      []
+      ResultSet/CLOSE_CURSORS_AT_COMMIT)
+     (setReadOnly
+      [read-only?]
+      (when (.isClosed this)
+        (throw (SQLException. "Connection is closed")))
+      (when read-only?
+        (throw (SQLException. "Enabling read-only mode is not supported")))))))