Fixes #67 by updating specs for :jdbcUrl
This commit is contained in:
parent
2d84c881f8
commit
58bdb53f34
2 changed files with 10 additions and 5 deletions
|
|
@ -6,7 +6,7 @@ Only accretive/fixative changes will be made from now on.
|
||||||
|
|
||||||
The following changes have been committed to the **master** branch since the 1.0.8 release:
|
The following changes have been committed to the **master** branch since the 1.0.8 release:
|
||||||
|
|
||||||
* None.
|
* Fix #67 by adding `:jdbcUrl` version spec.
|
||||||
|
|
||||||
## Stable Builds
|
## Stable Builds
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -42,14 +42,19 @@
|
||||||
::host ::port
|
::host ::port
|
||||||
::dbname-separator
|
::dbname-separator
|
||||||
::host-prefix]))
|
::host-prefix]))
|
||||||
|
(s/def ::jdbcUrl string?)
|
||||||
|
(s/def ::jdbc-url-map (s/keys :req-un [::jdbcUrl]))
|
||||||
|
|
||||||
(s/def ::connection #(instance? Connection %))
|
(s/def ::connection #(instance? Connection %))
|
||||||
(s/def ::datasource #(instance? DataSource %))
|
(s/def ::datasource #(instance? DataSource %))
|
||||||
(s/def ::prepared-statement #(instance? PreparedStatement %))
|
(s/def ::prepared-statement #(instance? PreparedStatement %))
|
||||||
|
|
||||||
(s/def ::db-spec (s/or :db-spec ::db-spec-map
|
(s/def ::db-spec (s/or :db-spec ::db-spec-map
|
||||||
|
:jdbc-url ::jdbc-url-map
|
||||||
:string string?
|
:string string?
|
||||||
:ds ::datasource))
|
:ds ::datasource))
|
||||||
|
(s/def ::db-spec-or-jdbc (s/or :db-spec ::db-spec-map
|
||||||
|
:jdbc-url ::jdbc-url-map))
|
||||||
|
|
||||||
(s/def ::connectable any?)
|
(s/def ::connectable any?)
|
||||||
(s/def ::key-map (s/map-of keyword? any?))
|
(s/def ::key-map (s/map-of keyword? any?))
|
||||||
|
|
@ -117,7 +122,7 @@
|
||||||
|
|
||||||
(s/fdef connection/->pool
|
(s/fdef connection/->pool
|
||||||
:args (s/cat :clazz #(instance? Class %)
|
:args (s/cat :clazz #(instance? Class %)
|
||||||
:db-spec ::db-spec-map))
|
:db-spec ::db-spec-or-jdbc))
|
||||||
|
|
||||||
(s/fdef prepare/execute-batch!
|
(s/fdef prepare/execute-batch!
|
||||||
:args (s/cat :ps ::prepared-statement
|
:args (s/cat :ps ::prepared-statement
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue