Disable :left-join for now, impl tx/dataset-already-loaded?override

ClickHouse · Oct 25, 2024 · 69bdb72 · 69bdb72
1 parent 8e05cfa
commit 69bdb72
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -10,7 +10,7 @@ on:
   pull_request:
 
 env:
-  METABASE_VERSION: v0.50.30.1
+  METABASE_VERSION: v1.51.1.2
 
 jobs:
   check-local-current-version:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -115,7 +115,7 @@ services:
   ##########################################################################################################
 
   metabase:
-    image: metabase/metabase-enterprise:v1.50.3
+    image: metabase/metabase-enterprise:v1.51.1.2
     container_name: metabase-with-clickhouse-driver
     hostname: metabase
     environment:

diff --git a/src/metabase/driver/clickhouse.clj b/src/metabase/driver/clickhouse.clj
@@ -44,7 +44,8 @@
                               :schemas                         true
                               :datetime-diff                   true
                               :upload-with-auto-pk             false
-                              :window-functions/offset         false}]
+                              :window-functions/offset         false
+                              :left-join                       false}]
   (defmethod driver/database-supports? [:clickhouse feature] [_driver _feature _db] supported?))
 
 (def ^:private default-connection-details

diff --git a/test/metabase/test/data/clickhouse.clj b/test/metabase/test/data/clickhouse.clj
@@ -145,7 +145,7 @@
   [f]
   (when (not @test-db-initialized?)
     (let [details (tx/dbdef->connection-details :clickhouse :db {:database-name "metabase_test"})]
-      (println "Executing create-test-db! with details:" details)
+      ;; (println "Executing create-test-db! with details:" details)
       (jdbc/with-db-connection
         [spec (sql-jdbc.conn/connection-details->spec :clickhouse (merge {:engine :clickhouse} details))]
         (let [statements (as-> (slurp "modules/drivers/clickhouse/test/metabase/test/data/datasets.sql") s
@@ -167,7 +167,7 @@
     {:write? true}
     (fn [^java.sql.Connection conn]
       (doseq [statement statements]
-        (println "Executing:" statement)
+        ;; (println "Executing:" statement)
         (with-open [jdbcStmt (.createStatement conn)]
           (let [^ClickHouseStatementImpl clickhouseStmt (.unwrap jdbcStmt ClickHouseStatementImpl)
                 request (.getRequest clickhouseStmt)]
@@ -186,3 +186,22 @@
       :details (tx/dbdef->connection-details :clickhouse :db {:database-name "metabase_test"})}]
     (sync-metadata/sync-db-metadata! database)
     (f database)))
+
+(defmethod tx/dataset-already-loaded? :clickhouse
+  [driver dbdef]
+  (let [tabledef       (first (:table-definitions dbdef))
+        db-name        (ddl.i/format-name :clickhouse (:database-name dbdef))
+        table-name     (ddl.i/format-name :clickhouse (:table-name tabledef))
+        details        (tx/dbdef->connection-details :clickhouse :db {:database-name db-name})]
+    (sql-jdbc.execute/do-with-connection-with-options
+     driver
+     (sql-jdbc.conn/connection-details->spec driver details)
+     {:write? false}
+     (fn [^java.sql.Connection conn]
+       (with-open [rset (.getTables (.getMetaData conn)
+                                    #_catalog        nil
+                                    #_schema-pattern db-name
+                                    #_table-pattern  table-name
+                                    #_types          (into-array String ["TABLE"]))]
+         ;; if the ResultSet returns anything we know the table is already loaded.
+         (.next rset))))))