 (defrecord Field [field-id
                   field-name
                   base-type
-                  special-type])
+                  special-type
+                  table-id
+                  table-name]
+  IResolve
+  (resolve-table [this table-id->table]
+    (cond-> this
+      table-id (assoc :table-name (:name (table-id->table table-id))))))
 
 ;; Value is the expansion of a value within a QL clause
 ;; Information about the associated Field is included for convenience

            [medley.core :as m]
            [swiss.arrows :refer [-<>]]
            [metabase.db :refer [sel]]
            [metabase.models.field :as field]
            [metabase.util :as u])
  (:import (clojure.lang Keyword)))



;; Replace Field IDs with these during first pass
(defrecord FieldPlaceholder [field-id]
  IResolve
  (resolve-field [this field-id->fields]
    (-> (:field-id this)
        field-id->fields
