Merge pull request #3 from db-caioishizaka/0_50_support

0 50 support

Author: db-caioishizaka

Dockerfile

@@ -5,7 +5,7 @@ COPY . /driver
 RUN apt-get update && apt-get install -y \
 curl
 
-ARG METABASE_VERSION="v0.49.3"
+ARG METABASE_VERSION="v0.50.4"
 
 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.50.4
 
 build:
 	@echo "build"

README.md

@@ -2,7 +2,7 @@
 
 ## Installation
 
-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.
+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.
 ## Build
@@ -22,9 +22,15 @@ Once the Metabase startup completes, you can access your Metabase at `localhost:
 
 ## Usage
 
-Copy `host`, `http-path`, `personal-access-token`, `Catalog` and `database` to metabase form.
+Copy `host`, `http-path`, `personal-access-token`, `Catalog` from your Databricks SQL Warehouse page (Connection Details tab) to metabase form.
+
+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.
+
+## 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
 
 
 ![](screenshots/databricks-sql.png)
-![](screenshots/metabase-form-2.png)
+![](screenshots/metabase-form-0_1_0.png)
 

deps.edn

@@ -2,7 +2,7 @@
  ["src" "resources"]
 
  :deps
- {com.databricks/databricks-jdbc {:mvn/version "2.6.36" :exclusion [log4j/log4j]}}
+ {com.databricks/databricks-jdbc {:mvn/version "2.6.38" :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

resources/metabase-plugin.yaml

@@ -1,6 +1,6 @@
 info:
   name: Metabase Databricks SQL Driver
-  version: 1.0.0-SNAPSHOT-0.0.1
+  version: 0.1.0
   description: Allows Metabase to connect to Databricks SQL werehouse
 dependencies:
   - plugin: Metabase Spark SQL Driver
@@ -20,11 +20,10 @@ driver:
       - name: db
         display-name: Catalog
         default: hive_metastore
-        required: true
-      - name: schema
-        display-name: Database        
-        default: default
-        required: true
+        required: true      
+      - name: schema-filters
+        type: schema-filters
+        display-name: Schemas  
       - advanced-options-start
       - default-advanced-options
 init:

screenshots/metabase-form-0_1_0.png

@@ -11,11 +11,13 @@
             [metabase.driver.sql.query-processor :as sql.qp]
             [metabase.driver.sql.util :as sql.u]
             [metabase.driver.sql.util.unprepare :as unprepare]
-            [metabase.mbql.util :as mbql.u]
+            [metabase.driver.sync :as driver.s]
+            [metabase.legacy-mbql.util :as mbql.u]
             [metabase.query-processor.util :as qp.util]
             [java-time :as t]
             [metabase.util :as u]
-            [metabase.util.date-2 :as u.date])            
+            [metabase.util.date-2 :as u.date]
+            [metabase.util.log :as log])            
   (:import [java.sql Connection ResultSet Types]
            [java.time LocalDate OffsetDateTime ZonedDateTime]))
 
@@ -67,16 +69,31 @@
     #"map"              :type/Dictionary
     #".*"               :type/*))
 
-;; workaround for SPARK-9686 Spark Thrift server doesn't return correct JDBC metadata
+(def ^:private get-tables-sql  
+  [(str/join
+    "\n"
+    ["select"
+     "  table_name as name,"
+     "  table_schema as schema,"
+     "  table_type as type,"
+     "  comment as description"
+     "  from information_schema.tables"
+     "  where table_schema NOT IN ('information_schema')"])])
+
+(defn- describe-database-tables
+  [database]
+  (let [[inclusion-patterns
+         exclusion-patterns] (driver.s/db-details->schema-filter-patterns database)
+        syncable? (fn [schema]
+                    (driver.s/include-schema? inclusion-patterns exclusion-patterns schema))]
+    (eduction
+     (comp (filter (comp syncable? :schema))
+           (map #(dissoc % :type)))
+     (sql-jdbc.execute/reducible-query database get-tables-sql))))
+
 (defmethod driver/describe-database :databricks-sql
-  [_ database]
-  {:tables
-   (with-open [conn (jdbc/get-connection (sql-jdbc.conn/db->pooled-connection-spec database))]
-     (set
-      (for [{:keys [database tablename], table-namespace :namespace} (jdbc/query {:connection conn} ["show tables"])]
-        {:name   tablename
-         :schema (or (not-empty database)
-                     (not-empty table-namespace))})))})
+  [_driver database]  
+  {:tables (into #{} (describe-database-tables database))})
 
 ;; Hive describe table result has commented rows to distinguish partitions
 (defn- valid-describe-table-row? [{:keys [col_name data_type]}]
@@ -160,19 +177,28 @@
 ;; the current HiveConnection doesn't support .createStatement
 (defmethod sql-jdbc.execute/statement-supported? :databricks-sql [_] false)
 
-(doseq [feature [:basic-aggregations
-                 :binning
-                 :expression-aggregations
-                 :expressions
-                 :native-parameters
-                 :nested-queries
-                 :standard-deviation-aggregations]]
-  (defmethod driver/supports? [:databricks-sql feature] [_ _] true))
+
+(doseq [[feature supported?] {:basic-aggregations              true
+                              :binning                         true
+                              :expression-aggregations         true
+                              :expressions                     true
+                              :full-join                       true
+                              :right-join                      true
+                              :left-join                       true
+                              :inner-join                      true
+                              :foreign-keys                    false
+                              :native-parameters               true
+                              :nested-queries                  true
+                              :standard-deviation-aggregations true
+                              :metadata/key-constraints        false
+                              :test/jvm-timezone-setting       false                              
+                              :window-functions/cumulative     false}]
+  (defmethod driver/database-supports? [:databricks-sql feature] [_driver _feature _db] supported?))
 
 ;; only define an implementation for `:foreign-keys` if none exists already. In test extensions we define an alternate
 ;; implementation, and we don't want to stomp over that if it was loaded already
-(when-not (get (methods driver/supports?) [:databricks-sql :foreign-keys])
-  (defmethod driver/supports? [:databricks-sql :foreign-keys] [_ _] true))
+(when-not (get (methods driver/database-supports?) [:databricks-sql :foreign-keys])
+  (defmethod driver/database-supports? [:databricks-sql :foreign-keys] [_ _] true))
 
 (defmethod sql.qp/quote-style :databricks-sql [_] :mysql)