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
Support DB-local settings in the JVM and JS metadata-providers (#70117)
metambenb1ece80c0d91
diff --git a/src/metabase/lib/js/metadata.cljs b/src/metabase/lib/js/metadata.cljsindex 9afdfc16f70..b44b4ee2b6b 100644--- a/src/metabase/lib/js/metadata.cljs+++ b/src/metabase/lib/js/metadata.cljs@@ -178,6 +178,7 @@:dbms-version (js->clj v :keywordize-keys true):features (into #{} (map keyword) v):native-permissions (keyword v)+ :settings (js->clj v :keywordize-keys true)v)))(defmethod parse-objects-default-key :database@@ -589,7 +590,9 @@(metadatas [_this metadata-spec](metadatas metadata database-id metadata-spec))(setting [_this setting-key]- (setting unparsed-metadata setting-key))+ (get (:settings (database metadata database-id))+ setting-key+ (setting unparsed-metadata setting-key)));; for debugging: call [[clojure.datafy/datafy]] on one of these to parse all of our metadata and see the whole;; thing at once.diff --git a/src/metabase/lib_be/metadata/jvm.clj b/src/metabase/lib_be/metadata/jvm.cljindex 1e4182d15bd..305b968946c 100644--- a/src/metabase/lib_be/metadata/jvm.clj+++ b/src/metabase/lib_be/metadata/jvm.clj@@ -547,7 +547,10 @@(metadatas [_this metadata-spec](metadatas database-id metadata-spec))(setting [_this setting-name]- (setting/get setting-name))+ (if (setting/database-local-values)+ (setting/get setting-name)+ (setting/with-database (database database-id)+ (setting/get setting-name))))pretty/PrettyPrintable(pretty [_this]diff --git a/test/metabase/lib/js/metadata_test.cljs b/test/metabase/lib/js/metadata_test.cljsindex b6182c38913..2fd285d091e 100644--- a/test/metabase/lib/js/metadata_test.cljs+++ b/test/metabase/lib/js/metadata_test.cljs@@ -89,3 +89,14 @@(testing "other lib/source values are handled correctly"(let [column (lib.js.metadata/parse-column #js {"name" "id", "lib/source" "source/table-defaults"})](is (= :source/table-defaults (:lib/source column))))))++(deftest ^:parallel database-local-settings-test+ (testing "JS metadata provider should return database-local Settings over global ones"+ (let [metadata #js {:databases #js {"1" #js {:id 1+ :engine "h2"+ :name "test-db"+ :settings #js {:unaggregated-query-row-limit 1234}}}+ :settings #js {:unaggregated-query-row-limit 2000}}+ mp (lib.js.metadata/metadata-provider 1 metadata)]+ (is (= 1234+ (lib.metadata/setting mp :unaggregated-query-row-limit))))))diff --git a/test/metabase/lib_be/metadata/jvm_test.clj b/test/metabase/lib_be/metadata/jvm_test.cljindex d2ad410271e..b77dd1b606f 100644--- a/test/metabase/lib_be/metadata/jvm_test.clj+++ b/test/metabase/lib_be/metadata/jvm_test.clj@@ -10,6 +10,7 @@[metabase.lib.metadata.invocation-tracker :as lib.metadata.invocation-tracker][metabase.lib.metadata.protocols :as lib.metadata.protocols][metabase.lib.schema.metadata :as lib.schema.metadata]+ [metabase.settings.core :as setting][metabase.test :as mt][metabase.util :as u][metabase.util.malli.registry :as mr]@@ -296,3 +297,12 @@(is (mr/validate ::lib.schema.metadata/column metadata))(is (not (:field-ref metadata))"Legacy keys like :field_ref/:field-ref should have been removed"))))++(deftest ^:parallel database-local-settings-test+ (testing "JVM metadata provider should return database-local Settings"+ (let [global-value (setting/get :unaggregated-query-row-limit)+ local-value (inc (or global-value 0))]+ (mt/with-temp [:model/Database {db-id :id} {:settings {:unaggregated-query-row-limit local-value}}]+ (let [mp (lib.metadata.jvm/application-database-metadata-provider db-id)]+ (is (= local-value+ (lib.metadata/setting mp :unaggregated-query-row-limit))))))))