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
Deref schema model from a protocol not field access (#72588)
dpsuttone16a8d8a0726
diff --git a/enterprise/backend/src/metabase_enterprise/checker/format/serdes.clj b/enterprise/backend/src/metabase_enterprise/checker/format/serdes.cljindex accb84b0378..0845a829640 100644--- a/enterprise/backend/src/metabase_enterprise/checker/format/serdes.clj+++ b/enterprise/backend/src/metabase_enterprise/checker/format/serdes.clj@@ -45,7 +45,8 @@[clojure.java.io :as io][clojure.string :as str][metabase-enterprise.checker.source :as source]- [metabase.util.yaml :as yaml])+ [metabase.util.yaml :as yaml]+ [potemkin.types :as p.types])(:import(java.io File)(java.util Locale)))@@ -425,6 +426,11 @@(for [schema (list-schemas databases-dir db-name->dir db-name)][schema ::not-indexed]))}]))))+(p.types/defprotocol+ ISchemaModelDebug+ "Non exported protocol to get the schema of the SerdesSource. Useful for debugging and asserting on the schema model+ built up during serdes."+ (schema-model [_] "Deref and return the schema model. See [[init-schema-model]] for details of this structure."))+(deftype SerdesSource [databases-dir assets-index db-name->dir;; See init-schema-model for shape documentationschema-model]@@ -524,7 +530,9 @@(resolve-measure [_ entity-id](when-let [file (get-in assets-index [:measure entity-id])]- (load-yaml file))))+ (load-yaml file)))+ ISchemaModelDebug+ (schema-model [_] (deref schema-model)))(defn make-source"Create a MetadataSource for a serdes export directory.diff --git a/enterprise/backend/test/metabase_enterprise/checker/format/serdes_test.clj b/enterprise/backend/test/metabase_enterprise/checker/format/serdes_test.cljindex 36a5de28947..9ff088efa38 100644--- a/enterprise/backend/test/metabase_enterprise/checker/format/serdes_test.clj+++ b/enterprise/backend/test/metabase_enterprise/checker/format/serdes_test.clj@@ -282,19 +282,19 @@(is (=? {"DB" {:db-file string?:schemas {"s1" not-indexed"s2" not-indexed}}}- @(.-schema-model source)))+ (serdes/schema-model source)));; After resolving a table in s1: s1 indexed with tables, s2 untouched(source/resolve-table source ["DB" "s1" "T1"])(is (=? {"DB" {:schemas {"s1" {"T1" {:table-file string?:fields not-indexed}}"s2" not-indexed}}}- @(.-schema-model source)))+ (serdes/schema-model source)));; After resolving fields for T1: T1 fields indexed, s2 still untouched(source/fields-for-table source ["DB" "s1" "T1"])(is (=? {"DB" {:schemas {"s1" {"T1" {:table-file string?:fields {"F1" string?}}}"s2" not-indexed}}}- @(.-schema-model source))))))))+ (serdes/schema-model source))))))))(deftest case-insensitive-schema-resolution-test(testing "schemas with different casing on disk vs YAML resolve correctly"@@ -311,7 +311,7 @@(is (some? (source/resolve-table source ["DB" "PUBLIC" "ORDERS"])))(is (some? (source/resolve-field source ["DB" "PUBLIC" "ORDERS" "ID"])))(is (=? {"DB" {:schemas {"PUBLIC" {"ORDERS" {:fields {"ID" string?}}}}}}- @(.-schema-model source))))))))+ (serdes/schema-model source))))))));;; ===========================================================================;;; Segments and measures — indexed from export dir, NOT schema dir