Merge pull request #1924 from metabase/bigquery-driver-improvements-2000

More BigQuery branch improvements 

src/metabase/driver/generic_sql.clj

@@ -270,13 +270,14 @@
 
 
 (defn analyze-table
+  "Default implementation of `analyze-table` for SQL drivers."
   [driver table new-table-ids]
-  ((sync/generic-analyze-table driver
-                               :field-avg-length-fn (partial field-avg-length driver)
-                               :field-percent-urls-fn (partial field-percent-urls driver))
-    driver
-    table
-    new-table-ids))
+  ((sync/make-analyze-table driver
+                            :field-avg-length-fn   (partial field-avg-length driver)
+                            :field-percent-urls-fn (partial field-percent-urls driver))
+   driver
+   table
+   new-table-ids))
 
 
 (defn ISQLDriverDefaultsMixin

src/metabase/driver/generic_sql/query_processor.clj

@@ -28,14 +28,16 @@
                                                       RelativeDateTimeValue
                                                       Value)))
 
-(def ^:private ^:dynamic *query* nil)
+(def ^:dynamic *query*
+  "The outer query currently being processed."
+  nil)
 
 (defn- driver [] (:driver *query*))
 
 
 ;;; ## Formatting
 
-(defn- as
+(defn as
   "Generate a FORM `AS` FIELD alias using the name information of FIELD."
   [form field]
   [form (name field)])

src/metabase/driver/mongo.clj

@@ -116,14 +116,12 @@
           (:nested-fields field-info) (assoc :nested-fields (set (for [field (keys (:nested-fields field-info))]
                                                                   (describe-table-field field (field (:nested-fields field-info))))))))
 
-(defn describe-database
-  [_ database]
+(defn- describe-database [database]
   (with-mongo-connection [^com.mongodb.DB conn database]
     {:tables (set (for [collection (set/difference (mdb/get-collection-names conn) #{"system.indexes"})]
                     {:name collection}))}))
 
-(defn describe-table
-  [_ table]
+(defn- describe-table [table]
   (with-mongo-connection [^com.mongodb.DB conn (table/database table)]
     ;; TODO: ideally this would take the LAST set of rows added to the table so we could ensure this data changes on reruns
     (let [parsed-rows (->> (mc/find-maps conn (:name table))
@@ -172,8 +170,8 @@
   (merge driver/IDriverDefaultsMixin
          {:analyze-table                     analyze-table
           :can-connect?                      can-connect?
-          :describe-database                 describe-database
-          :describe-table                    describe-table
+          :describe-database                 (u/drop-first-arg describe-database)
+          :describe-table                    (u/drop-first-arg describe-table)
           :details-fields                    (constantly [{:name         "host"
                                                            :display-name "Host"
                                                            :default      "localhost"}

src/metabase/driver/sync.clj

@@ -609,8 +609,8 @@ infer-field-special-type
        (test:url-special-type   driver field)
        (test:json-special-type  driver field)))
 
-(defn generic-analyze-table
-  "Generic implementation of `analyze-table`."
+(defn make-analyze-table
+  "Make a generic implementation of `analyze-table`."
   [driver & {:keys [field-avg-length-fn field-percent-urls-fn]
              :or   {field-avg-length-fn   (partial driver/default-field-avg-length driver)
                     field-percent-urls-fn (partial driver/default-field-percent-urls driver)}}]
@@ -622,3 +622,8 @@ infer-field-special-type
                       (cond->> {:id id}
                         (test-for-cardinality? field new-field?) (test:cardinality-and-extract-field-values field)
                         new-field?                               (test:new-field driver field))))})))
+
+(defn generic-analyze-table
+  "An implementation of `analyze-table` using the defaults (`default-field-avg-length` and `field-percent-urls`)."
+  [driver table new-field-ids]
+  ((make-analyze-table driver) driver table new-field-ids))

test/metabase/driver/query_processor_test.clj

@@ -1448,6 +1448,7 @@
   (sad-toucan-incidents-with-bucketing :week))
 
 (expect-with-non-timeseries-dbs
+  ;; Not really sure why different drivers have different opinions on these </3
   (cond
     (contains? #{:sqlserver :sqlite} *engine*)
     [[23 54] [24 46] [25 39] [26 61]]