Minor code style changes [ci drivers]

Mostly this commit marks test functions as private if their not used
outside of their ns

src/metabase/api/field.clj

@@ -36,7 +36,7 @@
   {caveats            (s/maybe su/NonBlankString)
    description        (s/maybe su/NonBlankString)
    display_name       (s/maybe su/NonBlankString)
-   fk_target_field_id (s/maybe s/Int)
+   fk_target_field_id (s/maybe su/IntGreaterThanZero)
    points_of_interest (s/maybe su/NonBlankString)
    special_type       (s/maybe FieldType)
    visibility_type    (s/maybe FieldVisibilityType)}
@@ -81,7 +81,7 @@
   [id :as {{dimension-type :type dimension-name :name human_readable_field_id :human_readable_field_id} :body}]
   {dimension-type         (s/enum "internal" "external")
    dimension-name         su/NonBlankString
-   human_readable_field_id (s/maybe s/Int)}
+   human_readable_field_id (s/maybe su/IntGreaterThanZero)}
   (let [field (api/read-check Field id)]
     (if-let [dimension (Dimension :field_id id)]
       (db/update! Dimension (:id dimension)
@@ -107,14 +107,14 @@
       [400 "If remapped values are specified, they must be specified for all field values"])
     has-human-readable-values?))
 
-(defn- update-field-values [field-value-id value-pairs]
+(defn- update-field-values! [field-value-id value-pairs]
   (let [human-readable-values? (validate-human-readable-pairs value-pairs)]
     (api/check-500 (db/update! FieldValues field-value-id
                      :values (map first value-pairs)
                      :human_readable_values (when human-readable-values?
                                               (map second value-pairs))))))
 
-(defn- create-field-values
+(defn- create-field-values!
   [field value-pairs]
   (let [human-readable-values? (validate-human-readable-pairs value-pairs)]
     (db/insert! FieldValues
@@ -133,8 +133,8 @@
       (api/check (field-should-have-field-values? field)
         [400 "You can only update the human readable values of a mapped values of a Field whose 'special_type' is 'category'/'city'/'state'/'country' or whose 'base_type' is 'type/Boolean'."])
       (if-let [field-value-id (db/select-one-id FieldValues, :field_id id)]
-        (update-field-values field-value-id value-pairs)
-        (create-field-values field value-pairs)))
+        (update-field-values! field-value-id value-pairs)
+        (create-field-values! field value-pairs)))
     (catch Exception e (println "fail") (.printStackTrace e) (throw e)))
   {:status :success})
 

src/metabase/api/table.clj

@@ -83,11 +83,10 @@
 (defn- format-fields-for-response [resp]
   (update resp :fields
           (fn [fields]
-            (map (fn [{:keys [values] :as field}]
-                   (if (seq values)
-                     (update field :values fv/field-values->pairs)
-                     field))
-                 fields))))
+            (for [{:keys [values] :as field} fields]
+              (if (seq values)
+                (update field :values fv/field-values->pairs)
+                field)))))
 
 (api/defendpoint GET "/:id/query_metadata"
   "Get metadata about a `Table` useful for running queries.

src/metabase/driver/googleanalytics/query_processor.clj

@@ -4,7 +4,6 @@
             [clojure.tools.reader.edn :as edn]
             [medley.core :as m]
             [metabase.query-processor.util :as qputil]
-            [metabase.query-processor.middleware.expand :as ql]
             [metabase.util :as u])
   (:import [com.google.api.services.analytics.model GaData GaData$ColumnHeaders]
            [metabase.query_processor.interface AgFieldRef DateTimeField DateTimeValue Field RelativeDateTimeValue Value]))

src/metabase/driver/mongo/query_processor.clj

