Skip to content

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

Remove `find-column-for-name` (#68382)

Timothy S. Dean8a76f71003b6
diff --git a/src/metabase/lib/core.cljc b/src/metabase/lib/core.cljc
index fdd5dbb129d..99864e2a79d 100644
--- a/src/metabase/lib/core.cljc
+++ b/src/metabase/lib/core.cljc
@@ -280,7 +280,6 @@
add-field
fieldable-columns
fields
- find-column-for-name
find-visible-column-for-ref
remove-field
with-fields]
diff --git a/src/metabase/lib/field.cljc b/src/metabase/lib/field.cljc
index 0159cbb211e..2553fae7e50 100644
--- a/src/metabase/lib/field.cljc
+++ b/src/metabase/lib/field.cljc
@@ -731,25 +731,6 @@
query stage-number)]
(lib.equality/find-matching-column query stage-number field-ref columns))))
-(mu/defn find-column-for-name :- [:maybe ::lib.schema.metadata/column]
- "Find the first column in `columns` whose `:name` matches `column-name`.
- Matching is case-insensitive.
-
- Optionally pass a `pred` function for additional filtering; only columns
- satisfying `(pred column)` will be considered."
- ([columns :- [:sequential ::lib.schema.metadata/column]
- column-name :- :string]
- (find-column-for-name columns column-name nil))
-
- ([columns :- [:sequential ::lib.schema.metadata/column]
- column-name :- :string
- pred :- [:maybe ifn?]]
- (let [lower-name (u/lower-case-en column-name)]
- (m/find-first (fn [col]
- (and (= (u/lower-case-en (:name col)) lower-name)
- (or (nil? pred) (pred col))))
- columns))))
-
(defn json-field?
"Return true if field is a JSON field, false if not."
[field]
diff --git a/test/metabase/query_processor/implicit_joins_test.clj b/test/metabase/query_processor/implicit_joins_test.clj
index b158686127d..cd26cdbca7a 100644
--- a/test/metabase/query_processor/implicit_joins_test.clj
+++ b/test/metabase/query_processor/implicit_joins_test.clj
@@ -317,8 +317,9 @@
query (lib/query mp (lib.metadata/table mp (mt/id :logs)))
;; Find the event_timestamp column that's implicitly joinable via FK.
;; Columns with :fk-field-id are from implicit joins.
- filterable-cols (lib/filterable-columns query)
- event-timestamp (lib/find-column-for-name filterable-cols "event_timestamp" :fk-field-id)
+ event-timestamp (->> (lib/filterable-columns query)
+ (filter :fk-field-id)
+ (m/find-first (comp #{"event_timestamp"} u/lower-case-en :name)))
_ (is (some? event-timestamp) "Should find event_timestamp via implicit join")]
(testing "Filter on coerced field via implicit join"
;; This would fail with "operator does not exist: integer >= timestamp"
@@ -360,8 +361,9 @@
(lib/join join-clause))
;; Find the event_timestamp column from the explicit join.
;; Columns from explicit joins have :metabase.lib.join/join-alias.
- filterable-cols (lib/filterable-columns query)
- event-timestamp (lib/find-column-for-name filterable-cols "event_timestamp" :metabase.lib.join/join-alias)
+ event-timestamp (->> (lib/filterable-columns query)
+ (filter :metabase.lib.join/join-alias)
+ (m/find-first (comp #{"event_timestamp"} u/lower-case-en :name)))
_ (is (some? event-timestamp) "Should find event_timestamp via explicit join")]
(testing "Filter on coerced field via explicit join"
(let [query (-> query