From 68fc6f4477bd0887bb131cbce2aec03b639a7000 Mon Sep 17 00:00:00 2001 From: Tim Macdonald Date: Mon, 22 Apr 2024 11:58:27 +0100 Subject: [PATCH] Rename 'mac' alias to 'macaw' (#41680) --- .clj-kondo/config.edn | 2 +- src/metabase/native_query_analyzer.clj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.clj-kondo/config.edn b/.clj-kondo/config.edn index f99257e19ea15..134bcf32fe3cb 100644 --- a/.clj-kondo/config.edn +++ b/.clj-kondo/config.edn @@ -157,7 +157,7 @@ honeysql.helpers hh honeysql.types htypes java-time t - macaw.core mac + macaw.core macaw malli.core mc malli.error me malli.experimental mx diff --git a/src/metabase/native_query_analyzer.clj b/src/metabase/native_query_analyzer.clj index be0bd201dedff..88c68b9406700 100644 --- a/src/metabase/native_query_analyzer.clj +++ b/src/metabase/native_query_analyzer.clj @@ -7,7 +7,7 @@ (:require [clojure.set :as set] [clojure.string :as str] - [macaw.core :as mac] + [macaw.core :as macaw] [metabase.config :as config] [metabase.native-query-analyzer.parameter-substitution :as nqa.sub] [metabase.public-settings :as public-settings] @@ -91,7 +91,7 @@ (let [query (:dataset_query card) db-id (:database query) sql-string (:query (nqa.sub/replace-tags query)) - parsed-query (mac/query->components (mac/parsed-query sql-string)) + parsed-query (macaw/query->components (macaw/parsed-query sql-string)) direct-ids (direct-field-ids-for-query parsed-query db-id) indirect-ids (set/difference (indirect-field-ids-for-query parsed-query db-id)