Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Use mongo field filter alias if available (#67025)

Riley Thompsone6575a508607
diff --git a/modules/drivers/mongo/src/metabase/driver/mongo/parameters.clj b/modules/drivers/mongo/src/metabase/driver/mongo/parameters.clj
index e4fdf6fa71d..3f83234d417 100644
--- a/modules/drivers/mongo/src/metabase/driver/mongo/parameters.clj
+++ b/modules/drivers/mongo/src/metabase/driver/mongo/parameters.clj
@@ -64,24 +64,22 @@
(pr-str x)))
(mu/defn- field->name
- ([field]
- (field->name field true))
-
- ([field :- driver-api/schema.metadata.column
- pr?]
- ;; for native parameters we serialize and don't need the extra pr
- (cond-> (mongo.qp/field->name field ".")
- pr? pr-str)))
-
-(defn- substitute-one-field-filter-date-range [{field :field, {value :value} :value}]
+ [field :- driver-api/schema.metadata.column
+ alias]
+ (let [name (if (str/blank? alias)
+ (mongo.qp/field->name field ".")
+ alias)]
+ (pr-str name)))
+
+(defn- substitute-one-field-filter-date-range [{field :field, alias :alias, {value :value} :value}]
(let [{:keys [start end]} (params.dates/date-string->range value {:inclusive-end? false})
start-condition (when start
(format "{%s: {$gte: %s}}"
- (field->name field)
+ (field->name field alias)
(param-value->str field (u.date/parse start ZoneOffset/UTC))))
end-condition (when end
(format "{%s: {$lt: %s}}"
- (field->name field)
+ (field->name field alias)
(param-value->str field (u.date/parse end ZoneOffset/UTC))))]
(if (and start-condition end-condition)
(format "{$and: [%s, %s]}" start-condition end-condition)
@@ -90,7 +88,7 @@
;; Field filter value is either params/no-value (handled in `substitute-param`, a map with `:type` and `:value`, or a
;; sequence of those maps.
-(defn- substitute-one-field-filter [{field :field, {param-type :type, value :value} :value, :as field-filter}]
+(defn- substitute-one-field-filter [{field :field, alias :alias, {param-type :type, value :value} :value, :as field-filter}]
;; convert relative dates to approprate date range representations
(cond
(params.dates/not-single-date-type? param-type)
@@ -101,18 +99,18 @@
(string? value))
(let [t (u.date/parse value)]
(format "{$and: [%s, %s]}"
- (format "{%s: {$gte: %s}}" (field->name field) (param-value->str field t))
- (format "{%s: {$lt: %s}}" (field->name field) (param-value->str field (u.date/add t :day 1)))))
+ (format "{%s: {$gte: %s}}" (field->name field alias) (param-value->str field t))
+ (format "{%s: {$lt: %s}}" (field->name field alias) (param-value->str field (u.date/add t :day 1)))))
:else
- (format "{%s: %s}" (field->name field) (param-value->str field value))))
+ (format "{%s: %s}" (field->name field alias) (param-value->str field value))))
(mu/defn- substitute-field-filter
- [{field :field, {:keys [value]} :value, :as field-filter} :- [:map
- [:field driver-api/schema.metadata.column]
- [:value [:map [:value :any]]]]]
+ [{field :field, alias :alias, {:keys [value]} :value, :as field-filter} :- [:map
+ [:field driver-api/schema.metadata.column]
+ [:value [:map [:value :any]]]]]
(if (sequential? value)
- (format "{%s: %s}" (field->name field) (param-value->str field value))
+ (format "{%s: %s}" (field->name field alias) (param-value->str field value))
(substitute-one-field-filter field-filter)))
(defn- substitute-native-query-snippet [[acc missing] v]
@@ -131,10 +129,13 @@
(params.ops/operator? (get-in v [:value :type]))
#_{:clj-kondo/ignore [:deprecated-var]}
(let [param (:value v)
+ field-name (if (str/blank? (:alias v))
+ (mongo.qp/field->name (:field v) ".")
+ (:alias v))
compiled-clause (-> (assoc param
:target
[:dimension
- [:field (field->name (:field v) false)
+ [:field field-name
{:base-type (get-in v [:field :base-type])}]])
params.ops/to-clause
;; desugar only impacts :does-not-contain -> [:not [:contains ... but it prevents
diff --git a/modules/drivers/mongo/test/metabase/driver/mongo/parameters_test.clj b/modules/drivers/mongo/test/metabase/driver/mongo/parameters_test.clj
index 09264a5c11a..818a6994c6a 100644
--- a/modules/drivers/mongo/test/metabase/driver/mongo/parameters_test.clj
+++ b/modules/drivers/mongo/test/metabase/driver/mongo/parameters_test.clj
@@ -480,3 +480,72 @@
:snippet-name "first 3 checkins"
:snippet-id (:id snippet)}}}
:parameters []}))))))))
+
+(deftest ^:parallel field-filter-variable-with-alias-test
+ (testing "native query with field filter variable and a field alias works"
+ (mt/test-driver :mongo
+ (let [query (mt/native-query
+ {:collection "orders"
+ :query (json/encode
+ [{"$lookup" {"from" "products"
+ "localField" "product_id"
+ "foreignField" "_id"
+ "as" "join_alias_Products"}}
+ {"$unwind" "$join_alias_Products"}
+ {"$match" (json/raw-json-generator "{{category_filter}}")}
+ {"$count" "count"}])
+ :template-tags {"category_filter" {:id "category_filter_id"
+ :name "category_filter"
+ :display-name "Category Filter"
+ :type :dimension
+ :dimension [:field (mt/id :products :category) nil]
+ :alias "join_alias_Products.category"
+ :widget-type :string/=
+ :default ["Gizmo"]}}})]
+ (is (seq (-> query qp/process-query mt/rows)))))))
+
+(deftest ^:parallel field-filter-date-range-with-alias-test
+ (testing "native query with date range filter and a field alias works"
+ (mt/test-driver :mongo
+ (let [query (mt/native-query
+ {:collection "orders"
+ :query (json/encode
+ [{"$lookup" {"from" "products"
+ "localField" "product_id"
+ "foreignField" "_id"
+ "as" "join_alias_Products"}}
+ {"$unwind" "$join_alias_Products"}
+ {"$match" (json/raw-json-generator "{{date_filter}}")}
+ {"$count" "count"}])
+ :template-tags {"date_filter" {:id "date_filter_id"
+ :name "date_filter"
+ :display-name "Date Filter"
+ :type :dimension
+ :dimension [:field (mt/id :products :created_at) nil]
+ :alias "join_alias_Products.created_at"
+ :widget-type :date/all-options
+ :default "past6years"}}})]
+ (is (seq (-> query qp/process-query mt/rows)))))))
+
+(deftest ^:parallel field-filter-single-date-with-alias-test
+ (testing "native query with date field filter and a field alias works"
+ (mt/test-driver :mongo
+ (let [query (mt/native-query
+ {:collection "orders"
+ :query (json/encode
+ [{"$lookup" {"from" "products"
+ "localField" "product_id"
+ "foreignField" "_id"
+ "as" "join_alias_Products"}}
+ {"$unwind" "$join_alias_Products"}
+ {"$match" (json/raw-json-generator "{{date_filter}}")}
+ {"$count" "count"}])
+ :template-tags {"date_filter" {:id "date_filter_id"
+ :name "date_filter"
+ :display-name "Date Filter"
+ :type :dimension
+ :dimension [:field (mt/id :products :created_at) nil]
+ :alias "join_alias_Products.created_at"
+ :widget-type :date/single
+ :default "2019-04-02"}}})]
+ (is (seq (-> query qp/process-query mt/rows)))))))