From 2b4ca3aaae3ed1bc911af4d333940e94a145e230 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cam=20Sa=C3=BCl?= <cammsaul@gmail.com>
Date: Tue, 6 Sep 2016 17:02:52 -0700
Subject: [PATCH] Remove field-type from Druid test code :shower:
---
src/metabase/driver/druid.clj | 13 ++++++-------
test/metabase/test/data.clj | 2 +-
test/metabase/test/data/interface.clj | 2 +-
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/metabase/driver/druid.clj b/src/metabase/driver/druid.clj
index 56d14e27f58..31a0589f14d 100644
--- a/src/metabase/driver/druid.clj
+++ b/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)))}))
diff --git a/test/metabase/test/data.clj b/test/metabase/test/data.clj
index 01367ce1f94..905218634bf 100644
--- a/test/metabase/test/data.clj
+++ b/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)
diff --git a/test/metabase/test/data/interface.clj b/test/metabase/test/data/interface.clj
index 70fb810a603..07d5660f2f7 100644
--- a/test/metabase/test/data/interface.clj
+++ b/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
--
GitLab