Skip to content

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

Ensure field insertion order is consistent with `:database-position` (#62491)

Dan Stone83fdbaa65c38
diff --git a/e2e/test/scenarios/admin/datamodel/reproductions.cy.spec.ts b/e2e/test/scenarios/admin/datamodel/reproductions.cy.spec.ts
index b529afe8390..9d60c24ea55 100644
--- a/e2e/test/scenarios/admin/datamodel/reproductions.cy.spec.ts
+++ b/e2e/test/scenarios/admin/datamodel/reproductions.cy.spec.ts
@@ -356,12 +356,12 @@ describe("issues 55617, 55618", () => {
cy.log("field list view (metabase#55617)");
cy.findAllByPlaceholderText("Select a semantic type")
- .eq(8)
+ .eq(6)
.should("have.value", "Discount")
.click();
H.popover().findByText("No semantic type").click();
cy.findAllByPlaceholderText("Select a semantic type")
- .eq(8)
+ .eq(6)
.should("have.value", "No semantic type");
cy.log("field detail view");
diff --git a/e2e/test/scenarios/dashboard-cards/click-behavior.cy.spec.js b/e2e/test/scenarios/dashboard-cards/click-behavior.cy.spec.js
index f3513443ce9..a750cd891b1 100644
--- a/e2e/test/scenarios/dashboard-cards/click-behavior.cy.spec.js
+++ b/e2e/test/scenarios/dashboard-cards/click-behavior.cy.spec.js
@@ -2191,11 +2191,11 @@ describe("scenarios > dashboard > dashboard cards > click behavior", () => {
],
expressions: ["Net"],
filters: [
- "User → Longitude is equal to -80",
- "Net is equal to -80",
- "ID is 7021",
"Reviews - Product → Reviewer is Doohickey",
"Product → Vendor is Doohickey",
+ "User → Longitude is equal to -80",
+ "ID is 7021",
+ "Net is equal to -80",
"Product → Title is Doohickey",
],
aggregations: ["Count", "Sum of Total"],
diff --git a/src/metabase/sync/sync_metadata/fields/sync_instances.clj b/src/metabase/sync/sync_metadata/fields/sync_instances.clj
index 7a733dbcd23..1c8475e4c61 100644
--- a/src/metabase/sync/sync_metadata/fields/sync_instances.clj
+++ b/src/metabase/sync/sync_metadata/fields/sync_instances.clj
@@ -47,7 +47,7 @@
(t2/insert-returning-pks! :model/Field
(for [{:keys [base-type coercion-strategy database-is-auto-increment database-partitioned database-position
database-required database-type effective-type field-comment json-unfolding nfc-path visibility-type]
- field-name :name :as field} new-field-metadatas
+ field-name :name :as field} (sort-by :database-position new-field-metadatas)
:let [semantic-type (common/semantic-type field)
has-field-values (when (sync-util/can-be-list? base-type semantic-type)
:auto-list)]]