Skip to content
Snippets Groups Projects
Commit c3fa2aa1 authored by Cam Saül's avatar Cam Saül
Browse files

Test fixes :wrench:

parent 4fc501e4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/metabase/query_processor/resolve.clj
+ 2
− 2
View file @ c3fa2aa1
...@@ -216,8 +216,8 @@ ...@@ -216,8 +216,8 @@
[(db/entity->table-name Table) :target-table] [(db/entity->table-name Table) :target-table]
[:= :target-pk.table_id :target-table.id]] [:= :target-pk.table_id :target-table.id]]
:where [:and [:in :source-fk.id (set fk-field-ids)] :where [:and [:in :source-fk.id (set fk-field-ids)]
[:= :source-fk.table_id source-table-id] [:= :source-fk.table_id source-table-id]
[:= :source-fk.special_type "fk"]]}))) [:= :source-fk.special_type "fk"]]})))
(defn- fk-field-ids->joined-tables (defn- fk-field-ids->joined-tables
"Fetch info for PK/FK `Fields` for the JOIN-TABLES referenced in a Query." "Fetch info for PK/FK `Fields` for the JOIN-TABLES referenced in a Query."
......
test/metabase/query_processor/expand_resolve_test.clj
+ 24
− 13
View file @ c3fa2aa1
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
:id (id :venues)} :id (id :venues)}
:filter {:filter-type :> :filter {:filter-type :>
:field {:field-id (id :venues :price) :field {:field-id (id :venues :price)
:fk-field-id nil
:field-name "PRICE" :field-name "PRICE"
:field-display-name "Price" :field-display-name "Price"
:base-type :IntegerField :base-type :IntegerField
...@@ -56,6 +57,7 @@ ...@@ -56,6 +57,7 @@
:parent nil} :parent nil}
:value {:value 1 :value {:value 1
:field {:field-id (id :venues :price) :field {:field-id (id :venues :price)
:fk-field-id nil
:field-name "PRICE" :field-name "PRICE"
:field-display-name "Price" :field-display-name "Price"
:base-type :IntegerField :base-type :IntegerField
...@@ -99,28 +101,30 @@ ...@@ -99,28 +101,30 @@
:id (id :venues)} :id (id :venues)}
:filter {:filter-type := :filter {:filter-type :=
:field {:field-id (id :categories :name) :field {:field-id (id :categories :name)
:fk-field-id (id :venues :category_id)
:field-name "NAME" :field-name "NAME"
:field-display-name "Name" :field-display-name "Name"
:base-type :TextField :base-type :TextField
:special-type :name :special-type :name
:visibility-type :normal :visibility-type :normal
:table-id (id :categories) :table-id (id :categories)
:schema-name "PUBLIC" :schema-name nil
:table-name "CATEGORIES" :table-name "CATEGORIES__via__CATEGORY_ID"
:position nil :position nil
:description nil :description nil
:parent-id nil :parent-id nil
:parent nil} :parent nil}
:value {:value "abc" :value {:value "abc"
:field {:field-id (id :categories :name) :field {:field-id (id :categories :name)
:fk-field-id (id :venues :category_id)
:field-name "NAME" :field-name "NAME"
:field-display-name "Name" :field-display-name "Name"
:base-type :TextField :base-type :TextField
:special-type :name :special-type :name
:visibility-type :normal :visibility-type :normal
:table-id (id :categories) :table-id (id :categories)
:schema-name "PUBLIC" :schema-name nil
:table-name "CATEGORIES" :table-name "CATEGORIES__via__CATEGORY_ID"
:position nil :position nil
:description nil :description nil
:parent-id nil :parent-id nil
...@@ -131,7 +135,8 @@ ...@@ -131,7 +135,8 @@
:field-name "ID"} :field-name "ID"}
:table-id (id :categories) :table-id (id :categories)
:table-name "CATEGORIES" :table-name "CATEGORIES"
:schema "PUBLIC"}]} :schema "PUBLIC"
:join-alias "CATEGORIES__via__CATEGORY_ID"}]}
:fk-field-ids #{(id :venues :category_id)} :fk-field-ids #{(id :venues :category_id)}
:table-ids #{(id :categories)}}] :table-ids #{(id :categories)}}]
(let [expanded-form (ql/expand (wrap-inner-query (query venues (let [expanded-form (ql/expand (wrap-inner-query (query venues
...@@ -163,14 +168,15 @@ ...@@ -163,14 +168,15 @@
:id (id :checkins)} :id (id :checkins)}
:filter {:filter-type :> :filter {:filter-type :>
:field {:field {:field-id (id :users :last_login) :field {:field {:field-id (id :users :last_login)
:fk-field-id (id :checkins :user_id)
:field-name "LAST_LOGIN" :field-name "LAST_LOGIN"
:field-display-name "Last Login" :field-display-name "Last Login"
:base-type :DateTimeField :base-type :DateTimeField
:special-type nil :special-type nil
:visibility-type :normal :visibility-type :normal
:table-id (id :users) :table-id (id :users)
:schema-name "PUBLIC" :schema-name nil
:table-name "USERS" :table-name "USERS__via__USER_ID"
:position nil :position nil
:description nil :description nil
:parent-id nil :parent-id nil
...@@ -178,14 +184,15 @@ ...@@ -178,14 +184,15 @@
:unit :year} :unit :year}
:value {:value (u/->Timestamp "1980-01-01") :value {:value (u/->Timestamp "1980-01-01")
:field {:field {:field-id (id :users :last_login) :field {:field {:field-id (id :users :last_login)
:fk-field-id (id :checkins :user_id)
:field-name "LAST_LOGIN" :field-name "LAST_LOGIN"
:field-display-name "Last Login" :field-display-name "Last Login"
:base-type :DateTimeField :base-type :DateTimeField
:special-type nil :special-type nil
:visibility-type :normal :visibility-type :normal
:table-id (id :users) :table-id (id :users)
:schema-name "PUBLIC" :schema-name nil
:table-name "USERS" :table-name "USERS__via__USER_ID"
:position nil :position nil
:description nil :description nil
:parent-id nil :parent-id nil
...@@ -197,7 +204,8 @@ ...@@ -197,7 +204,8 @@
:field-name "ID"} :field-name "ID"}
:table-id (id :users) :table-id (id :users)
:table-name "USERS" :table-name "USERS"
:schema "PUBLIC"}]} :schema "PUBLIC"
:join-alias "USERS__via__USER_ID"}]}
:fk-field-ids #{(id :checkins :user_id)} :fk-field-ids #{(id :checkins :user_id)}
:table-ids #{(id :users)}}] :table-ids #{(id :users)}}]
(let [expanded-form (ql/expand (wrap-inner-query (query checkins (let [expanded-form (ql/expand (wrap-inner-query (query checkins
...@@ -238,8 +246,9 @@ ...@@ -238,8 +246,9 @@
:visibility-type :normal :visibility-type :normal
:position nil :position nil
:field-id (id :venues :price) :field-id (id :venues :price)
:table-name "VENUES" :fk-field-id (id :checkins :venue_id)
:schema-name "PUBLIC"}} :table-name "VENUES__via__VENUE_ID"
:schema-name nil}}
:breakout [{:field {:description nil :breakout [{:field {:description nil
:base-type :DateField :base-type :DateField
:parent nil :parent nil
...@@ -251,6 +260,7 @@ ...@@ -251,6 +260,7 @@
:visibility-type :normal :visibility-type :normal
:position nil :position nil
:field-id (id :checkins :date) :field-id (id :checkins :date)
:fk-field-id nil
:table-name "CHECKINS" :table-name "CHECKINS"
:schema-name "PUBLIC"} :schema-name "PUBLIC"}
:unit :day-of-week}] :unit :day-of-week}]
...@@ -260,7 +270,8 @@ ...@@ -260,7 +270,8 @@
:field-name "ID"} :field-name "ID"}
:table-id (id :venues) :table-id (id :venues)
:table-name "VENUES" :table-name "VENUES"
:schema "PUBLIC"}]} :schema "PUBLIC"
:join-alias "VENUES__via__VENUE_ID"}]}
:fk-field-ids #{(id :checkins :venue_id)} :fk-field-ids #{(id :checkins :venue_id)}
:table-ids #{(id :venues) (id :checkins)}}] :table-ids #{(id :venues) (id :checkins)}}]
(let [expanded-form (ql/expand (wrap-inner-query (query checkins (let [expanded-form (ql/expand (wrap-inner-query (query checkins
......
test/metabase/query_processor_test.clj
+ 0
− 5
View file @ c3fa2aa1
...@@ -24,11 +24,6 @@ ...@@ -24,11 +24,6 @@
(def ^:private ^:const timeseries-engines #{:druid}) (def ^:private ^:const timeseries-engines #{:druid})
(def ^:private ^:const non-timeseries-engines (set/difference datasets/all-valid-engines timeseries-engines)) (def ^:private ^:const non-timeseries-engines (set/difference datasets/all-valid-engines timeseries-engines))
;; Make sure the driver test extension namespaces are loaded. This is needed because otherwise `lein test metabase.query-processor-test` won't work
(doseq [engine non-timeseries-engines
:let [driver-test-ns (symbol (str "metabase.test.data." (name engine)))]]
(require driver-test-ns :reload))
(defn- engines-that-support [feature] (defn- engines-that-support [feature]
(set (for [engine non-timeseries-engines (set (for [engine non-timeseries-engines
:when (contains? (driver/features (driver/engine->driver engine)) feature)] :when (contains? (driver/features (driver/engine->driver engine)) feature)]
......
test/metabase/test_setup.clj
+ 9
− 3
View file @ c3fa2aa1
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
[clojure.java.io :as io] [clojure.java.io :as io]
[clojure.set :as set] [clojure.set :as set]
[clojure.tools.logging :as log] [clojure.tools.logging :as log]
[colorize.core :as color]
[expectations :refer :all] [expectations :refer :all]
(metabase [core :as core] (metabase [core :as core]
[db :as db] [db :as db]
...@@ -67,8 +66,7 @@ ...@@ -67,8 +66,7 @@
;; # ------------------------------ FUNCTIONS THAT GET RUN ON TEST SUITE START / STOP ------------------------------ ;; # ------------------------------ FUNCTIONS THAT GET RUN ON TEST SUITE START / STOP ------------------------------
;; this is a little odd, but our normal `test-startup` function won't work for loading the drivers because ;; `test-startup` function won't work for loading the drivers because they need to be available at evaluation time for some of the unit tests work work properly
;; they need to be available at evaluation time for some of the unit tests work work properly, so we put this here
(driver/find-and-load-drivers!) (driver/find-and-load-drivers!)
(defn test-startup (defn test-startup
...@@ -83,6 +81,14 @@ ...@@ -83,6 +81,14 @@
(db/setup-db :auto-migrate true) (db/setup-db :auto-migrate true)
(setting/set :site-name "Metabase Test") (setting/set :site-name "Metabase Test")
(core/initialization-complete!) (core/initialization-complete!)
;; make sure the driver test extensions are loaded before running the tests. :reload them because otherwise we get wacky 'method in protocol not implemented' errors
;; when running tests against an individual namespace
(doseq [engine (keys (driver/available-drivers))
:let [driver-test-ns (symbol (str "metabase.test.data." (name engine)))]]
(u/ignore-exceptions
(require driver-test-ns :reload)))
;; If test setup fails exit right away ;; If test setup fails exit right away
(catch Throwable e (catch Throwable e
(log/error (u/format-color 'red "Test setup failed: %s\n%s" e (u/pprint-to-str (vec (.getStackTrace e))))) (log/error (u/format-color 'red "Test setup failed: %s\n%s" e (u/pprint-to-str (vec (.getStackTrace e)))))
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment