Skip to content

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

fix table-id serialization (#72489)

Alexander Polyankinbaf1ebad7846
diff --git a/src/metabase/models/serialization.clj b/src/metabase/models/serialization.clj
index 768fe0f1a26..75b6f6cc2e4 100644
--- a/src/metabase/models/serialization.clj
+++ b/src/metabase/models/serialization.clj
@@ -1212,6 +1212,9 @@
(:source_table :source-table) (cond-> m
(pos-int? v)
(update k *export-table-fk*))
+ :table-id (cond-> m
+ (pos-int? v)
+ (update k *export-table-fk*))
(:source_card :source-card) (cond-> m
(pos-int? v)
(update k *export-fk* :model/Card))
@@ -1300,6 +1303,9 @@
:snippet-id (cond-> m
(portable-id? v)
(update k *import-fk* 'NativeQuerySnippet))
+ :table-id (cond-> m
+ (vector? v)
+ (update k *import-table-fk*))
#_else (update m k import-mbql*)))
m
m))
@@ -1405,6 +1411,7 @@
(and (= k :source-card) (portable-id? v)) #{[{:model "Card" :id v}]}
(and (= k :source-field) (vector? v)) #{(field->path v)}
(and (= k :snippet-id) (portable-id? v)) #{[{:model "NativeQuerySnippet" :id v}]}
+ (and (= k :table-id) (vector? v)) #{(table->path v)}
(and (#{:card_id :card-id} k) (string? v)) #{[{:model "Card" :id v}]}
(map? v) (mbql-deps-map v)
(vector? v) (mbql-deps-vector v))))
diff --git a/test/metabase/models/serialization_test.clj b/test/metabase/models/serialization_test.clj
index 9709d459ef5..6895d3f1de8 100644
--- a/test/metabase/models/serialization_test.clj
+++ b/test/metabase/models/serialization_test.clj
@@ -177,6 +177,32 @@
{:source-field ["my-db" nil "orders" "subtotal"]}]]
:id "[\"dimension\",[\"field\",[\"my-db\",null,\"orders\",\"invoice\"],{\"source-field\":[\"my-db\",null,\"orders\",\"subtotal\"]}]]"}}}}}}})))))
+(deftest ^:parallel export-import-template-tag-table-id-test
+ (testing "template tags of type :table serialize their :table-id as a portable tuple"
+ (let [template-tags {"table" {:id "abc"
+ :name "table"
+ :display-name "Table"
+ :type :table
+ :table-id 42}}
+ exported (binding [serdes/*export-table-fk* (constantly ["DB" "SCHEMA" "TABLE"])]
+ (serdes/export-mbql template-tags))]
+ (is (= {"table" {:id "abc"
+ :name "table"
+ :display-name "Table"
+ :type :table
+ :table-id ["DB" "SCHEMA" "TABLE"]}}
+ exported))
+ (is (= 42
+ (binding [serdes/*import-table-fk* (constantly 42)]
+ (get-in (#'serdes/import-mbql* exported) ["table" :table-id])))))))
+
+(deftest ^:parallel template-tag-table-id-deps-test
+ (testing "template tag :table-id contributes a Table dependency"
+ (is (contains? (#'serdes/mbql-deps-map {:table-id ["DB" "SCHEMA" "TABLE"]})
+ [{:model "Database" :id "DB"}
+ {:model "Schema" :id "SCHEMA"}
+ {:model "Table" :id "TABLE"}]))))
+
(deftest ^:parallel export-parameters-test
(binding [serdes/*export-fk* (fn [id model]
(format "%s___%d" (name model) id))