Skip to content

Commit

Permalink
Merge branch 'master' of github.com:seancorfield/next-jdbc
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
  • Loading branch information
seancorfield committed Jul 24, 2019
2 parents fef00c6 + e6cf695 commit 6bc7164
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 11 deletions.
11 changes: 7 additions & 4 deletions CHANGELOG.md
Expand Up @@ -4,14 +4,17 @@ Only accretive/fixative changes will be made from now on.

## Unreleased Changes

The following changes have been committed to the **master** branch since the 1.0.2 release:
The following changes have been committed to the **master** branch since the 1.0.3 release:

* Fix #48 by adding `next.jdbc.connection/->pool` and documenting how to use HikariCP and c3p0 in the Getting Started docs (as well as adding tests for both libraries).
* More documentation updates, including examples of extending the `SettableParameter` and `ReadableColumn` protocols.
* Updated test dependencies (testing against more recent versions of several drivers).
* None.

## Stable Builds

* 2019-07-23 -- 1.0.3
* Fix #48 by adding `next.jdbc.connection/->pool` and documenting how to use HikariCP and c3p0 in the Getting Started docs (as well as adding tests for both libraries).
* Documentation improvements, including examples of extending `ReadableColumn` and `SettableParameter`.
* Updated test dependencies (testing against more recent versions of several drivers).

* 2019-07-15 -- 1.0.2
* Fix #47 by refactoring database specs to be a single hash map instead of pouring multiple maps into one.
* Fix #46 by allowing `:host` to be `:none` which tells `next.jdbc` to omit the host/port section of the JDBC URL, so that local databases can be used with `:dbtype`/`:classname` for database types that `next.jdbc` does not know. Also added `:dbname-separator` and `:host-prefix` to the "db-spec" to allow fine-grained control over how the JDBC URL is assembled.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -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)

This documentation is for **master** after the 1.0.2 release -- [see the CHANGELOG](CHANGELOG.md).
This documentation is for the 1.0.3 release -- [see the CHANGELOG](CHANGELOG.md).

* [Getting Started](/doc/getting-started.md)
* [Migrating from `clojure.java.jdbc`](/doc/migration-from-clojure-java-jdbc.md)
Expand Down
8 changes: 4 additions & 4 deletions doc/getting-started.md
Expand Up @@ -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:

```clojure
{seancorfield/next.jdbc {:mvn/version "1.0.2"}}
{seancorfield/next.jdbc {:mvn/version "1.0.3"}}
```
for `deps.edn` or:

```clojure
[seancorfield/next.jdbc "1.0.2"]
[seancorfield/next.jdbc "1.0.3"]
```
for `project.clj` or `build.boot`.

Expand All @@ -29,8 +29,8 @@ For the examples in this documentation, we will use a local H2 database on disk,
```clojure
;; deps.edn
{:deps {org.clojure/clojure {:mvn/version "1.10.1"}
seancorfield/next.jdbc {:mvn/version "1.0.2"}
com.h2database/h2 {:mvn/version "1.4.197"}}}
seancorfield/next.jdbc {:mvn/version "1.0.3"}
com.h2database/h2 {:mvn/version "1.4.199"}}}
```

### Create & Populate a Database
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>seancorfield</groupId>
<artifactId>next.jdbc</artifactId>
<version>1.0.2</version>
<version>1.0.3</version>
<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>
Expand All @@ -25,7 +25,7 @@
<url>https://github.com/seancorfield/next-jdbc</url>
<connection>scm:git:git://github.com/seancorfield/next-jdbc.git</connection>
<developerConnection>scm:git:ssh://git@github.com/seancorfield/next-jdbc.git</developerConnection>
<tag>8e4ef3033cb314cc1641097e111cf62c88ade29d</tag>
<tag>9e8477bd4bd58683b08c13861ed025dc0cfae772</tag>
</scm>

<dependencies>
Expand Down

0 comments on commit 6bc7164

Please sign in to comment.