luciano/next-jdbc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes #18 by cleaning up connection properties better.

Browse source
This commit is contained in:
Sean Corfield 2019-05-04 23:59:48 -07:00
parent 8d7f1b54da
commit ff94962e27
5 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -1,5 +1,6 @@
# Change Log # Change Log
* 2019-05-04 -- 1.0.0-alpha13 -- Fix #18 by removing more keys from properties when creating connections.
* 2019-04-26 -- 1.0.0-alpha12 -- Fix #17 by renaming `:next.jdbc/sql-string` to `:next.jdbc/sql-params` (**BREAKING CHANGE!**) and pass whole vector. * 2019-04-26 -- 1.0.0-alpha12 -- Fix #17 by renaming `:next.jdbc/sql-string` to `:next.jdbc/sql-params` (**BREAKING CHANGE!**) and pass whole vector.
* 2019-04-24 -- 1.0.0-alpha11 -- Rename `:gen-fn` to `:builder-fn` (**BREAKING CHANGE!**); Fix #13 by adding documentation for `datafy`/`nav`/`:schema`; Fix #15 by automatically adding `:next.jdbc/sql-string` (as of 1.0.0-alpha12: `:next.jdbc/sql-params`) into the options hash map, so custom builders can depend on the SQL string. * 2019-04-24 -- 1.0.0-alpha11 -- Rename `:gen-fn` to `:builder-fn` (**BREAKING CHANGE!**); Fix #13 by adding documentation for `datafy`/`nav`/`:schema`; Fix #15 by automatically adding `:next.jdbc/sql-string` (as of 1.0.0-alpha12: `:next.jdbc/sql-params`) into the options hash map, so custom builders can depend on the SQL string.
* 2019-04-22 -- 1.0.0-alpha9 -- Fix #14 by respecting `:gen-fn` (as of 1.0.0-alpha11: `:builder-fn`) in `execute-one` for `PreparedStatement`. * 2019-04-22 -- 1.0.0-alpha9 -- Fix #14 by respecting `:gen-fn` (as of 1.0.0-alpha11: `:builder-fn`) in `execute-one` for `PreparedStatement`.

2
README.md
View file

@ -8,7 +8,7 @@ The latest versions on Clojars and on cljdoc:
[![Clojars Project](https://clojars.org/seancorfield/next.jdbc/latest-version.svg)](https://clojars.org/seancorfield/next.jdbc) [![cljdoc badge](https://cljdoc.org/badge/seancorfield/next.jdbc)](https://cljdoc.org/d/seancorfield/next.jdbc/CURRENT) [![Clojars Project](https://clojars.org/seancorfield/next.jdbc/latest-version.svg)](https://clojars.org/seancorfield/next.jdbc) [![cljdoc badge](https://cljdoc.org/badge/seancorfield/next.jdbc)](https://cljdoc.org/d/seancorfield/next.jdbc/CURRENT)
This documentation is for 1.0.0-alpha12. This documentation is for 1.0.0-alpha13.
* [Getting Started](/doc/getting-started.md) * [Getting Started](/doc/getting-started.md)
* [Migrating from `clojure.java.jdbc`](/doc/migration-from-clojure-java-jdbc.md) * [Migrating from `clojure.java.jdbc`](/doc/migration-from-clojure-java-jdbc.md)

6
doc/getting-started.md
View file

@ -9,12 +9,12 @@ It is designed to work with Clojure 1.10 or later, supports `datafy`/`nav`, and
You can add `next.jdbc` to your project with either: You can add `next.jdbc` to your project with either:
```clojure ```clojure
{seancorfield/next.jdbc {:mvn/version "1.0.0-alpha12"}} {seancorfield/next.jdbc {:mvn/version "1.0.0-alpha13"}}
``` ```
for `deps.edn` or: for `deps.edn` or:
```clojure ```clojure
[seancorfield/next.jdbc "1.0.0-alpha12"] [seancorfield/next.jdbc "1.0.0-alpha13"]
``` ```
for `project.clj` or `build.boot`. for `project.clj` or `build.boot`.
@ -29,7 +29,7 @@ For the examples in this documentation, we will use a local H2 database on disk,
```clojure ```clojure
;; deps.edn ;; deps.edn
{:deps {org.clojure/clojure {:mvn/version "1.10.0"} {:deps {org.clojure/clojure {:mvn/version "1.10.0"}
seancorfield/next.jdbc {:mvn/version "1.0.0-alpha12"} seancorfield/next.jdbc {:mvn/version "1.0.0-alpha13"}
com.h2database/h2 {:mvn/version "1.4.197"}}} com.h2database/h2 {:mvn/version "1.4.197"}}}
``` ```

2
pom.xml
View file

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>seancorfield</groupId> <groupId>seancorfield</groupId>
<artifactId>next.jdbc</artifactId> <artifactId>next.jdbc</artifactId>
<version>1.0.0-alpha12</version> <version>1.0.0-alpha13</version>
<name>next.jdbc</name> <name>next.jdbc</name>
<description>The next generation of clojure.java.jdbc: a new low-level Clojure wrapper for JDBC-based access to databases.</description> <description>The next generation of clojure.java.jdbc: a new low-level Clojure wrapper for JDBC-based access to databases.</description>

2
src/next/jdbc/connection.clj
View file

@ -104,7 +104,7 @@
host host
(when port (str ":" port)) (when port (str ":" port))
db-sep dbname)) db-sep dbname))
etc (dissoc db-spec :dbtype :dbname)] etc (dissoc db-spec :dbtype :dbname :host :port :classname)]
;; verify the datasource is loadable ;; verify the datasource is loadable
(if-let [class-name (or classname (classnames subprotocol))] (if-let [class-name (or classname (classnames subprotocol))]
(do (do