Merge pull request #333 from metabase/qp_cleanup

Rewrite QP order-columns in a way that doesn't end up making a dozen+ DB calls

src/metabase/db.clj

@@ -277,7 +277,7 @@
     (sel :one User :id 1)          -> returns the User (or nil) whose id is 1
     (sel :many OrgPerm :user_id 1) -> returns sequence of OrgPerms whose user_id is 1
 
-  OPTION, if specified, is one of `:field`, `:fields`, or `:id`.
+  OPTION, if specified, is one of `:field`, `:fields`, `:id`, `:id->field`, `:field->id`, or `:id->fields`.
 
     ;; Only return IDs of objects.
     (sel :one :id User :email \"cam@metabase.com\") -> 120
@@ -289,6 +289,19 @@
     (sel :one :fields [User :id :first_name])
       -> ({:id 1 :first_name \"Cam\"}, {:id 2 :first_name \"Sameer\"} ...)
 
+    ;; Return a map of ID -> field value
+    (sel :many :id->field [User :first_name])
+      -> {1 \"Cam\", 2 \"Sameer\", ...}
+
+    ;; Return a map of field value -> ID. Duplicates will be discarded!
+    (sel :many :field->id [User :first_name])
+      -> {\"Cam\" 1, \"Sameer\" 2}
+
+    ;; Return a map of ID -> specified fields
+    (sel :many :id->fields [User :first_name :last_name])
+      -> {1 {:first_name \"Cam\", :last_name \"Saul\"},
+          2 {:first_Name \"Sameer\", :last_name ...}}
+
   ENTITY may be either an entity like `User` or a vector like `[entity & field-keys]`.
   If just an entity is passed, `sel` will return `default-fields` for ENTITY.
   Otherwise is a vector is passed `sel` will return the fields specified by FIELD-KEYS.
@@ -318,6 +331,20 @@
                    (map field#
                         (sel :many [entity# field#] ~@forms)))
         :id     `(sel :many :field [~entity :id] ~@forms)
+        :id->fields `(->> (sel :many :fields [~@entity :id] ~@forms)
+                          (map (fn [{id# :id :as obj#}]
+                                 {id# obj#}))
+                          (into {}))
+        :id->field `(let [[entity# field#] ~entity]
+                      (->> (sel :many :fields [entity# field# :id] ~@forms)
+                           (map (fn [{id# :id field-val# field#}]
+                                  {id# field-val#}))
+                           (into {})))
+        :field->id `(let [[entity# field#] ~entity]
+                      (->> (sel :many :fields [entity# field# :id] ~@forms)
+                           (map (fn [{id# :id field-val# field#}]
+                                  {field-val# id#}))
+                           (into {})))
         :fields `(let [[~'_ & fields# :as entity#] ~entity]
                    (map #(select-keys % fields#)
                         (sel :many entity# ~@forms)))

src/metabase/driver/generic_sql/query_processor/annotate.clj

@@ -25,13 +25,19 @@
             :columns column-names
             :cols (get-column-info query column-names)}}))
 
-(defn order-columns
-  [{{:keys [source_table breakout]} :query} ks]
-  (let [field-map (->> (map (fn [k] {(sel :one :field [Field :id] :name (uncastify (name k)) :table_id source_table) k}) ks)
-                       (apply merge))
-        dimensions (map #(get field-map %) breakout)]
-    (->> (concat dimensions (filter #(not (contains? (set dimensions) %)) ks))
-         (filter identity))))
+ (defn order-columns
+   [{{source-table :source_table breakout-field-ids :breakout} :query} field-names]
+   (let [uncastified->field-name (->> field-names
+                                      (map (fn [field-name]
+                                             {(uncastify (name field-name)) field-name}))
+                                      (into {}))
+         field-id->uncastified (sel :many :id->field [Field :name] :name [in (set (keys uncastified->field-name))])
+         breakout-field-names (->> breakout-field-ids
+                                   (filter identity)
+                                   (map field-id->uncastified)
+                                   (map uncastified->field-name))]
+     (concat breakout-field-names (filter #(not (contains? (set breakout-field-names) %))
+                                          field-names))))
 
 (defn- get-column-names
   "Get an ordered seqences of column names for the results.