The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
When tables are created in a batch, assign IDs deterministically (#75365)
Ben Grabow5b2a4365f1fe
diff --git a/e2e/support/cypress_data.js b/e2e/support/cypress_data.jsindex 2c52902bcc2..bb149a4afcb 100644--- a/e2e/support/cypress_data.js+++ b/e2e/support/cypress_data.js@@ -26,16 +26,15 @@ export const SAMPLE_DB_SCHEMA_ID = "1:PUBLIC";// The ids of these tables are determined by our sync processes, especially the result of (metabase.driver.sql-jdbc.sync.describe-database/describe-database)// so any changes that affect the order of the tables returned by that function will change the ids of these tables. A common case is when adding a new key to table metadataexport const SAMPLE_DB_TABLES = {- // old tables- STATIC_PRODUCTS_ID: 7,- STATIC_ORDERS_ID: 1,- STATIC_PEOPLE_ID: 2,- STATIC_REVIEWS_ID: 5,- // new tables- STATIC_ACCOUNTS_ID: 8,- STATIC_ANALYTIC_EVENTS_ID: 4,+ // Sync assigns ids sorted by [schema, name], so these are alphabetical by table name.+ STATIC_ACCOUNTS_ID: 1,+ STATIC_ANALYTIC_EVENTS_ID: 2,STATIC_FEEDBACK_ID: 3,- STATIC_INVOICES_ID: 6,+ STATIC_INVOICES_ID: 4,+ STATIC_ORDERS_ID: 5,+ STATIC_PEOPLE_ID: 6,+ STATIC_PRODUCTS_ID: 7,+ STATIC_REVIEWS_ID: 8,};// All users and admin groups are the defaults that come with Metabase.diff --git a/e2e/test/scenarios/admin/datamodel/segments.cy.spec.ts b/e2e/test/scenarios/admin/datamodel/segments.cy.spec.tsindex a8055a04b38..926ae0e5cae 100644--- a/e2e/test/scenarios/admin/datamodel/segments.cy.spec.ts+++ b/e2e/test/scenarios/admin/datamodel/segments.cy.spec.ts@@ -46,7 +46,7 @@ describe("scenarios > admin > datamodel > segments", () => {it("should track segment_created event when saving a new segment", () => {cy.intercept("POST", "/api/segment").as("createSegment");- cy.intercept("GET", "/api/table/1").as("getTable");+ cy.intercept("GET", `/api/table/${ORDERS_ID}`).as("getTable");cy.visit("/admin/datamodel/segments");cy.button("New segment").click();diff --git a/e2e/test/scenarios/dashboard-cards/click-behavior.cy.spec.js b/e2e/test/scenarios/dashboard-cards/click-behavior.cy.spec.jsindex 30940995715..4e094b0fd44 100644--- a/e2e/test/scenarios/dashboard-cards/click-behavior.cy.spec.js+++ b/e2e/test/scenarios/dashboard-cards/click-behavior.cy.spec.js@@ -2188,12 +2188,12 @@ describe("scenarios > dashboard > dashboard cards > click behavior", () => {],expressions: ["Net"],filters: [+ "Product → Title is Doohickey","Reviews - Product → Reviewer is Doohickey","Product → Vendor is Doohickey",- "User → Longitude is equal to -80","ID is 7021",+ "User → Longitude is equal to -80","Net is equal to -80",- "Product → Title is Doohickey",],aggregations: ["Count", "Sum of Total"],breakouts: [diff --git a/e2e/test/scenarios/data-studio/transforms/transforms.cy.spec.ts b/e2e/test/scenarios/data-studio/transforms/transforms.cy.spec.tsindex f93c255c6c0..c216f5dee7c 100644--- a/e2e/test/scenarios/data-studio/transforms/transforms.cy.spec.ts+++ b/e2e/test/scenarios/data-studio/transforms/transforms.cy.spec.ts@@ -362,10 +362,10 @@ describe("scenarios > admin > transforms", { tags: ["@external"] }, () => {it("should be possible to convert an MBQL transform to a SQL transform", () => {const EXPECTED_QUERY = `SELECT- "Schema Q"."Animals"."name" AS "name",- "Schema Q"."Animals"."score" AS "score"+ "Schema A"."Animals"."name" AS "name",+ "Schema A"."Animals"."score" AS "score"FROM- "Schema Q"."Animals"+ "Schema A"."Animals"LIMIT5`;diff --git a/src/metabase/sync/sync_metadata/tables.clj b/src/metabase/sync/sync_metadata/tables.cljindex d043d2fa4fa..2dda79f08ec 100644--- a/src/metabase/sync/sync_metadata/tables.clj+++ b/src/metabase/sync/sync_metadata/tables.clj@@ -178,7 +178,7 @@(doseq [table-metadata new-table-metadatas](log/info "Found new table:"(sync-util/name-for-logging (mi/instance :model/Table table-metadata))))- (doseq [table-metadata new-table-metadatas]+ (doseq [table-metadata (sort-by (juxt :schema :name) new-table-metadatas)](create-or-reactivate-table! database table-metadata)))(mu/defn- retire-tables!diff --git a/test/metabase/queries_rest/api/card_test.clj b/test/metabase/queries_rest/api/card_test.cljindex 02d9f799dc7..3ceabf56cec 100644--- a/test/metabase/queries_rest/api/card_test.clj+++ b/test/metabase/queries_rest/api/card_test.clj@@ -2852,7 +2852,7 @@(is (verified? card))(is (=? {:dataset_query {:stages [{:source-table pos-int?}]}}card))- (update-card card (update-in card [:dataset_query :stages 0 :source-table] inc))+ (update-card card (assoc-in card [:dataset_query :stages 0 :source-table] (mt/id :checkins)))(is (not (verified? card)))(testing "The unverification edit has explanatory text"(is (= "Unverified due to edit"diff --git a/test/metabase/sync/sync_metadata/tables_test.clj b/test/metabase/sync/sync_metadata/tables_test.cljindex 5a7116471f1..1442d9db9cb 100644--- a/test/metabase/sync/sync_metadata/tables_test.clj+++ b/test/metabase/sync/sync_metadata/tables_test.clj@@ -355,6 +355,19 @@(is (= 999(t2/select-one-fn :estimated_row_count :model/Table (:id tbl)))))))))+(deftest create-or-reactivate-tables-deterministic-id-order-test+ (testing "new tables are inserted sorted by [schema name] so auto-increment ids are assigned deterministically"+ (let [metadatas #{{:schema "public" :name "zebra"}+ {:schema "alpha" :name "beta"}+ {:schema "public" :name "apple"}+ {:schema "public" :name "mango"}}]+ (mt/with-temp [:model/Database db {}]+ (#'sync-tables/create-or-reactivate-tables! db metadatas)+ (is (= ["beta" "apple" "mango" "zebra"]+ (map :name (t2/select [:model/Table :name]+ :db_id (u/the-id db)+ {:order-by [[:id :asc]]}))))))))+(deftest sample-database-tables-data-authority-test(testing "Tables from sample databases should be marked as :ingested"(mt/with-temp [:model/Database sample-db {:is_sample true}