Skip to content

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

Strip redundant card fields from serdes output (#72055)

dpsutton05682e646ec7
diff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.edn
index e0586f5a6bc..d931429a6f2 100644
--- a/.clj-kondo/config/modules/config.edn
+++ b/.clj-kondo/config/modules/config.edn
@@ -1685,7 +1685,6 @@
:model/NativeQuerySnippet
:model/Notification
:model/Revision
- :model/Table
:model/User}}
queries-rest
diff --git a/enterprise/backend/test/metabase_enterprise/serialization/v2/extract_test.clj b/enterprise/backend/test/metabase_enterprise/serialization/v2/extract_test.clj
index f1867f24377..ae961df1e4c 100644
--- a/enterprise/backend/test/metabase_enterprise/serialization/v2/extract_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/serialization/v2/extract_test.clj
@@ -340,7 +340,6 @@
(testing "table and database are extracted as [db schema table] triples"
(let [ser (serdes/extract-one "Card" {} (t2/select-one :model/Card :id c1-id))]
(is (=? {:serdes/meta [{:model "Card" :id c1-eid :label "some_question"}]
- :table_id ["My Database" nil "Schemaless Table"]
:creator_id "[email protected]"
:collection_id coll-eid
:dataset_query {:stages [{:source-table ["My Database" nil "Schemaless Table"]
@@ -353,7 +352,7 @@
ser))
(is (not (contains? ser :id)))
- (testing "cards depend on their Table and Collection, and also anything referenced in the query"
+ (testing "cards depend on their Collection, and anything referenced in the query (including :database)"
(is (= #{[{:model "Database" :id "My Database"}]
[{:model "Database" :id "My Database"}
{:model "Table" :id "Schemaless Table"}]
@@ -365,7 +364,6 @@
(let [ser (serdes/extract-one "Card" {} (t2/select-one :model/Card :id c2-id))]
(is (=? {:serdes/meta [{:model "Card" :id c2-eid :label "second_question"}]
- :table_id ["My Database" "PUBLIC" "Schema'd Table"]
:creator_id "[email protected]"
:collection_id coll-eid
:dataset_query {}
@@ -376,12 +374,11 @@
:created_at string?}
ser))
(is (not (contains? ser :id)))
+ (is (not (contains? ser :table_id)) "table_id always skipped for cards — re-derived on import")
+ (is (contains? ser :database_id) "database_id kept when query is empty")
- (testing "cards depend on their Database, Table and Collection, and any fields in their parameter_mappings"
+ (testing "cards depend on their Database (kept because query is empty), Collection, and parameter_mappings refs"
(is (= #{[{:model "Database" :id "My Database"}]
- [{:model "Database" :id "My Database"}
- {:model "Schema" :id "PUBLIC"}
- {:model "Table" :id "Schema'd Table"}]
[{:model "Collection" :id coll-eid}]
[{:model "Card" :id c1-eid}]
[{:model "Database" :id "My Database"}
@@ -395,7 +392,6 @@
(let [ser (serdes/extract-one "Card" {} (t2/select-one :model/Card :id c3-id))]
(is (=? {:serdes/meta [{:model "Card" :id c3-eid :label "third_question"}]
- :table_id ["My Database" "PUBLIC" "Schema'd Table"]
:creator_id "[email protected]"
:collection_id coll-eid
:dataset_query {}
@@ -424,11 +420,8 @@
ser))
(is (not (contains? ser :id)))
- (testing "cards depend on their Database, Table and Collection, and any fields in their visualization_settings"
+ (testing "cards depend on their Database (kept, query empty), Collection, and visualization_settings refs"
(is (= #{[{:model "Database" :id "My Database"}]
- [{:model "Database" :id "My Database"}
- {:model "Schema" :id "PUBLIC"}
- {:model "Table" :id "Schema'd Table"}]
[{:model "Collection" :id coll-eid}]
[{:model "Database" :id "My Database"}
{:model "Table" :id "Schemaless Table"}
@@ -442,7 +435,6 @@
(testing "Cards can be based on other cards"
(let [ser (serdes/extract-one "Card" {} (t2/select-one :model/Card :id c5-id))]
(is (=? {:serdes/meta [{:model "Card" :id c5-eid :label "dependent_question"}]
- :table_id ["My Database" nil "Schemaless Table"]
:creator_id "[email protected]"
:collection_id coll-eid
:dataset_query {:stages [{:source-card c4-eid
@@ -451,11 +443,11 @@
:created_at string?}
ser))
(is (not (contains? ser :id)))
+ (is (not (contains? ser :table_id)) "table_id stripped")
+ (is (not (contains? ser :database_id)) "database_id stripped — derivable from query")
- (testing "and depend on their Database, Table and Collection, and the upstream Card"
+ (testing "and depend on their Collection, Database (from query), and the upstream Card"
(is (= #{[{:model "Database" :id "My Database"}]
- [{:model "Database" :id "My Database"}
- {:model "Table" :id "Schemaless Table"}]
[{:model "Collection" :id coll-eid}]
[{:model "Card" :id c4-eid}]}
(set (serdes/dependencies ser)))))))
@@ -905,7 +897,6 @@
(testing "segment"
(let [ser (serdes/extract-one "Segment" {} (t2/select-one :model/Segment :id s1-id))]
(is (=? {:serdes/meta [{:model "Segment" :id s1-eid :label "my_segment"}]
- :table_id ["My Database" nil "Schemaless Table"]
:creator_id "[email protected]"
:definition {:database "My Database",
:lib/type :mbql/query
@@ -954,7 +945,6 @@
(testing "measure"
(let [ser (serdes/extract-one "Measure" {} (t2/select-one :model/Measure :id m1-id))]
(is (=? {:serdes/meta [{:model "Measure" :id m1-eid :label "my_measure"}]
- :table_id ["My Database" nil "Schemaless Table"]
:creator_id "[email protected]"
:definition {:database "My Database"
:lib/type :mbql/query
@@ -1004,7 +994,6 @@
(testing "measure referencing another measure"
(let [ser (serdes/extract-one "Measure" {} (t2/select-one :model/Measure :id m2-id))]
(is (=? {:serdes/meta [{:model "Measure" :id m2-eid :label "derived_measure"}]
- :table_id ["My Database" nil "My Table"]
:creator_id "[email protected]"
:definition {:database "My Database"
:lib/type :mbql/query
@@ -1047,7 +1036,6 @@
(testing "measure referencing a segment"
(let [ser (serdes/extract-one "Measure" {} (t2/select-one :model/Measure :id m-id))]
(is (=? {:serdes/meta [{:model "Measure" :id m-eid :label "expensive_item_count"}]
- :table_id ["My Database" nil "My Table"]
:creator_id "[email protected]"
:definition {:database "My Database"
:lib/type :mbql/query
@@ -1314,8 +1302,6 @@
(:parameters ser)))
(is (= #{[{:model "Database" :id "My Database"}]
[{:model "Collection" :id coll-eid-2}]
- [{:model "Database" :id "My Database"}
- {:model "Table" :id "Schemaless Table"}]
[{:model "Card" :id card-eid-1}]
[{:model "Database" :id "My Database"}
{:model "Table" :id "Schemaless Table"}
@@ -2810,6 +2796,106 @@
(is (= [{:label "channels"} {:label "HTTP Channel" :key "HTTP Channel"}]
(serdes/storage-path ser {}))))))))
+;;; ===========================================================================
+;;; Redundant field stripping tests
+;;;
+;;; Fields derivable from dataset_query (table_id, database_id, query_type,
+;;; source_card_id) should be omitted from export.
+;;; ===========================================================================
+
+(defn- mbql5-query
+ "Create a simple MBQL 5 query for the given database and table."
+ [db-id table-id]
+ (let [metadata-provider (lib-be/application-database-metadata-provider db-id)
+ table (lib.metadata/table metadata-provider table-id)]
+ (lib/query metadata-provider table)))
+
+(deftest card-export-strips-redundant-fields-test
+ (testing "Card export omits table_id, query_type, source_card_id when derivable from query"
+ (mt/with-empty-h2-app-db!
+ (ts/with-temp-dpc [:model/Database {db-id :id} {:name "Test DB"}
+ :model/Table {table-id :id} {:name "orders" :db_id db-id}
+ :model/Field _ {:name "id" :table_id table-id}
+ :model/Card {card-id :id} {:name "MBQL Card"
+ :dataset_query (mbql5-query db-id table-id)
+ :display :table}]
+ (let [ser (serdes/extract-one "Card" {} (t2/select-one :model/Card card-id))]
+ (is (not (contains? ser :table_id))
+ "table_id should be omitted — derivable from dataset_query")
+ (is (not (contains? ser :query_type))
+ "query_type should be omitted — derivable from dataset_query")
+ (is (not (contains? ser :source_card_id))
+ "source_card_id should be omitted — derivable from dataset_query")
+ (is (not (contains? ser :database_id))
+ "database_id should be omitted when derivable from dataset_query"))))))
+
+(deftest card-export-keeps-database-id-when-query-empty-test
+ (testing "Card export keeps database_id when dataset_query has no :database key"
+ (mt/with-empty-h2-app-db!
+ (ts/with-temp-dpc [:model/Database {db-id :id} {:name "Test DB"}
+ :model/Card {card-id :id} {:name "Empty Query Card"
+ :database_id db-id
+ :dataset_query {}
+ :display :table}]
+ (let [ser (serdes/extract-one "Card" {} (t2/select-one :model/Card card-id))]
+ (is (= "Test DB" (:database_id ser))
+ "database_id should be kept when query is empty"))))))
+
+(deftest card-export-deps-come-from-query-test
+ (testing "Card dependencies come from dataset_query, not from stripped FK fields"
+ (mt/with-empty-h2-app-db!
+ (ts/with-temp-dpc [:model/Database {db-id :id} {:name "Test DB"}
+ :model/Table {table-id :id} {:name "orders" :db_id db-id}
+ :model/Field _ {:name "id" :table_id table-id}
+ :model/Card {card-id :id} {:name "MBQL Card"
+ :dataset_query (mbql5-query db-id table-id)
+ :display :table}]
+ (let [ser (serdes/extract-one "Card" {} (t2/select-one :model/Card card-id))
+ deps (serdes/dependencies ser)]
+ ;; Database dep comes from mbql-deps on the query's :database key
+ (is (contains? (set deps) [{:model "Database" :id "Test DB"}])
+ "Database dependency should come from the query")
+ ;; Table dep comes from mbql-deps on the query's :source-table
+ (is (some #(some (fn [step] (= "Table" (:model step))) %) deps)
+ "Table dependency should come from the query"))))))
+
+(deftest segment-export-strips-table-id-test
+ (testing "Segment export omits table_id — derivable from definition"
+ (mt/with-empty-h2-app-db!
+ (ts/with-temp-dpc [:model/Database {db-id :id} {:name "Test DB"}
+ :model/Table {table-id :id} {:name "orders" :db_id db-id}
+ :model/Field {field-id :id} {:name "total" :table_id table-id}
+ :model/Segment _ {:name "Big Orders"
+ :table_id table-id
+ :definition (let [mp (lib-be/application-database-metadata-provider db-id)
+ table (lib.metadata/table mp table-id)
+ query (lib/query mp table)
+ field (lib.metadata/field mp field-id)]
+ (lib/filter query (lib/> field 100)))}]
+ (let [ser (first (by-model "Segment" (extract/extract {})))]
+ (is (some? ser))
+ (is (not (contains? ser :table_id))
+ "table_id should be omitted — derivable from definition"))))))
+
+(deftest measure-export-strips-table-id-test
+ (testing "Measure export omits table_id — derivable from definition"
+ (mt/with-empty-h2-app-db!
+ (ts/with-temp-dpc [:model/Database {db-id :id} {:name "Test DB"}
+ :model/Table {table-id :id} {:name "orders" :db_id db-id}
+ :model/Field {field-id :id} {:name "total" :table_id table-id
+ :base_type :type/Float}
+ :model/Measure _ {:name "Total Sales"
+ :table_id table-id
+ :definition (let [mp (lib-be/application-database-metadata-provider db-id)
+ table (lib.metadata/table mp table-id)
+ query (lib/query mp table)
+ field (lib.metadata/field mp field-id)]
+ (lib/aggregate query (lib/sum field)))}]
+ (let [ser (first (by-model "Measure" (extract/extract {})))]
+ (is (some? ser))
+ (is (not (contains? ser :table_id))
+ "table_id should be omitted — derivable from definition"))))))
+
(deftest embedding-theme-test
(mt/with-empty-h2-app-db!
(ts/with-temp-dpc [:model/EmbeddingTheme
diff --git a/enterprise/backend/test/metabase_enterprise/serialization/v2/load_test.clj b/enterprise/backend/test/metabase_enterprise/serialization/v2/load_test.clj
index 00eb9758529..bc2b579854e 100644
--- a/enterprise/backend/test/metabase_enterprise/serialization/v2/load_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/serialization/v2/load_test.clj
@@ -2191,6 +2191,151 @@
(is (some? metabot))
(is (= "Minimal Bot" (:name metabot))))))))))
+;;; ===========================================================================
+;;; Round-trip tests for stripped fields
+;;;
+;;; Export now omits table_id, database_id, query_type, source_card_id from
+;;; Cards, and table_id from Segments/Measures. These tests verify the full
+;;; export → import round-trip backfills the fields correctly.
+;;; ===========================================================================
+
+(deftest card-stripped-fields-round-trip-test
+ (testing "Card round-trip: stripped fields (table_id, database_id, query_type) are backfilled on import"
+ (let [serialized (atom nil)]
+ (ts/with-dbs [source-db dest-db]
+ (ts/with-db source-db
+ (let [db (ts/create! :model/Database :name "my-db")
+ table (ts/create! :model/Table :name "orders" :db_id (:id db))
+ _ (ts/create! :model/Field :name "id" :table_id (:id table))
+ user (ts/create! :model/User :first_name "Tom" :last_name "Scholz" :email "[email protected]")
+ _card (ts/create! :model/Card
+ :collection_id nil
+ :creator_id (:id user)
+ :name "Round Trip Card"
+ :dataset_query (mbql5-query (:id db) (:id table))
+ :display :table)]
+ (reset! serialized (into [] (serdes.extract/extract {})))
+ ;; Verify the fields are actually stripped from export
+ (let [card-ser (first (filter #(= "Card" (-> % :serdes/meta last :model)) @serialized))]
+ (is (not (contains? card-ser :table_id)) "table_id should be stripped from export")
+ (is (not (contains? card-ser :database_id)) "database_id should be stripped from export")
+ (is (not (contains? card-ser :query_type)) "query_type should be stripped from export"))))
+
+ (ts/with-db dest-db
+ (ts/create! :model/User :first_name "Tom" :last_name "Scholz" :email "[email protected]")
+ (serdes.load/load-metabase! (ingestion-in-memory @serialized))
+ (let [card (t2/select-one :model/Card :name "Round Trip Card")
+ db (t2/select-one :model/Database :name "my-db")
+ table (t2/select-one :model/Table :name "orders")]
+ (is (some? card))
+ (is (= (:id db) (:database_id card)) "database_id backfilled from query")
+ (is (= (:id table) (:table_id card)) "table_id backfilled from query")
+ (is (= :query (:query_type card)) "query_type backfilled from query")
+ (is (nil? (:source_card_id card)) "source_card_id nil for table-based query")))))))
+
+(deftest segment-stripped-fields-round-trip-test
+ (testing "Segment round-trip: stripped table_id is backfilled from definition on import"
+ (let [serialized (atom nil)]
+ (ts/with-dbs [source-db dest-db]
+ (ts/with-db source-db
+ (let [db (ts/create! :model/Database :name "my-db")
+ table (ts/create! :model/Table :name "customers" :db_id (:id db))
+ field (ts/create! :model/Field :name "age" :table_id (:id table))
+ user (ts/create! :model/User :first_name "Tom" :last_name "Scholz" :email "[email protected]")
+ _segment (ts/create! :model/Segment :table_id (:id table) :name "Minors"
+ :definition (mbql5-segment-definition (:id db) (:id table) (:id field))
+ :creator_id (:id user))]
+ (reset! serialized (into [] (serdes.extract/extract {})))
+ (let [seg-ser (first (filter #(= "Segment" (-> % :serdes/meta last :model)) @serialized))]
+ (is (not (contains? seg-ser :table_id)) "table_id should be stripped from export"))))
+
+ (ts/with-db dest-db
+ (ts/create! :model/User :first_name "Tom" :last_name "Scholz" :email "[email protected]")
+ (serdes.load/load-metabase! (ingestion-in-memory @serialized))
+ (let [segment (t2/select-one :model/Segment :name "Minors")
+ table (t2/select-one :model/Table :name "customers")]
+ (is (some? segment))
+ (is (= (:id table) (:table_id segment)) "table_id backfilled from definition")))))))
+
+(deftest measure-stripped-fields-round-trip-test
+ (testing "Measure round-trip: stripped table_id is backfilled from definition on import"
+ (let [serialized (atom nil)]
+ (ts/with-dbs [source-db dest-db]
+ (ts/with-db source-db
+ (let [db (ts/create! :model/Database :name "my-db")
+ table (ts/create! :model/Table :name "sales" :db_id (:id db))
+ field (ts/create! :model/Field :name "amount" :table_id (:id table))
+ user (ts/create! :model/User :first_name "Tom" :last_name "Scholz" :email "[email protected]")
+ _measure (ts/create! :model/Measure :table_id (:id table) :name "Total Sales"
+ :definition (mbql5-measure-definition (:id db) (:id table) (:id field))
+ :creator_id (:id user))]
+ (reset! serialized (into [] (serdes.extract/extract {})))
+ (let [msr-ser (first (filter #(= "Measure" (-> % :serdes/meta last :model)) @serialized))]
+ (is (not (contains? msr-ser :table_id)) "table_id should be stripped from export"))))
+
+ (ts/with-db dest-db
+ (ts/create! :model/User :first_name "Tom" :last_name "Scholz" :email "[email protected]")
+ (serdes.load/load-metabase! (ingestion-in-memory @serialized))
+ (let [measure (t2/select-one :model/Measure :name "Total Sales")
+ table (t2/select-one :model/Table :name "sales")]
+ (is (some? measure))
+ (is (= (:id table) (:table_id measure)) "table_id backfilled from definition")))))))
+
+;;; ---------------------------------------------------------------------------
+;;; Keep-side round-trips: fields that cannot be derived are exported and then
+;;; correctly resolved on import.
+;;; ---------------------------------------------------------------------------
+
+(deftest card-kept-fields-round-trip-test
+ (testing "Card round-trip: database_id is exported and resolved when dataset_query is empty"
+ (let [serialized (atom nil)]
+ (ts/with-dbs [source-db dest-db]
+ (ts/with-db source-db
+ (let [db (ts/create! :model/Database :name "my-db")
+ user (ts/create! :model/User :first_name "Tom" :last_name "Scholz" :email "[email protected]")
+ ;; Empty dataset_query — populate-query-fields does not run, so database_id
+ ;; comes only from the explicit field we pass.
+ _card (ts/create! :model/Card
+ :collection_id nil
+ :creator_id (:id user)
+ :name "Empty Query Card"
+ :database_id (:id db)
+ :dataset_query {}
+ :display :table)]
+ (reset! serialized (into [] (serdes.extract/extract {})))
+ (let [card-ser (first (filter #(= "Card" (-> % :serdes/meta last :model)) @serialized))]
+ (is (contains? card-ser :database_id) "database_id exported — not derivable from empty query"))))
+
+ (ts/with-db dest-db
+ (ts/create! :model/User :first_name "Tom" :last_name "Scholz" :email "[email protected]")
+ (serdes.load/load-metabase! (ingestion-in-memory @serialized))
+ (let [card (t2/select-one :model/Card :name "Empty Query Card")
+ db (t2/select-one :model/Database :name "my-db")]
+ (is (some? card))
+ (is (= (:id db) (:database_id card)) "database_id resolved from exported portable ref")))))))
+
+(deftest card-broken-query-exports-kept-fields-test
+ (testing "Card with a non-empty but broken dataset_query still exports database_id"
+ (ts/with-dbs [source-db _dest-db]
+ (ts/with-db source-db
+ (let [db (ts/create! :model/Database :name "my-db")
+ user (ts/create! :model/User :first_name "Tom" :last_name "Scholz" :email "[email protected]")
+ card (ts/create! :model/Card
+ :creator_id (:id user)
+ :name "Broken Query Card"
+ :database_id (:id db)
+ :dataset_query {}
+ :display :table)]
+ ;; Corrupt dataset_query to a non-empty but structurally broken value, bypassing the
+ ;; model hooks. This simulates a card whose query became malformed after migrations.
+ (t2/query {:update :report_card
+ :set {:dataset_query (json/encode {:broken true})}
+ :where [:= :id (:id card)]})
+ (let [serialized (into [] (serdes.extract/extract {}))
+ card-ser (first (filter #(= "Card" (-> % :serdes/meta last :model)) serialized))]
+ (is (not (contains? card-ser :table_id)) "table_id always skipped for cards — re-derived on import")
+ (is (contains? card-ser :database_id) "database_id exported — not derivable from broken query")))))))
+
(deftest library-subcollection-round-trip-test
(testing "Library subcollection structure and types are preserved through serdes round-trip"
(let [serialized (atom nil)
diff --git a/src/metabase/measures/models/measure.clj b/src/metabase/measures/models/measure.clj
index b7b30be3872..bbdce733cde 100644
--- a/src/metabase/measures/models/measure.clj
+++ b/src/metabase/measures/models/measure.clj
@@ -195,23 +195,26 @@
table_id (conj (serdes/table->path table_id))))
(defmethod serdes/storage-path "Measure" [measure _ctx]
- (into (-> measure :table_id serdes/table->path serdes/storage-path-prefixes)
- [{:label "measures"} {:label (:name measure) :key (:entity_id measure)}]))
+ (let [table-path (-> measure :definition serdes/serialized-query-source-table)]
+ (into (serdes/storage-path-prefixes (serdes/table->path table-path))
+ [{:label "measures"} {:label (:name measure) :key (:entity_id measure)}])))
(defn- import-measure-definition
"Import a measure definition from serialization format.
Converts portable IDs back to numeric IDs, then converts MBQL4 to MBQL5."
[exported]
(let [with-ids (serdes/import-mbql exported)]
- (when (seq with-ids)
- (lib-be/normalize-query with-ids))))
+ (if (seq with-ids)
+ (lib-be/normalize-query with-ids)
+ with-ids)))
(defmethod serdes/make-spec "Measure" [_model-name _opts]
{:copy [:name :archived :description :entity_id]
:skip [;; dimensions are computed from the query and reconciled on read, not serialized
- :dimensions :dimension_mappings]
+ :dimensions :dimension_mappings
+ ;; always re-derived from definition by before-insert via lib/primary-source-table-id
+ :table_id]
:transform {:created_at (serdes/date)
- :table_id (serdes/fk :model/Table)
:creator_id (serdes/fk :model/User)
:definition {:export serdes/export-mbql :import import-measure-definition}}
:defaults {:archived false}})
diff --git a/src/metabase/models/serialization.clj b/src/metabase/models/serialization.clj
index 0bfad1e6b61..f934f7ddda3 100644
--- a/src/metabase/models/serialization.clj
+++ b/src/metabase/models/serialization.clj
@@ -1098,6 +1098,13 @@
"Table" "tables"
"Field" "fields"})
+(defn serialized-query-source-table
+ "Given a serialized query (with portable references), returns the portable reference of the table it is based
+ on. Measures and segments use this to omit the table_id property when it is derivable from the query. This should be
+ an mbql query and not a native query."
+ [serialized-query]
+ (resolve/serialized-query-source-table serialized-query))
+
(defn storage-path-prefixes
"The [[serdes/storage-path]] for Table is a bit tricky, and shared with Fields and FieldValues, so it's
factored out here.
diff --git a/src/metabase/models/serialization/resolve.clj b/src/metabase/models/serialization/resolve.clj
index 69bf0b8977e..82dff2541cb 100644
--- a/src/metabase/models/serialization/resolve.clj
+++ b/src/metabase/models/serialization/resolve.clj
@@ -69,6 +69,14 @@
(or (entity-id? s)
(identity-hash? s))))
+(defn serialized-query-source-table
+ "Given a serialized query (with portable references), returns the portable reference of the table it is based
+ on. Measures and segments use this to omit the table_id property when it is derivable from the query. This should be
+ an mbql query and not a native query."
+ [serialized-query]
+ (mu/disable-enforcement
+ (lib/primary-source-table-id serialized-query)))
+
;;; ============================================================
;;; import-mbql — depends only on protocols, match, lib.schema.id
;;; ============================================================
diff --git a/src/metabase/queries/models/card.clj b/src/metabase/queries/models/card.clj
index a2bcd220322..fde60d21b8f 100644
--- a/src/metabase/queries/models/card.clj
+++ b/src/metabase/queries/models/card.clj
@@ -1318,7 +1318,7 @@
(defmethod serdes/make-spec "Card"
[_model-name _opts]
{:copy [:archived :archived_directly :collection_position :collection_preview :description :display
- :embedding_params :enable_embedding :embedding_type :entity_id :metabase_version :public_uuid :query_type :type :name
+ :embedding_params :enable_embedding :embedding_type :entity_id :metabase_version :public_uuid :type :name
:card_schema]
:skip [;; cache invalidation is instance-specific
:cache_invalidated_at
@@ -1331,12 +1331,24 @@
;; dimensions are computed from the query and reconciled on read, not serialized
:dimensions :dimension_mappings
;; temporary column to power rollback from v57 to v56; we can remove it in v58
- :legacy_query]
+ :legacy_query
+ ;; always derivable from dataset_query by populate-query-fields; nil when not derivable
+ :query_type
+ ;; always re-derived from dataset_query by populate-query-fields on import
+ :table_id :source_card_id]
:transform
{:created_at (serdes/date)
- :database_id (serdes/fk :model/Database)
- :table_id (serdes/fk :model/Table)
- :source_card_id (serdes/fk :model/Card)
+ ;; database_id is usually derivable from dataset_query, but must be kept when the query
+ ;; is empty (e.g. a native card with no query yet) and database_id is the only reference.
+ :database_id (let [{:keys [import]} (serdes/fk :model/Database)]
+ {::serdes/fk true
+ :export-with-context
+ (fn [{:keys [dataset_query database_id]} _k _v]
+ (if (and (seq dataset_query) (get dataset_query :database))
+ ::serdes/skip
+ (when database_id
+ (serdes/*export-database-fk* database_id))))
+ :import import})
:collection_id (serdes/fk :model/Collection)
:dashboard_id (serdes/fk :model/Dashboard)
:document_id (serdes/fk :model/Document)
diff --git a/src/metabase/segments/models/segment.clj b/src/metabase/segments/models/segment.clj
index a4ac611c343..495b854e454 100644
--- a/src/metabase/segments/models/segment.clj
+++ b/src/metabase/segments/models/segment.clj
@@ -222,14 +222,15 @@
table_id (conj (serdes/table->path table_id))))
(defmethod serdes/storage-path "Segment" [segment _ctx]
- (into (-> segment :table_id serdes/table->path serdes/storage-path-prefixes)
- [{:label "segments"} {:label (:name segment) :key (:entity_id segment)}]))
+ (let [table-path (-> segment :definition serdes/serialized-query-source-table)]
+ (into (serdes/storage-path-prefixes (serdes/table->path table-path))
+ [{:label "segments"} {:label (:name segment) :key (:entity_id segment)}])))
(defmethod serdes/make-spec "Segment" [_model-name _opts]
{:copy [:name :points_of_interest :archived :caveats :description :entity_id :show_in_getting_started]
- :skip []
+ :skip [;; always re-derived from definition by before-insert via lib/primary-source-table-id
+ :table_id]
:transform {:created_at (serdes/date)
- :table_id (serdes/fk :model/Table)
:creator_id (serdes/fk :model/User)
:definition {:export serdes/export-mbql :import serdes/import-mbql}}
:defaults {:archived false :show_in_getting_started false}})
diff --git a/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_average_order.yaml b/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_average_order.yaml
index 7b4db6e3509..443c44cfb75 100644
--- a/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_average_order.yaml
+++ b/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_average_order.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: line
collection_id: cOlDaShBoArDs0ExAmPlx
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_cumulative_orders.yaml b/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_cumulative_orders.yaml
index 52536de4810..48125b5bd8a 100644
--- a/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_cumulative_orders.yaml
+++ b/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_cumulative_orders.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: line
collection_id: cOlDaShBoArDs0ExAmPlx
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_orders.yaml b/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_orders.yaml
index e2732846dad..8b1298401a5 100644
--- a/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_orders.yaml
+++ b/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_orders.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: line
collection_id: cOlDaShBoArDs0ExAmPlx
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_revenue.yaml b/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_revenue.yaml
index 06d8dc52dc2..b287748684f 100644
--- a/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_revenue.yaml
+++ b/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_revenue.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: line
collection_id: cOlDaShBoArDs0ExAmPlx
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/native_orders_query.yaml b/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/native_orders_query.yaml
index 93ad29da9cd..8832ce35b48 100644
--- a/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/native_orders_query.yaml
+++ b/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/native_orders_query.yaml
@@ -4,8 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: table
collection_id: cOlDaShBoArDs0ExAmPlx
-query_type: native
-database_id: Sample Database
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/total_revenue.yaml b/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/total_revenue.yaml
index 6bda5c691ba..1d898ed1b51 100644
--- a/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/total_revenue.yaml
+++ b/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/total_revenue.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: scalar
collection_id: cOlDaShBoArDs0ExAmPlx
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/dashboards/tabbed_dashboard/products_table.yaml b/test_resources/serialization_baseline/collections/main/dashboards/tabbed_dashboard/products_table.yaml
index d2d591e62c8..7f79f7fe052 100644
--- a/test_resources/serialization_baseline/collections/main/dashboards/tabbed_dashboard/products_table.yaml
+++ b/test_resources/serialization_baseline/collections/main/dashboards/tabbed_dashboard/products_table.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: table
collection_id: cOlDaShBoArDs0ExAmPlx
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- PRODUCTS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/documents/product_analysis_report/category_breakdown.yaml b/test_resources/serialization_baseline/collections/main/documents/product_analysis_report/category_breakdown.yaml
index 5ef03dcfc89..dfbabc125f1 100644
--- a/test_resources/serialization_baseline/collections/main/documents/product_analysis_report/category_breakdown.yaml
+++ b/test_resources/serialization_baseline/collections/main/documents/product_analysis_report/category_breakdown.yaml
@@ -4,12 +4,6 @@ created_at: '2025-01-15T10:00:00Z'
creator_id: [email protected]
display: bar
collection_id: cOlDoCuMeNtS0ExAmPlx2
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- PRODUCTS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/minimal/marketing_analytics/product_overview.yaml b/test_resources/serialization_baseline/collections/main/minimal/marketing_analytics/product_overview.yaml
index 89b9a37382c..cff8110645d 100644
--- a/test_resources/serialization_baseline/collections/main/minimal/marketing_analytics/product_overview.yaml
+++ b/test_resources/serialization_baseline/collections/main/minimal/marketing_analytics/product_overview.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: table
collection_id: M-Q4pcV0qkiyJ0kiSWECl
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- PRODUCTS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/minimal/marketing_analytics/top_products_by_revenue.yaml b/test_resources/serialization_baseline/collections/main/minimal/marketing_analytics/top_products_by_revenue.yaml
index 7f0ea13d010..cd51609c679 100644
--- a/test_resources/serialization_baseline/collections/main/minimal/marketing_analytics/top_products_by_revenue.yaml
+++ b/test_resources/serialization_baseline/collections/main/minimal/marketing_analytics/top_products_by_revenue.yaml
@@ -4,8 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: bar
collection_id: M-Q4pcV0qkiyJ0kiSWECl
-query_type: native
-database_id: Sample Database
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/queries/arithmetic_expressions.yaml b/test_resources/serialization_baseline/collections/main/queries/arithmetic_expressions.yaml
index 7d3aab9d41a..f19107ff4e4 100644
--- a/test_resources/serialization_baseline/collections/main/queries/arithmetic_expressions.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/arithmetic_expressions.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: table
collection_id: cOlQuErIeS0ExAmPlE2x1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/queries/basic_aggregations.yaml b/test_resources/serialization_baseline/collections/main/queries/basic_aggregations.yaml
index 67f979e095b..c8c406500e8 100644
--- a/test_resources/serialization_baseline/collections/main/queries/basic_aggregations.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/basic_aggregations.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: table
collection_id: cOlQuErIeS0ExAmPlE2x1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
parameters: []
parameter_mappings: []
dataset_query:
@@ -67,8 +61,8 @@ dataset_query:
- ORDERS
- PRODUCT_ID
- - sum
- - display-name: Total Revenue
- name: total_revenue
+ - name: total_revenue
+ display-name: Total Revenue
- - field
- base-type: type/Float
- - Sample Database
diff --git a/test_resources/serialization_baseline/collections/main/queries/comparison_filters.yaml b/test_resources/serialization_baseline/collections/main/queries/comparison_filters.yaml
index b396322596d..80ffbeb982d 100644
--- a/test_resources/serialization_baseline/collections/main/queries/comparison_filters.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/comparison_filters.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: table
collection_id: cOlQuErIeS0ExAmPlE2x1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- PRODUCTS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/queries/conditional_aggregations.yaml b/test_resources/serialization_baseline/collections/main/queries/conditional_aggregations.yaml
index 2af59af8991..83df9c86fcd 100644
--- a/test_resources/serialization_baseline/collections/main/queries/conditional_aggregations.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/conditional_aggregations.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: table
collection_id: cOlQuErIeS0ExAmPlE2x1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/queries/conditional_and_type_conversion.yaml b/test_resources/serialization_baseline/collections/main/queries/conditional_and_type_conversion.yaml
index b2744ccc3ef..322710543f6 100644
--- a/test_resources/serialization_baseline/collections/main/queries/conditional_and_type_conversion.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/conditional_and_type_conversion.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: table
collection_id: cOlQuErIeS0ExAmPlE2x1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- PRODUCTS
parameters: []
parameter_mappings: []
dataset_query:
@@ -17,8 +11,8 @@ dataset_query:
stages:
- expressions:
- - case
- - default: Budget
- lib/expression-name: Price Tier
+ - lib/expression-name: Price Tier
+ default: Budget
- - - - '>'
- {}
- - field
@@ -40,8 +34,8 @@ dataset_query:
- 30
- Standard
- - if
- - default: false
- lib/expression-name: Is Premium
+ - lib/expression-name: Is Premium
+ default: false
- - - - '>'
- {}
- - field
diff --git a/test_resources/serialization_baseline/collections/main/queries/cumulative_and_statistical_aggregations.yaml b/test_resources/serialization_baseline/collections/main/queries/cumulative_and_statistical_aggregations.yaml
index 848190a75cf..5e30f74e667 100644
--- a/test_resources/serialization_baseline/collections/main/queries/cumulative_and_statistical_aggregations.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/cumulative_and_statistical_aggregations.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: line
collection_id: cOlQuErIeS0ExAmPlE2x1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/queries/fields_and_expressions.yaml b/test_resources/serialization_baseline/collections/main/queries/fields_and_expressions.yaml
index 67a2c256ca6..a885491d4d2 100644
--- a/test_resources/serialization_baseline/collections/main/queries/fields_and_expressions.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/fields_and_expressions.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: table
collection_id: cOlQuErIeS0ExAmPlE2x1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/queries/geographic_filter__inside_.yaml b/test_resources/serialization_baseline/collections/main/queries/geographic_filter__inside_.yaml
index b1c1759957b..b150f63494d 100644
--- a/test_resources/serialization_baseline/collections/main/queries/geographic_filter__inside_.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/geographic_filter__inside_.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: map
collection_id: cOlQuErIeS0ExAmPlE2x1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- PEOPLE
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/queries/joins___strategies_and_compound_conditions.yaml b/test_resources/serialization_baseline/collections/main/queries/joins___strategies_and_compound_conditions.yaml
index 6539e4fed84..a01453848ea 100644
--- a/test_resources/serialization_baseline/collections/main/queries/joins___strategies_and_compound_conditions.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/joins___strategies_and_compound_conditions.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: table
collection_id: cOlQuErIeS0ExAmPlE2x1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/queries/math_functions.yaml b/test_resources/serialization_baseline/collections/main/queries/math_functions.yaml
index 7ab92edad28..dfc52013a03 100644
--- a/test_resources/serialization_baseline/collections/main/queries/math_functions.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/math_functions.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: table
collection_id: cOlQuErIeS0ExAmPlE2x1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- PRODUCTS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/queries/metric__measure__and_segment_references.yaml b/test_resources/serialization_baseline/collections/main/queries/metric__measure__and_segment_references.yaml
index 8e24c326406..3beff8e003d 100644
--- a/test_resources/serialization_baseline/collections/main/queries/metric__measure__and_segment_references.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/metric__measure__and_segment_references.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: table
collection_id: cOlQuErIeS0ExAmPlE2x1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/queries/native_query___card_and_snippet_references.yaml b/test_resources/serialization_baseline/collections/main/queries/native_query___card_and_snippet_references.yaml
index 8158c41b90b..7f7d18e2442 100644
--- a/test_resources/serialization_baseline/collections/main/queries/native_query___card_and_snippet_references.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/native_query___card_and_snippet_references.yaml
@@ -4,8 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: table
collection_id: cOlQuErIeS0ExAmPlE2x1
-query_type: native
-database_id: Sample Database
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/queries/native_query___field_filter_and_temporal_unit.yaml b/test_resources/serialization_baseline/collections/main/queries/native_query___field_filter_and_temporal_unit.yaml
index 46efd41239e..2efd61d6b59 100644
--- a/test_resources/serialization_baseline/collections/main/queries/native_query___field_filter_and_temporal_unit.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/native_query___field_filter_and_temporal_unit.yaml
@@ -4,8 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: line
collection_id: cOlQuErIeS0ExAmPlE2x1
-query_type: native
-database_id: Sample Database
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/queries/native_query___variables.yaml b/test_resources/serialization_baseline/collections/main/queries/native_query___variables.yaml
index db29bded0cf..09201f93c4d 100644
--- a/test_resources/serialization_baseline/collections/main/queries/native_query___variables.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/native_query___variables.yaml
@@ -4,8 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: table
collection_id: cOlQuErIeS0ExAmPlE2x1
-query_type: native
-database_id: Sample Database
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/queries/nested_query.yaml b/test_resources/serialization_baseline/collections/main/queries/nested_query.yaml
index 1625a198a83..c9daaf97101 100644
--- a/test_resources/serialization_baseline/collections/main/queries/nested_query.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/nested_query.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: table
collection_id: cOlQuErIeS0ExAmPlE2x1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/queries/null__empty__and_string_filters.yaml b/test_resources/serialization_baseline/collections/main/queries/null__empty__and_string_filters.yaml
index dc4455c8d5f..dc29c9f6267 100644
--- a/test_resources/serialization_baseline/collections/main/queries/null__empty__and_string_filters.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/null__empty__and_string_filters.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: table
collection_id: cOlQuErIeS0ExAmPlE2x1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- PRODUCTS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/queries/source_card_reference.yaml b/test_resources/serialization_baseline/collections/main/queries/source_card_reference.yaml
index 22aa80754de..731b1a17928 100644
--- a/test_resources/serialization_baseline/collections/main/queries/source_card_reference.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/source_card_reference.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: table
collection_id: cOlQuErIeS0ExAmPlE2x1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
parameters: []
parameter_mappings: []
dataset_query:
@@ -218,5 +212,4 @@ serdes/meta:
label: source_card_reference
model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
-source_card_id: h5F2EjHsRd73Dqqh8sAtd
type: question
diff --git a/test_resources/serialization_baseline/collections/main/queries/string_functions.yaml b/test_resources/serialization_baseline/collections/main/queries/string_functions.yaml
index 96e45b7c7fa..a39b5a1f17f 100644
--- a/test_resources/serialization_baseline/collections/main/queries/string_functions.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/string_functions.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: table
collection_id: cOlQuErIeS0ExAmPlE2x1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- PRODUCTS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/queries/temporal_and_logical_filters.yaml b/test_resources/serialization_baseline/collections/main/queries/temporal_and_logical_filters.yaml
index 5018dc02355..fe5691078c9 100644
--- a/test_resources/serialization_baseline/collections/main/queries/temporal_and_logical_filters.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/temporal_and_logical_filters.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: table
collection_id: cOlQuErIeS0ExAmPlE2x1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/queries/temporal_expressions.yaml b/test_resources/serialization_baseline/collections/main/queries/temporal_expressions.yaml
index 4a0c348a421..841675e0bcf 100644
--- a/test_resources/serialization_baseline/collections/main/queries/temporal_expressions.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/temporal_expressions.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: table
collection_id: cOlQuErIeS0ExAmPlE2x1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/queries/temporal_extraction.yaml b/test_resources/serialization_baseline/collections/main/queries/temporal_extraction.yaml
index 5f69811546e..07791d5c9d5 100644
--- a/test_resources/serialization_baseline/collections/main/queries/temporal_extraction.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/temporal_extraction.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: table
collection_id: cOlQuErIeS0ExAmPlE2x1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/queries/total_revenue.yaml b/test_resources/serialization_baseline/collections/main/queries/total_revenue.yaml
index 18d44adc766..be6eef23546 100644
--- a/test_resources/serialization_baseline/collections/main/queries/total_revenue.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/total_revenue.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: scalar
collection_id: cOlQuErIeS0ExAmPlE2x1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/queries/url_functions.yaml b/test_resources/serialization_baseline/collections/main/queries/url_functions.yaml
index 7ec4505a708..5eb905b4ab3 100644
--- a/test_resources/serialization_baseline/collections/main/queries/url_functions.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/url_functions.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: table
collection_id: cOlQuErIeS0ExAmPlE2x1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- PEOPLE
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/queries/window_function___offset.yaml b/test_resources/serialization_baseline/collections/main/queries/window_function___offset.yaml
index dc5c1042279..f291a0d404a 100644
--- a/test_resources/serialization_baseline/collections/main/queries/window_function___offset.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/window_function___offset.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: line
collection_id: cOlQuErIeS0ExAmPlE2x1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/source_model.yaml b/test_resources/serialization_baseline/collections/main/source_model.yaml
index 634f62d506b..bec09eb88a7 100644
--- a/test_resources/serialization_baseline/collections/main/source_model.yaml
+++ b/test_resources/serialization_baseline/collections/main/source_model.yaml
@@ -3,12 +3,6 @@ entity_id: sRcMoDeL00ExAmPlEx001
created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: table
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/visualization_settings/customer_locations__map_.yaml b/test_resources/serialization_baseline/collections/main/visualization_settings/customer_locations__map_.yaml
index 61c09687a79..747e74eef9f 100644
--- a/test_resources/serialization_baseline/collections/main/visualization_settings/customer_locations__map_.yaml
+++ b/test_resources/serialization_baseline/collections/main/visualization_settings/customer_locations__map_.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: map
collection_id: cOlViZsEtTiNgS0ExAmP1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- PEOPLE
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/visualization_settings/monthly_revenue_changes__waterfall_.yaml b/test_resources/serialization_baseline/collections/main/visualization_settings/monthly_revenue_changes__waterfall_.yaml
index 7465bb08a30..7f0859ec4e5 100644
--- a/test_resources/serialization_baseline/collections/main/visualization_settings/monthly_revenue_changes__waterfall_.yaml
+++ b/test_resources/serialization_baseline/collections/main/visualization_settings/monthly_revenue_changes__waterfall_.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: waterfall
collection_id: cOlViZsEtTiNgS0ExAmP1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/visualization_settings/orders_by_category__pie_.yaml b/test_resources/serialization_baseline/collections/main/visualization_settings/orders_by_category__pie_.yaml
index 934d79b939a..1ff1a7626da 100644
--- a/test_resources/serialization_baseline/collections/main/visualization_settings/orders_by_category__pie_.yaml
+++ b/test_resources/serialization_baseline/collections/main/visualization_settings/orders_by_category__pie_.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: pie
collection_id: cOlViZsEtTiNgS0ExAmP1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- PRODUCTS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/visualization_settings/orders_by_category__stacked_bar_.yaml b/test_resources/serialization_baseline/collections/main/visualization_settings/orders_by_category__stacked_bar_.yaml
index 73bb2dd9a23..9e5392ae188 100644
--- a/test_resources/serialization_baseline/collections/main/visualization_settings/orders_by_category__stacked_bar_.yaml
+++ b/test_resources/serialization_baseline/collections/main/visualization_settings/orders_by_category__stacked_bar_.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: bar
collection_id: cOlViZsEtTiNgS0ExAmP1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/visualization_settings/orders_pivot_table.yaml b/test_resources/serialization_baseline/collections/main/visualization_settings/orders_pivot_table.yaml
index f1eee0d88bc..b9d5c0af8d4 100644
--- a/test_resources/serialization_baseline/collections/main/visualization_settings/orders_pivot_table.yaml
+++ b/test_resources/serialization_baseline/collections/main/visualization_settings/orders_pivot_table.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: pivot
collection_id: cOlViZsEtTiNgS0ExAmP1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/visualization_settings/products_table__formatted_.yaml b/test_resources/serialization_baseline/collections/main/visualization_settings/products_table__formatted_.yaml
index c99f47a5b7d..02f48ea1e5c 100644
--- a/test_resources/serialization_baseline/collections/main/visualization_settings/products_table__formatted_.yaml
+++ b/test_resources/serialization_baseline/collections/main/visualization_settings/products_table__formatted_.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: table
collection_id: cOlViZsEtTiNgS0ExAmP1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- PRODUCTS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/visualization_settings/revenue_gauge.yaml b/test_resources/serialization_baseline/collections/main/visualization_settings/revenue_gauge.yaml
index 8de72cab9b6..54aa69aff9b 100644
--- a/test_resources/serialization_baseline/collections/main/visualization_settings/revenue_gauge.yaml
+++ b/test_resources/serialization_baseline/collections/main/visualization_settings/revenue_gauge.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: gauge
collection_id: cOlViZsEtTiNgS0ExAmP1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/visualization_settings/revenue_over_time__line_.yaml b/test_resources/serialization_baseline/collections/main/visualization_settings/revenue_over_time__line_.yaml
index 1e67546bd85..f8ec408fe4e 100644
--- a/test_resources/serialization_baseline/collections/main/visualization_settings/revenue_over_time__line_.yaml
+++ b/test_resources/serialization_baseline/collections/main/visualization_settings/revenue_over_time__line_.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: line
collection_id: cOlViZsEtTiNgS0ExAmP1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/visualization_settings/sales_funnel.yaml b/test_resources/serialization_baseline/collections/main/visualization_settings/sales_funnel.yaml
index 1fbb69ce128..fc87ee61cf8 100644
--- a/test_resources/serialization_baseline/collections/main/visualization_settings/sales_funnel.yaml
+++ b/test_resources/serialization_baseline/collections/main/visualization_settings/sales_funnel.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: funnel
collection_id: cOlViZsEtTiNgS0ExAmP1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- PRODUCTS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/collections/main/visualization_settings/total_revenue__smart_scalar_.yaml b/test_resources/serialization_baseline/collections/main/visualization_settings/total_revenue__smart_scalar_.yaml
index 239e64a9f42..46b08f7a040 100644
--- a/test_resources/serialization_baseline/collections/main/visualization_settings/total_revenue__smart_scalar_.yaml
+++ b/test_resources/serialization_baseline/collections/main/visualization_settings/total_revenue__smart_scalar_.yaml
@@ -4,12 +4,6 @@ created_at: '2026-04-02T02:59:02.778668Z'
creator_id: [email protected]
display: smartscalar
collection_id: cOlViZsEtTiNgS0ExAmP1
-query_type: query
-database_id: Sample Database
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
parameters: []
parameter_mappings: []
dataset_query:
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/average_revenue_per_order.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/average_revenue_per_order.yaml
index 0e8d1ea2dc2..8396a51f613 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/average_revenue_per_order.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/average_revenue_per_order.yaml
@@ -21,10 +21,6 @@ definition:
description: Uses Total Revenue and Order Count measures
entity_id: dc8eiyLh9S0IKwV_UuvTz
name: Average Revenue Per Order
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
serdes/meta:
- id: dc8eiyLh9S0IKwV_UuvTz
label: average_revenue_per_order
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/median_order_total.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/median_order_total.yaml
index a88b81aaf3d..54265284673 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/median_order_total.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/median_order_total.yaml
@@ -20,10 +20,6 @@ definition:
lib/type: mbql/query
entity_id: d4G5fMj5smJ17Nd0dvE2A
name: Median Order Total
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
serdes/meta:
- id: d4G5fMj5smJ17Nd0dvE2A
label: median_order_total
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/order_count.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/order_count.yaml
index a36ac131224..90854cc0b28 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/order_count.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/order_count.yaml
@@ -14,10 +14,6 @@ definition:
lib/type: mbql/query
entity_id: DBap2523KuN4Lt-cYrUjF
name: Order Count
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
serdes/meta:
- id: DBap2523KuN4Lt-cYrUjF
label: order_count
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/total_revenue.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/total_revenue.yaml
index 943c605433c..63f504d8181 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/total_revenue.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/total_revenue.yaml
@@ -20,10 +20,6 @@ definition:
lib/type: mbql/query
entity_id: 8WteUpyQQqObrxLv4KQ-j
name: Total Revenue
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
serdes/meta:
- id: 8WteUpyQQqObrxLv4KQ-j
label: total_revenue
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/segments/large_orders.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/segments/large_orders.yaml
index 94ef632c555..3197c894278 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/segments/large_orders.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/segments/large_orders.yaml
@@ -21,10 +21,6 @@ definition:
lib/type: mbql/query
entity_id: OaFXAvEzPvu9ZXW5PUMRa
name: Large Orders
-table_id:
-- Sample Database
-- PUBLIC
-- ORDERS
serdes/meta:
- id: OaFXAvEzPvu9ZXW5PUMRa
label: large_orders
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/segments/nyc_area_people.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/segments/nyc_area_people.yaml
index 3548c53c66b..163a69e42ea 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/segments/nyc_area_people.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/segments/nyc_area_people.yaml
@@ -31,10 +31,6 @@ definition:
description: People located within the NYC bounding box
entity_id: D2R9JpvI8sMfYWqfPsTkx
name: NYC Area People
-table_id:
-- Sample Database
-- PUBLIC
-- PEOPLE
serdes/meta:
- id: D2R9JpvI8sMfYWqfPsTkx
label: nyc_area_people
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/average_product_price.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/average_product_price.yaml
index c0f0fb4211d..5f91fbd0e11 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/average_product_price.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/average_product_price.yaml
@@ -20,10 +20,6 @@ definition:
lib/type: mbql/query
entity_id: xK7mPqR2sT4uVwXyZ9a1b
name: Average Product Price
-table_id:
-- Sample Database
-- PUBLIC
-- PRODUCTS
serdes/meta:
- id: xK7mPqR2sT4uVwXyZ9a1b
label: average_product_price
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/average_product_price_2.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/average_product_price_2.yaml
index e3e71b2acc5..2a12e6be1f0 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/average_product_price_2.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/average_product_price_2.yaml
@@ -20,10 +20,6 @@ definition:
lib/type: mbql/query
entity_id: mSrAvgProdPrice00008x
name: Average Product Price
-table_id:
-- Sample Database
-- PUBLIC
-- PRODUCTS
serdes/meta:
- id: mSrAvgProdPrice00008x
label: average_product_price
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/average_widget_price.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/average_widget_price.yaml
index 50d610a421f..438f115ede4 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/average_widget_price.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/average_widget_price.yaml
@@ -21,10 +21,6 @@ definition:
description: Average price of Widget products — uses Widget Products segment and Average Product Price measure
entity_id: K7cMzOau9SI2h8hCx936w
name: Average Widget Price
-table_id:
-- Sample Database
-- PUBLIC
-- PRODUCTS
serdes/meta:
- id: K7cMzOau9SI2h8hCx936w
label: average_widget_price
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/product_count.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/product_count.yaml
index ec4d593dfb9..5753135109f 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/product_count.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/product_count.yaml
@@ -20,10 +20,6 @@ definition:
lib/type: mbql/query
entity_id: 8kxQ2Wr7PmN5dLf3hYz9v
name: Product Count
-table_id:
-- Sample Database
-- PUBLIC
-- PRODUCTS
serdes/meta:
- id: 8kxQ2Wr7PmN5dLf3hYz9v
label: product_count
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/premium_widgets.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/premium_widgets.yaml
index d6d42e7b567..12aba54d39a 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/premium_widgets.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/premium_widgets.yaml
@@ -25,10 +25,6 @@ definition:
description: Widget products priced above $50 — refines the Widget Products segment
entity_id: 2hxhoN3HrQJIaWc5umpBn
name: Premium Widgets
-table_id:
-- Sample Database
-- PUBLIC
-- PRODUCTS
serdes/meta:
- id: 2hxhoN3HrQJIaWc5umpBn
label: premium_widgets
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/recent_mid_range_products.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/recent_mid_range_products.yaml
index de1e9b27086..cb18bbd257b 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/recent_mid_range_products.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/recent_mid_range_products.yaml
@@ -51,10 +51,6 @@ definition:
description: Products created in last year, priced 20-100, not null rating
entity_id: wdYkSSArR5ymVGa0pvb47
name: Recent Mid-Range Products
-table_id:
-- Sample Database
-- PUBLIC
-- PRODUCTS
serdes/meta:
- id: wdYkSSArR5ymVGa0pvb47
label: recent_mid_range_products
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/searchable_products.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/searchable_products.yaml
index 94e373c6094..4f2593894b2 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/searchable_products.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/searchable_products.yaml
@@ -57,10 +57,6 @@ definition:
description: Products with non-empty title containing "awesome", vendor starting with "A"
entity_id: yZptbJRR3S8L9S9r0ZF8M
name: Searchable Products
-table_id:
-- Sample Database
-- PUBLIC
-- PRODUCTS
serdes/meta:
- id: yZptbJRR3S8L9S9r0ZF8M
label: searchable_products
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/widget_products.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/widget_products.yaml
index bfba5d34bdf..1075d7a3e64 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/widget_products.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/widget_products.yaml
@@ -21,10 +21,6 @@ definition:
lib/type: mbql/query
entity_id: aB3kLmN9pQrStUvWxYz1a
name: Widget Products
-table_id:
-- Sample Database
-- PUBLIC
-- PRODUCTS
serdes/meta:
- id: aB3kLmN9pQrStUvWxYz1a
label: widget_products