From 1fb60721283655187c248fff0431a092f8241043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cam=20Sa=C3=BCl?= <cammsaul@gmail.com>
Date: Fri, 9 Jun 2017 15:46:37 -0700
Subject: [PATCH] Test updates :wrench: [ci drivers]
---
.../driver/generic_sql/native_test.clj | 28 +++++++++----------
.../middleware/annotate_and_sort_test.clj | 4 +--
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/test/metabase/driver/generic_sql/native_test.clj b/test/metabase/driver/generic_sql/native_test.clj
index 1a3621a513f..1f9445e9cfb 100644
--- a/test/metabase/driver/generic_sql/native_test.clj
+++ b/test/metabase/driver/generic_sql/native_test.clj
@@ -8,28 +8,28 @@
;; Just check that a basic query works
(expect
- {:status :completed
+ {:status :completed
:row_count 2
- :data {:rows [[100]
- [99]]
- :columns ["ID"]
- :cols [{:name "ID", :base_type :type/Integer}]
- :native_form {:query "SELECT ID FROM VENUES ORDER BY ID DESC LIMIT 2;"}}}
+ :data {:rows [[100]
+ [99]]
+ :columns ["ID"]
+ :cols [{:name "ID", :display_name "ID", :base_type :type/Integer}]
+ :native_form {:query "SELECT ID FROM VENUES ORDER BY ID DESC LIMIT 2;"}}}
(qp/process-query {:native {:query "SELECT ID FROM VENUES ORDER BY ID DESC LIMIT 2;"}
:type :native
:database (id)}))
;; Check that column ordering is maintained
(expect
- {:status :completed
+ {:status :completed
:row_count 2
- :data {:rows [[100 "Mohawk Bend" 46]
- [99 "Golden Road Brewing" 10]]
- :columns ["ID" "NAME" "CATEGORY_ID"]
- :cols [{:name "ID", :base_type :type/Integer}
- {:name "NAME", :base_type :type/Text}
- {:name "CATEGORY_ID", :base_type :type/Integer}]
- :native_form {:query "SELECT ID, NAME, CATEGORY_ID FROM VENUES ORDER BY ID DESC LIMIT 2;"}}}
+ :data {:rows [[100 "Mohawk Bend" 46]
+ [99 "Golden Road Brewing" 10]]
+ :columns ["ID" "NAME" "CATEGORY_ID"]
+ :cols [{:name "ID", :display_name "ID", :base_type :type/Integer}
+ {:name "NAME", :display_name "Name", :base_type :type/Text}
+ {:name "CATEGORY_ID", :display_name "Category ID", :base_type :type/Integer}]
+ :native_form {:query "SELECT ID, NAME, CATEGORY_ID FROM VENUES ORDER BY ID DESC LIMIT 2;"}}}
(qp/process-query {:native {:query "SELECT ID, NAME, CATEGORY_ID FROM VENUES ORDER BY ID DESC LIMIT 2;"}
:type :native
:database (id)}))
diff --git a/test/metabase/query_processor/middleware/annotate_and_sort_test.clj b/test/metabase/query_processor/middleware/annotate_and_sort_test.clj
index 0cb02e30d22..fabdac0715d 100644
--- a/test/metabase/query_processor/middleware/annotate_and_sort_test.clj
+++ b/test/metabase/query_processor/middleware/annotate_and_sort_test.clj
@@ -7,8 +7,8 @@
;; make sure that `infer-column-types` can still infer types even if the initial value(s) are `nil` (#4256)
(expect
- [{:name "a", :base_type :type/Integer}
- {:name "b", :base_type :type/Integer}]
+ [{:name "a", :display_name "A", :base_type :type/Integer}
+ {:name "b", :display_name "B", :base_type :type/Integer}]
(:cols (infer-column-types {:columns [:a :b], :rows [[1 nil]
[2 nil]
[3 nil]
--
GitLab