Skip to content

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

GHY-4588: Bind values in usage_metadata/db.clj (7 non-id) (#83140)

Eric Normande20e936c96bd
diff --git a/.clj-kondo/config.edn b/.clj-kondo/config.edn
index 35fd1e162bf..487bc20ebe6 100644
--- a/.clj-kondo/config.edn
+++ b/.clj-kondo/config.edn
@@ -987,6 +987,9 @@
metabase.auth-identity.db
{:linters {:metabase/unsafe-app-db-query {:level :warning}}}
+ metabase.usage-metadata.db
+ {:linters {:metabase/unsafe-app-db-query {:level :warning}}}
+
;; .cljc tests run in both Clojure and ClojureScript — `with-dynamic-fn-redefs` is JVM-only,
;; so leave these alone.
metabase.lib.aggregation-test
diff --git a/src/metabase/usage_metadata/db.clj b/src/metabase/usage_metadata/db.clj
index 9c4ca49c012..50db33a4b02 100644
--- a/src/metabase/usage_metadata/db.clj
+++ b/src/metabase/usage_metadata/db.clj
@@ -17,8 +17,8 @@
started-before :- ms/TemporalInstant]
(t2/select [:model/QueryExecution :hash [:%count.* :n]]
{:where [:and
- [:>= :started_at started-at]
- [:< :started_at started-before]]
+ [:>= :started_at [:auto/param started-at]]
+ [:< :started_at [:auto/param started-before]]]
:group-by [:hash]}))
(mu/defn raw-field-fingerprint
@@ -29,18 +29,18 @@
(mu/defn queries-reducible
"A reducible over `conn` of the hash and query of the Queries with `query-hashes`."
[conn :- (ms/InstanceOfClass java.sql.Connection)
- query-hashes :- [:sequential bytes?]]
- (t2/reducible-select :conn conn [:model/Query :query_hash :query] :query_hash [:in query-hashes]))
+ query-hashes :- [:sequential {:min 1} bytes?]]
+ (t2/reducible-select :conn conn [:model/Query :query_hash :query] :query_hash [:in [:auto/param query-hashes]]))
(mu/defn delete-segment-rollups-before!
"Delete the SourceSegmentDaily rollup rows bucketed before `bucket-date`."
[bucket-date :- ms/TemporalInstant]
- (t2/delete! :model/SourceSegmentDaily :bucket_date [:< bucket-date]))
+ (t2/delete! :model/SourceSegmentDaily :bucket_date [:< [:auto/param bucket-date]]))
(mu/defn delete-segment-rollups-for-day!
"Delete the SourceSegmentDaily rollup rows bucketed on `bucket-date`."
[bucket-date :- ms/TemporalInstant]
- (t2/delete! :model/SourceSegmentDaily :bucket_date bucket-date))
+ (t2/delete! :model/SourceSegmentDaily :bucket_date [:auto/param bucket-date]))
(mu/defn insert-segment-rollups!
"Insert `rows` into SourceSegmentDaily."
@@ -51,12 +51,12 @@
(mu/defn delete-segment-composite-rollups-before!
"Delete the SourceSegmentCompositeDaily rollup rows bucketed before `bucket-date`."
[bucket-date :- ms/TemporalInstant]
- (t2/delete! :model/SourceSegmentCompositeDaily :bucket_date [:< bucket-date]))
+ (t2/delete! :model/SourceSegmentCompositeDaily :bucket_date [:< [:auto/param bucket-date]]))
(mu/defn delete-segment-composite-rollups-for-day!
"Delete the SourceSegmentCompositeDaily rollup rows bucketed on `bucket-date`."
[bucket-date :- ms/TemporalInstant]
- (t2/delete! :model/SourceSegmentCompositeDaily :bucket_date bucket-date))
+ (t2/delete! :model/SourceSegmentCompositeDaily :bucket_date [:auto/param bucket-date]))
(mu/defn insert-segment-composite-rollups!
"Insert `rows` into SourceSegmentCompositeDaily."
@@ -67,12 +67,12 @@
(mu/defn delete-metric-rollups-before!
"Delete the SourceMetricDaily rollup rows bucketed before `bucket-date`."
[bucket-date :- ms/TemporalInstant]
- (t2/delete! :model/SourceMetricDaily :bucket_date [:< bucket-date]))
+ (t2/delete! :model/SourceMetricDaily :bucket_date [:< [:auto/param bucket-date]]))
(mu/defn delete-metric-rollups-for-day!
"Delete the SourceMetricDaily rollup rows bucketed on `bucket-date`."
[bucket-date :- ms/TemporalInstant]
- (t2/delete! :model/SourceMetricDaily :bucket_date bucket-date))
+ (t2/delete! :model/SourceMetricDaily :bucket_date [:auto/param bucket-date]))
(mu/defn insert-metric-rollups!
"Insert `rows` into SourceMetricDaily."
@@ -83,12 +83,12 @@
(mu/defn delete-dimension-rollups-before!
"Delete the SourceDimensionDaily rollup rows bucketed before `bucket-date`."
[bucket-date :- ms/TemporalInstant]
- (t2/delete! :model/SourceDimensionDaily :bucket_date [:< bucket-date]))
+ (t2/delete! :model/SourceDimensionDaily :bucket_date [:< [:auto/param bucket-date]]))
(mu/defn delete-dimension-rollups-for-day!
"Delete the SourceDimensionDaily rollup rows bucketed on `bucket-date`."
[bucket-date :- ms/TemporalInstant]
- (t2/delete! :model/SourceDimensionDaily :bucket_date bucket-date))
+ (t2/delete! :model/SourceDimensionDaily :bucket_date [:auto/param bucket-date]))
(mu/defn insert-dimension-rollups!
"Insert `rows` into SourceDimensionDaily."
@@ -99,12 +99,12 @@
(mu/defn delete-dimension-profile-rollups-before!
"Delete the SourceDimensionProfileDaily rollup rows bucketed before `bucket-date`."
[bucket-date :- ms/TemporalInstant]
- (t2/delete! :model/SourceDimensionProfileDaily :bucket_date [:< bucket-date]))
+ (t2/delete! :model/SourceDimensionProfileDaily :bucket_date [:< [:auto/param bucket-date]]))
(mu/defn delete-dimension-profile-rollups-for-day!
"Delete the SourceDimensionProfileDaily rollup rows bucketed on `bucket-date`."
[bucket-date :- ms/TemporalInstant]
- (t2/delete! :model/SourceDimensionProfileDaily :bucket_date bucket-date))
+ (t2/delete! :model/SourceDimensionProfileDaily :bucket_date [:auto/param bucket-date]))
(mu/defn insert-dimension-profile-rollups!
"Insert `rows` into SourceDimensionProfileDaily."
@@ -115,30 +115,30 @@
(mu/defn field-names
"The id, name, and display name of the Fields with `field-ids`."
[field-ids :- [:set ::lib.schema.id/field]]
- (t2/select [:model/Field :id :name :display_name] :id [:in field-ids] {:from [(warehouse-schema-overlay/field-query)]}))
+ (t2/select [:model/Field :id :name :display_name] :id [:in (mapv long field-ids)] {:from [(warehouse-schema-overlay/field-query)]}))
(mu/defn table-names
"The id, name, display name, Database id, and schema of the Tables with `table-ids`."
[table-ids :- [:set ::lib.schema.id/table]]
- (t2/select [:model/Table :id :name :display_name :db_id :schema] :id [:in table-ids] {:from [(warehouse-schema-overlay/table-query)]}))
+ (t2/select [:model/Table :id :name :display_name :db_id :schema] :id [:in (mapv long table-ids)] {:from [(warehouse-schema-overlay/table-query)]}))
(mu/defn table-database-ids
"The id and Database id of the Tables with `table-ids`."
[table-ids :- [:set ::lib.schema.id/table]]
- (t2/select [:model/Table :id :db_id] :id [:in table-ids] {:from [(warehouse-schema-overlay/table-query {:user-settings? false})]}))
+ (t2/select [:model/Table :id :db_id] :id [:in (mapv long table-ids)] {:from [(warehouse-schema-overlay/table-query {:user-settings? false})]}))
(mu/defn card-names
"The id and name of the Cards with `card-ids`."
[card-ids :- [:set ::lib.schema.id/card]]
- (t2/select [:model/Card :id :name] :id [:in card-ids]))
+ (t2/select [:model/Card :id :name] :id [:in (mapv long card-ids)]))
(defn- grouped-rollup-where
[source-type source-id bucket-start bucket-end]
(cond-> [:and [:in :ownership_mode ["direct" "projected"]]]
source-type (conj [:= :source_type (name source-type)])
- source-id (conj [:= :source_id source-id])
- bucket-start (conj [:>= :bucket_date bucket-start])
- bucket-end (conj [:<= :bucket_date bucket-end])))
+ source-id (conj [:= :source_id (long source-id)])
+ bucket-start (conj [:>= :bucket_date [:auto/param bucket-start]])
+ bucket-end (conj [:<= :bucket_date [:auto/param bucket-end]])))
(mu/defn grouped-segment-rows
"The summed `source_segment_daily` counts optionally narrowed to `source-type`, `source-id`, and bucketed between
@@ -229,9 +229,9 @@
[[:sum :count] :total_count]]
{:where (cond-> [:and]
source-type (conj [:= :source_type (name source-type)])
- source-id (conj [:= :source_id source-id])
- bucket-start (conj [:>= :bucket_date bucket-start])
- bucket-end (conj [:<= :bucket_date bucket-end]))
+ source-id (conj [:= :source_id (long source-id)])
+ bucket-start (conj [:>= :bucket_date [:auto/param bucket-start]])
+ bucket-end (conj [:<= :bucket_date [:auto/param bucket-end]]))
:group-by [:source_type :source_id :field_id :source_basis :observation_type :observation_value]
:order-by [[:total_count :desc]]}))
@@ -240,7 +240,7 @@
[table-id :- [:maybe ::lib.schema.id/table]]
(t2/select [:model/Segment :id :table_id :definition]
{:where (cond-> [:and [:= :archived false]]
- table-id (conj [:= :table_id table-id]))}))
+ table-id (conj [:= :table_id (long table-id)]))}))
(mu/defn unarchived-metric-cards
"The id, Database id, query, and schema of the unarchived metric Cards."
diff --git a/test/metabase/usage_metadata/db_test.clj b/test/metabase/usage_metadata/db_test.clj
new file mode 100644
index 00000000000..aca19487a22
--- /dev/null
+++ b/test/metabase/usage_metadata/db_test.clj
@@ -0,0 +1,79 @@
+(ns metabase.usage-metadata.db-test
+ (:require
+ [clojure.test :refer :all]
+ [java-time.api :as t]
+ [metabase.test :as mt]
+ [metabase.test.fixtures :as fixtures]
+ [metabase.usage-metadata.db :as usage-metadata.db]
+ [metabase.usage-metadata.models.source-dimension-profile-daily]
+ [metabase.usage-metadata.models.source-segment-daily]
+ [metabase.usage-metadata.store :as usage-metadata.store]
+ [toucan2.core :as t2]))
+
+(use-fixtures :once (fixtures/initialize :db))
+
+(defn- segment-row [bucket-date source-id predicate]
+ {:source_type :table, :source_id source-id, :ownership_mode :direct, :field_id 10,
+ :predicate predicate, :bucket_date bucket-date, :count 1})
+
+(defn- profile-row [bucket-date source-id]
+ {:source_type :table, :source_id source-id, :field_id 11, :source_basis :fingerprint,
+ :observation_type :single-value, :observation_value nil, :bucket_date bucket-date, :count 1})
+
+(defn- do-with-clean-days! [days f]
+ (try
+ (run! usage-metadata.store/delete-day! days)
+ (f)
+ (finally
+ (run! usage-metadata.store/delete-day! days))))
+
+(deftest delete-rollups-by-bucket-date-test
+ (testing "GHY-4588: the bound bucket date still selects the rows to delete"
+ (let [day-1 (t/local-date 2026 3 1)
+ day-2 (t/local-date 2026 3 2)
+ day-3 (t/local-date 2026 3 3)]
+ (do-with-clean-days!
+ [day-1 day-2 day-3]
+ (fn []
+ (t2/insert! :model/SourceSegmentDaily [(segment-row day-1 1 "a")
+ (segment-row day-2 1 "b")
+ (segment-row day-3 1 "c")])
+ (testing "for-day deletes only that day"
+ (usage-metadata.db/delete-segment-rollups-for-day! day-2)
+ (is (= #{"a" "c"}
+ (t2/select-fn-set :predicate :model/SourceSegmentDaily :bucket_date [:in [day-1 day-2 day-3]]))))
+ (testing "before deletes only earlier days"
+ (usage-metadata.db/delete-segment-rollups-before! day-3)
+ (is (= #{"c"}
+ (t2/select-fn-set :predicate :model/SourceSegmentDaily :bucket_date [:in [day-1 day-2 day-3]])))))))))
+
+(deftest grouped-rows-filter-by-source-and-bucket-range-test
+ (testing "GHY-4588: the bound source id and bucket range still narrow the grouped rows"
+ (let [day-1 (t/local-date 2026 3 11)
+ day-2 (t/local-date 2026 3 12)
+ day-3 (t/local-date 2026 3 13)]
+ (do-with-clean-days!
+ [day-1 day-2 day-3]
+ (fn []
+ (t2/insert! :model/SourceSegmentDaily [(segment-row day-1 424242 "p")
+ (segment-row day-2 424242 "p")
+ (segment-row day-3 424242 "p")
+ (segment-row day-2 434343 "p")])
+ (t2/insert! :model/SourceDimensionProfileDaily [(profile-row day-1 424242)
+ (profile-row day-2 424242)
+ (profile-row day-3 424242)
+ (profile-row day-2 434343)])
+ (testing "segment rows"
+ (is (=? [{:source_id 424242 :total_count #(== 2 %)}]
+ (usage-metadata.db/grouped-segment-rows :table 424242 day-2 day-3))))
+ (testing "profile rows"
+ (is (=? [{:source_id 424242 :total_count #(== 2 %)}]
+ (usage-metadata.db/grouped-profile-rows :table 424242 day-2 day-3)))))))))
+
+(deftest unarchived-segments-by-table-test
+ (testing "GHY-4588: the table id still narrows the Segments"
+ (mt/with-temp [:model/Segment {in-table :id} {:table_id (mt/id :venues)}
+ :model/Segment {other-table :id} {:table_id (mt/id :checkins)}]
+ (let [ids (set (map :id (usage-metadata.db/unarchived-segments (mt/id :venues))))]
+ (is (contains? ids in-table))
+ (is (not (contains? ids other-table)))))))