@@ -201,7 +201,7 @@
   (let [all-fields (distinct (annotate/collect-fields query :keep-date-time-fields))]
     (if-not (seq all-fields)
       pipeline-ctx
-      (let [projections (doall (map #(vector (->lvalue %) (->initial-rvalue %)) all-fields))]
+      (let [projections (map #(vector (->lvalue %) (->initial-rvalue %)) all-fields)]
         (-> pipeline-ctx
             (assoc  :projections (doall (map (comp keyword first) projections)))
             (update :query conj {$project (into (hash-map) projections)}))))))

test/metabase/api/table_test.clj

@@ -498,7 +498,7 @@
   []
   ((user->client :crowberto) :get 200 "table/card__1000/fks"))
 
-(defn narrow-fields [category-names api-response]
+(defn- narrow-fields [category-names api-response]
   (for [field (:fields api-response)
         :when (contains? (set category-names) (:name field))]
     (-> field

test/metabase/driver/bigquery_test.clj

@@ -9,7 +9,7 @@
              [util :as tu]]
             [metabase.test.data.datasets :refer [expect-with-engine]]))
 
-(def col-defaults
+(def ^:private col-defaults
   {:remapped_to nil, :remapped_from nil})
 
 ;; Test native queries

test/metabase/driver/druid_test.clj

@@ -45,7 +45,6 @@
    :data      {:columns     ["timestamp" "id" "user_name" "venue_price" "venue_name" "count"]
                :rows        [["2013-01-03T08:00:00.000Z" "931" "Simcha Yan" "1" "Kinaree Thai Bistro"       1]
                              ["2013-01-10T08:00:00.000Z" "285" "Kfir Caj"   "2" "Ruen Pair Thai Restaurant" 1]]
-
                :cols        (mapv #(merge col-defaults %)
                                   [{:name "timestamp",   :display_name "Timestamp"}
                                    {:name "id",          :display_name "ID"}

test/metabase/driver/mongo_test.clj

@@ -78,7 +78,6 @@
    :row_count 1
    :data      {:rows        [[1]]
                :columns     ["count"]
-
                :cols        [{:name "count", :display_name "Count", :base_type :type/Integer
                               :remapped_to nil, :remapped_from nil}]
                :native_form {:collection "venues"

test/metabase/query_processor/expand_resolve_test.clj

@@ -24,16 +24,22 @@
     :else           o))
 
 (def ^:private resolve'
+  "Testing the resolve middleware requires that the source table be
+  resolved before calling the resolve function. In the query pipeline
+  this is two separate steps. This function combines the function for
+  resolving the source table and the middleware that resolves the rest
+  of the expanded query into a single function to make tests more
+  concise."
   (comp resolve/resolve (st/resolve-source-table-middleware identity)))
 
-(def field-ph-defaults
+(def ^:private field-ph-defaults
   {:fk-field-id        nil
    :datetime-unit      nil
    :remapped-from      nil
    :remapped-to        nil
    :field-display-name nil})
 
-(def field-defaults
+(def ^:private field-defaults
   {:fk-field-id     nil
    :visibility-type :normal
    :position        nil
@@ -46,7 +52,7 @@
    :dimensions      []
    :values          []})
 
-(def price-field-values
+(def ^:private price-field-values
   {:field-value-id true
    :created-at true
    :updated-at true

test/metabase/query_processor/middleware/add_dimension_projections_test.clj

@@ -9,7 +9,7 @@
 
 (tu/resolve-private-vars metabase.query-processor.middleware.add-dimension-projections remap-results add-fk-remaps)
 
-(def col-defaults
+(def ^:private col-defaults
   {:description nil
      :source :fields,
      :extra_info {},
@@ -21,7 +21,7 @@
      :remapped_from nil,
      :remapped_to nil})
 
-(def example-resultset
+(def ^:private example-resultset
   {:rows
    [[1 "Red Medicine" 4 3]
     [2 "Stout Burgers & Beers" 11 2]
@@ -100,12 +100,12 @@
                         :remapped_to nil}))))
   (remap-results example-resultset))
 
-(def field-defaults
+(def ^:private field-defaults
   {:dimensions [],
    :values [],
    :visibility-type :normal})
 
-(def example-query
+(def ^:private example-query
   {:query
    {:fields
     (mapv #(merge field-defaults %)
@@ -155,7 +155,7 @@
                                             :field-display-name "Product"}))
   (add-fk-remaps example-query))
 
-(def external-remapped-result
+(def ^:private external-remapped-result
   (-> example-resultset
       (update :cols conj {:description "The name of the product as it should be displayed to customers.",
                           :table_id 3,

test/metabase/test/data.clj

@@ -288,7 +288,7 @@
   `(with-temp-db [_# (resolve-dbdef '~dataset)]
      ~@body))
 
-(defn delete-model-instance!
+(defn- delete-model-instance!
   "Allows deleting a row by the model instance toucan returns when
   it's inserted"
   [{:keys [id] :as instance}]
@@ -308,7 +308,7 @@
 (defmacro with-data [data-load-fn & body]
   `(call-with-data ~data-load-fn (fn [] ~@body)))
 
-(def  venue-categories
+(def venue-categories
   (map vector (defs/field-values defs/test-data-map "categories" "name")))
 
 (defn create-venue-category-remapping