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
e5a4da61
Commit
e5a4da61
authored
9 years ago
by
Allen Gilliland
Browse files
Options
Downloads
Plain Diff
Merge pull request #2058 from xbs13/patch-2
fix typo in config.clj
parents
a9215651
5c900e6c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/metabase/config.clj
+1
-1
1 addition, 1 deletion
src/metabase/config.clj
src/metabase/db.clj
+3
-3
3 additions, 3 deletions
src/metabase/db.clj
src/metabase/events.clj
+1
-1
1 addition, 1 deletion
src/metabase/events.clj
with
5 additions
and
5 deletions
src/metabase/config.clj
+
1
−
1
View file @
e5a4da61
...
...
@@ -35,7 +35,7 @@
We resolve properties from these places:
1. environment variables (ex: MB_DB_TYPE -> :mb-db-type)
2. jvm op
i
tons (ex: -Dmb.db.type -> :mb-db-type)
2. jvm opt
i
ons (ex: -Dmb.db.type -> :mb-db-type)
3. hard coded `app-defaults`"
[
k
]
(
let
[
k
(
keyword
k
)]
...
...
This diff is collapsed.
Click to expand it.
src/metabase/db.clj
+
3
−
3
View file @
e5a4da61
...
...
@@ -153,7 +153,7 @@
(
log/info
(
str
"Verify Database Connection ... ✅"
)))
(
defn
setup-db
"Do general p
e
rparation of database by validating that we can connect.
"Do general pr
e
paration of database by validating that we can connect.
Caller can specify if we should run any pending database migrations."
[
&
{
:keys
[
db-details
auto-migrate
]
:or
{
db-details
@
db-connection-details
...
...
@@ -288,7 +288,7 @@
ENTITY may be either an entity like `User` or a vector like `[entity & field-keys]`.
If just an entity is passed, `sel` will return `default-fields` for ENTITY.
Otherwise i
s
a vector is passed `sel` will return the fields specified by FIELD-KEYS.
Otherwise
,
i
f
a vector is passed `sel` will return the fields specified by FIELD-KEYS.
(sel :many [OrgPerm :admin :id] :user_id 1) -> return admin and id of OrgPerms whose user_id is 1
...
...
@@ -321,7 +321,7 @@
"Wrapper around `korma.core/insert` that renames the `:scope_identity()` keyword in output to `:id`
and automatically passes &rest KWARGS to `korma.core/values`.
Returns newly created object by calling `sel`."
Returns
a
newly created object by calling `sel`."
[
entity
&
{
:as
kwargs
}]
(
let
[
vals
(
models/do-pre-insert
entity
kwargs
)
;; take database-specific keys returned from a jdbc insert and map them to :id
...
...
This diff is collapsed.
Click to expand it.
src/metabase/events.clj
+
1
−
1
View file @
e5a4da61
...
...
@@ -76,7 +76,7 @@
channel
)
(
defn
subscribe-to-topics
"Convenience method for subscribing to series of topics against a single channel."
"Convenience method for subscribing to
a
series of topics against a single channel."
[
topics
channel
]
{
:pre
[(
coll?
topics
)]}
(
loop
[[
topic
&
rest
]
(
vec
topics
)]
...
...
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