Skip to content

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

Fix serdes breaking on IDs for db/table/fields for non-existent entities (#72399)

Alexander Polyankin8b051f242f09
diff --git a/src/metabase/models/serialization.clj b/src/metabase/models/serialization.clj
index 5d2ff45ee9a..02268d8778c 100644
--- a/src/metabase/models/serialization.clj
+++ b/src/metabase/models/serialization.clj
@@ -1073,8 +1073,8 @@
"Given a numeric database ID and a fn that resolves it to a database entity,
return its name as a portable reference."
[id db-fn]
- (when id
- (:name (db-fn id))))
+ (when-let [db (and id (db-fn id))]
+ (:name db)))
(defn ^:dynamic *export-database-fk*
"Given a numeric database ID, return its name as a portable reference.
@@ -1112,9 +1112,8 @@
"Given a numeric table ID, a fn that resolves it to a table entity, and a fn
that resolves a database ID to a database entity, return `[db-name schema table-name]`."
[id table-fn db-fn]
- (when id
- (let [table (table-fn id)]
- [(export-database-fk (:db_id table) db-fn) (:schema table) (:name table)])))
+ (when-let [table (and id (table-fn id))]
+ [(export-database-fk (:db_id table) db-fn) (:schema table) (:name table)]))
(mu/defn ^:dynamic *export-table-fk*
"Given a numeric `table_id`, return a portable table reference.
@@ -1184,9 +1183,8 @@
"Given a numeric field ID and lookup fns for fields, tables, and databases,
return `[db-name schema table-name & field-names]`."
[field-id field-fn table-fn db-fn]
- (when field-id
- (let [field (field-fn field-id)
- table-ref (export-table-fk (:table_id field) table-fn db-fn)
+ (when-let [field (and field-id (field-fn field-id))]
+ (let [table-ref (export-table-fk (:table_id field) table-fn db-fn)
field-names (field-name-chain field-id field-fn)]
(into table-ref field-names))))
@@ -1214,7 +1212,7 @@
[field-id max-batch]
(let [required (load-field-hierarchy field-id)
remaining (- max-batch (count required))]
- (if-not (pos? remaining)
+ (if (or (empty? required) (not (pos? remaining)))
required
(let [table-id (:table_id (get required field-id))
fk-field-ids (t2/select-fn-set :fk_target_field_id :model/Field
@@ -1222,7 +1220,7 @@
:fk_target_field_id [:not= nil])
fk-table-ids (when (seq fk-field-ids)
(t2/select-fn-set :table_id :model/Field :id [:in fk-field-ids]))
- all-table-ids (cond-> #{table-id} (seq fk-table-ids) (into fk-table-ids))
+ all-table-ids (into #{table-id} fk-table-ids)
extras (t2/select-pk->fn identity [:model/Field :id :name :table_id :parent_id]
:id [:not-in (set (keys required))]
:table_id [:in all-table-ids]
diff --git a/test/metabase/models/serialization_test.clj b/test/metabase/models/serialization_test.clj
index eafa8d41003..882a19897e9 100644
--- a/test/metabase/models/serialization_test.clj
+++ b/test/metabase/models/serialization_test.clj
@@ -206,7 +206,10 @@
(is (= "db1" (serdes/*export-database-fk* db1-id)))
(is (= "db2" (serdes/*export-database-fk* db2-id)))
(is (= "db3" (serdes/*export-database-fk* db3-id)))
- (is (= "db1" (serdes/*export-database-fk* db1-id))))))))
+ (is (= "db1" (serdes/*export-database-fk* db1-id)))))))
+ (testing "non-existent database ID returns nil"
+ (serdes/with-cache
+ (is (nil? (serdes/*export-database-fk* Integer/MAX_VALUE))))))
(deftest export-table-fk-with-cache-test
(testing "3 tables with FK and cache limit 2: batch-loads FK target, evicts and re-loads"
@@ -222,7 +225,10 @@
(is (= ["db" "public" "t1"] (serdes/*export-table-fk* t1-id)))
(is (= ["db" "public" "t2"] (serdes/*export-table-fk* t2-id)))
(is (= ["db" nil "t3"] (serdes/*export-table-fk* t3-id)))
- (is (= ["db" "public" "t1"] (serdes/*export-table-fk* t1-id))))))))
+ (is (= ["db" "public" "t1"] (serdes/*export-table-fk* t1-id)))))))
+ (testing "non-existent table ID returns nil"
+ (serdes/with-cache
+ (is (nil? (serdes/*export-table-fk* Integer/MAX_VALUE))))))
(deftest export-field-fk-with-cache-test
(testing "3-level parent chain with cache limit 2: all ancestors kept even when exceeding limit"
@@ -237,4 +243,7 @@
(serdes/with-cache
(is (= ["db" nil "t" "f1" "f2" "f3"] (serdes/*export-field-fk* f3-id)))
(is (= ["db" nil "t" "f1" "f2"] (serdes/*export-field-fk* f2-id)))
- (is (= ["db" nil "t" "f1"] (serdes/*export-field-fk* f1-id))))))))
+ (is (= ["db" nil "t" "f1"] (serdes/*export-field-fk* f1-id)))))))
+ (testing "non-existent field ID returns nil"
+ (serdes/with-cache
+ (is (nil? (serdes/*export-field-fk* Integer/MAX_VALUE))))))