Merge pull request #5515 from metabase/remapping-cleanup

Minor code style cleanups from the remappings changes

src/metabase/api/field.clj

@@ -126,7 +126,7 @@
                         human_readable_field_id))
       [400 "Foreign key based remappings require a human readable field id"])
     (if-let [dimension (Dimension :field_id id)]
-      (db/update! Dimension (:id dimension)
+      (db/update! Dimension (u/get-id dimension)
         {:type dimension-type
          :name dimension-name
          :human_readable_field_id human_readable_field_id})
@@ -174,10 +174,10 @@
                                               (map second value-pairs))))))
 
 (defn- create-field-values!
-  [field value-pairs]
+  [field-or-id value-pairs]
   (let [human-readable-values? (validate-human-readable-pairs value-pairs)]
     (db/insert! FieldValues
-      :field_id (:id field)
+      :field_id (u/get-id field-or-id)
       :values (map first value-pairs)
       :human_readable_values (when human-readable-values?
                                (map second value-pairs)))))

src/metabase/api/table.clj

@@ -18,8 +18,7 @@
             [schema.core :as s]
             [toucan
              [db :as db]
-             [hydrate :refer [hydrate]]]
-            [metabase.query :as q]))
+             [hydrate :refer [hydrate]]]))
 
 ;; TODO - I don't think this is used for anything any more
 (def ^:private ^:deprecated TableEntityType

src/metabase/models/field.clj

@@ -7,14 +7,13 @@
              [util :as u]]
             [metabase.models
              [dimension :refer [Dimension]]
-             [field-values :refer [FieldValues] :as fv]
+             [field-values :as fv :refer [FieldValues]]
              [humanization :as humanization]
              [interface :as i]
              [permissions :as perms]]
             [toucan
              [db :as db]
-             [models :as models]]
-            [metabase.models.field-values :as fv]))
+             [models :as models]]))
 
 ;;; ------------------------------------------------------------ Type Mappings ------------------------------------------------------------
 

src/metabase/query_processor.clj

@@ -94,7 +94,7 @@
       add-dim/add-remapping
       implicit-clauses/add-implicit-clauses
       source-table/resolve-source-table-middleware
-      expand/expand-middleware                      ; ▲▲▲ QUERY EXPANSION POINT  ▲▲▲ All functions *above* will see EXPANDED query during PRE-PROCESSING
+      expand/expand-middleware                         ; ▲▲▲ QUERY EXPANSION POINT  ▲▲▲ All functions *above* will see EXPANDED query during PRE-PROCESSING
       row-count-and-status/add-row-count-and-status    ; ▼▼▼ RESULTS WRAPPING POINT ▼▼▼ All functions *below* will see results WRAPPED in `:data` during POST-PROCESSING
       parameters/substitute-parameters
       expand-macros/expand-macros

src/metabase/query_processor/interface.clj

@@ -3,8 +3,8 @@
    This namespace should just contain definitions of various protocols and record types; associated logic
    should go in `metabase.query-processor.middleware.expand`."
   (:require [metabase.models
-             [field :as field]
-             [dimension :as dim]]
+             [dimension :as dim]
+             [field :as field]]
             [metabase.util :as u]
             [metabase.util.schema :as su]
             [schema.core :as s])

src/metabase/query_processor/middleware/add_dimension_projections.clj

@@ -144,8 +144,4 @@
   query). Then delegates to `remap-results` to munge the results after
   query execution."
   [qp]
-  (fn [query]
-    (-> query
-        add-fk-remaps
-        qp
-        remap-results)))
+  (comp remap-results qp add-fk-remaps))