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
Fix setting writable and admin db details (#76696)
Alexander Polyankinc446d690c4b7
diff --git a/src/metabase/warehouses_rest/api.clj b/src/metabase/warehouses_rest/api.cljindex 1b9db4625e2..b79b3e79213 100644--- a/src/metabase/warehouses_rest/api.clj+++ b/src/metabase/warehouses_rest/api.clj@@ -1172,8 +1172,6 @@{:name name:engine engine:details details-with-secrets- :write_data_details write-data-details-with-secrets- :admin_details admin-details-with-secrets:refingerprint refingerprint:is_full_sync full-sync?:is_on_demand on-demand?@@ -1184,12 +1182,16 @@:caveats caveats:points_of_interest points_of_interest:auto_run_queries auto_run_queries- :settings (when (seq settings) pending-settings)- :provider_name provider_name}+ :settings (when (seq settings) pending-settings)}:non-nil #{:name :engine :details :refingerprint :is_full_sync :is_on_demand :is_stub- :description :caveats :points_of_interest :auto_run_queries :settings}- :present #{:provider_name :write_data_details :admin_details})- ;; cache_field_values_schedule can be nil+ :description :caveats :points_of_interest :auto_run_queries :settings})+ ;; these fields can be nil+ (when (contains? body :provider_name)+ {:provider_name provider_name})+ (when (contains? body :write_data_details)+ {:write_data_details write-data-details-with-secrets})+ (when (contains? body :admin_details)+ {:admin_details admin-details-with-secrets})(when schedules(sync.schedules/schedule-map->cron-strings schedules)))pending-db (merge existing-database updates)]diff --git a/test/metabase/warehouses_rest/api_test.clj b/test/metabase/warehouses_rest/api_test.cljindex a9de045375c..96ea9d985ba 100644--- a/test/metabase/warehouses_rest/api_test.clj+++ b/test/metabase/warehouses_rest/api_test.clj@@ -3053,6 +3053,24 @@(mt/user-http-request :crowberto :put 402 (format "database/%d" db-id){:admin_details {:host "admin-host"}}))))))+(deftest update-database-preserves-overlay-details-test+ (testing "PUT /api/database/:id without write_data_details/admin_details/provider_name keys"+ (testing "preserves nullable fields instead of nil-ing them out"+ (mt/with-premium-features #{:writable-connection :workspaces}+ (mt/with-temp [:model/Database {db-id :id} {:engine :h2+ :details {:host "localhost"}+ :write_data_details {:host "write-host"}+ :admin_details {:host "admin-host"}+ :provider_name "AWS RDS"}]+ (with-redefs [driver/can-connect? (constantly true)]+ (mt/user-http-request :crowberto :put 200 (format "database/%d" db-id)+ {:name "Renamed DB"})+ (is (=? {:name "Renamed DB"+ :write_data_details {:host "write-host"}+ :admin_details {:host "admin-host"}+ :provider_name "AWS RDS"}+ (t2/select-one :model/Database :id db-id)))))))))+(deftest put-validates-admin-details-connection-test(when config/ee-available?(testing "PUT /api/database/:id returns 400 when admin connection test fails"