Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Metabase
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Engineering Digital Service
Metabase
Commits
e62908ef
Unverified
Commit
e62908ef
authored
1 year ago
by
Ngoc Khuat
Committed by
GitHub
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
Define a new persist-models-enabled setting for database. (#32825)
parent
96dc3d79
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/metabase/models/database.clj
+22
-11
22 additions, 11 deletions
src/metabase/models/database.clj
test/metabase/api/database_test.clj
+15
-1
15 additions, 1 deletion
test/metabase/api/database_test.clj
with
37 additions
and
12 deletions
src/metabase/models/database.clj
+
22
−
11
View file @
e62908ef
...
...
@@ -10,10 +10,10 @@
[
metabase.models.permissions-group
:as
perms-group
]
[
metabase.models.secret
:as
secret
:refer
[
Secret
]]
[
metabase.models.serialization
:as
serdes
]
[
metabase.models.setting
:as
setting
]
[
metabase.models.setting
:as
setting
:refer
[
defsetting
]
]
[
metabase.plugins.classloader
:as
classloader
]
[
metabase.util
:as
u
]
[
metabase.util.i18n
:refer
[
trs
]]
[
metabase.util.i18n
:refer
[
deferred-tru
trs
]]
[
metabase.util.log
:as
log
]
[
methodical.core
:as
methodical
]
[
toucan2.core
:as
t2
]
...
...
@@ -247,6 +247,12 @@
[
_database
]
[
:name
:engine
])
(
defsetting
persist-models-enabled
(
deferred-tru
"Whether to enable models persistence for a specific Database."
)
:default
false
:type
:boolean
:visibility
:public
:database-local
:only
)
;;; ---------------------------------------------- Hydration / Util Fns ----------------------------------------------
...
...
@@ -300,15 +306,20 @@
(
sensitive-fields-for-db
db
)))))]
(
update
db
:settings
(
fn
[
settings
]
(
when
(
map?
settings
)
(
into
{}
(
filter
(
fn
[[
setting-name
_v
]]
(
try
(
setting/can-read-setting?
setting-name
(
setting/current-user-readable-visibilities
))
(
catch
Throwable
_e
true
)))
settings
))))))
(
m/filter-keys
(
fn
[
setting-name
]
(
try
(
setting/can-read-setting?
setting-name
(
setting/current-user-readable-visibilities
))
(
catch
Throwable
e
;; there is an known issue with exception is ignored when render API response (#32822)
;; If you see this error, you probably need to define a setting for `setting-name`.
;; But ideally, we should resovle the above issue, and remove this try/catch
(
log/error
e
(
format
"Error checking the readability of %s setting. The setting will be hidden in API response."
setting-name
))
;; let's be conservative and hide it by defaults, if you want to see it,
;; you need to define it :)
false
)))
settings
)))))
json-generator
))
;;; ------------------------------------------------ Serialization ----------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
test/metabase/api/database_test.clj
+
15
−
1
View file @
e62908ef
...
...
@@ -1638,6 +1638,17 @@
(
is
(
=
{
:database-enable-actions
false
}
(
settings
)))))))))
(
deftest
log-an-error-if-contains-undefined-setting-test
(
testing
"should log an error message if database contains undefined settings"
(
t2.with-temp/with-temp
[
Database
{
db-id
:id
}
{
:settings
{
:undefined-setting
true
}}]
(
is
(
=
"Error checking the readability of :undefined-setting setting. The setting will be hidden in API response."
(
->
(
mt/with-log-messages-for-level
:error
(
testing
"does not includes undefined keys by default"
(
is
(
not
(
contains?
(
:settings
(
mt/user-http-request
:crowberto
:get
200
(
str
"database/"
db-id
)))
:undefined-setting
)))))
first
last
))))))
(
deftest
persist-database-test-2
(
mt/test-drivers
(
mt/normal-drivers-with-feature
:persist-models
)
(
mt/dataset
test-data
...
...
@@ -1662,7 +1673,10 @@
:card_id
(
:id
card
))))
(
is
(
true?
(
t2/select-one-fn
(
comp
:persist-models-enabled
:settings
)
Database
:id
db-id
))))
:id
db-id
)))
(
is
(
true?
(
get-in
(
mt/user-http-request
:crowberto
:get
200
(
str
"database/"
db-id
))
[
:settings
:persist-models-enabled
]))))
(
testing
"it's okay to trigger persist even though the database is already persisted"
(
mt/user-http-request
:crowberto
:post
204
(
str
"database/"
db-id
"/persist"
)))))))))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment