Skip to content
Snippets Groups Projects
Commit e5a4da61 authored by Allen Gilliland's avatar Allen Gilliland
Browse files

Merge pull request #2058 from xbs13/patch-2

fix typo in config.clj
parents a9215651 5c900e6c
No related branches found
No related tags found
No related merge requests found
......@@ -35,7 +35,7 @@
We resolve properties from these places:
1. environment variables (ex: MB_DB_TYPE -> :mb-db-type)
2. jvm opitons (ex: -Dmb.db.type -> :mb-db-type)
2. jvm options (ex: -Dmb.db.type -> :mb-db-type)
3. hard coded `app-defaults`"
[k]
(let [k (keyword k)]
......
......@@ -153,7 +153,7 @@
(log/info (str "Verify Database Connection ... ✅")))
(defn setup-db
"Do general perparation of database by validating that we can connect.
"Do general preparation 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 is a vector is passed `sel` will return the fields specified by FIELD-KEYS.
Otherwise, if 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
......
......@@ -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)]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment