Remove field-type from Druid test code

src/metabase/driver/druid.clj

@@ -65,12 +65,12 @@
 ;;; ### Sync
 
 (defn- describe-table-field [druid-field-type field-name]
-  (merge {:name field-name}
-         ;; all dimensions are Strings, and all metrics as JS Numbers, I think (?)
-         ;; string-encoded booleans + dates are treated as strings (!)
-         (if (= :metric druid-field-type)
-           {:field-type :metric,    :base-type :FloatField}
-           {:field-type :dimension, :base-type :TextField})))
+  ;; all dimensions are Strings, and all metrics as JS Numbers, I think (?)
+  ;; string-encoded booleans + dates are treated as strings (!)
+  {:name      field-name
+   :base-type (if (= :metric druid-field-type)
+                :FloatField
+                :TextField)})
 
 (defn- describe-table [database table]
   (let [details                      (:details database)
@@ -81,7 +81,6 @@
                     ;; every Druid table is an event stream w/ a timestamp field
                     [{:name       "timestamp"
                       :base-type  :DateTimeField
-                      :field-type :dimension
                       :pk?        true}]
                     (map (partial describe-table-field :dimension) dimensions)
                     (map (partial describe-table-field :metric) metrics)))}))

test/metabase/test/data.clj

@@ -188,7 +188,7 @@
              ;; Sync the database
              (sync-database/sync-database! db)
 
-             ;; Add extra metadata like Field field-type, base-type, etc.
+             ;; Add extra metadata like Field base-type, etc.
              (doseq [^TableDefinition table-definition (:table-definitions database-definition)]
                (let [table-name (:table-name table-definition)
                      table      (delay (or  (i/metabase-instance table-definition db)

test/metabase/test/data/interface.clj

@@ -131,7 +131,7 @@
 
 (defn create-field-definition
   "Create a new `FieldDefinition`; verify its values."
-  ^FieldDefinition [{:keys [field-name base-type field-type special-type visibility-type fk], :as field-definition-map}]
+  ^FieldDefinition [field-definition-map]
   (s/validate FieldDefinition (map->FieldDefinition field-definition-map)))
 
 (defn create-table-definition