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

fix #214

Browse source
This commit is contained in:
Sean Corfield 2022-08-14 11:07:44 -07:00
parent 6ea7150326
commit a1679c33e1
5 changed files with 46 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/test-and-release.yml vendored
View file

@ -9,19 +9,19 @@ jobs:
build-and-release: build-and-release:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
with: with:
fetch-depth: 0 fetch-depth: 0
- uses: actions/setup-java@v2 - uses: actions/setup-java@v3
with: with:
distribution: 'adopt' distribution: 'temurin'
java-version: '11' java-version: '11'
- name: Setup Clojure - name: Setup Clojure
uses: DeLaGuardo/setup-clojure@master uses: DeLaGuardo/setup-clojure@master
with: with:
tools-deps: '1.10.3.1053' tools-deps: '1.11.1.1155'
- name: Cache All The Things - name: Cache All The Things
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: | path: |
~/.m2/repository ~/.m2/repository

26
.github/workflows/test-and-snapshot.yml vendored
View file

@ -9,17 +9,17 @@ jobs:
build-and-snapshot: build-and-snapshot:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- uses: actions/setup-java@v2 - uses: actions/setup-java@v3
with: with:
distribution: 'adopt' distribution: 'temurin'
java-version: '11' java-version: '11'
- name: Setup Clojure - name: Setup Clojure
uses: DeLaGuardo/setup-clojure@master uses: DeLaGuardo/setup-clojure@master
with: with:
tools-deps: '1.10.3.1053' tools-deps: '1.11.1.1155'
- name: Cache All The Things - name: Cache All The Things
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: | path: |
~/.m2/repository ~/.m2/repository
@ -56,17 +56,17 @@ jobs:
matrix: matrix:
java: [ '8', '14', '17' ] java: [ '8', '14', '17' ]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- uses: actions/setup-java@v2 - uses: actions/setup-java@v3
with: with:
distribution: 'adopt' distribution: 'temurin'
java-version: ${{ matrix.java }} java-version: ${{ matrix.java }}
- name: Setup Clojure - name: Setup Clojure
uses: DeLaGuardo/setup-clojure@master uses: DeLaGuardo/setup-clojure@master
with: with:
tools-deps: '1.10.3.1053' tools-deps: '1.11.1.1155'
- name: Cache All The Things - name: Cache All The Things
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: | path: |
~/.m2/repository ~/.m2/repository
@ -84,7 +84,7 @@ jobs:
graalvm: [ '21.1.0' ] graalvm: [ '21.1.0' ]
base: [ 'java11', 'java16' ] base: [ 'java11', 'java16' ]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Setup GraalVM - name: Setup GraalVM
uses: DeLaGuardo/setup-graalvm@5.0 uses: DeLaGuardo/setup-graalvm@5.0
with: with:
@ -93,9 +93,9 @@ jobs:
- name: Setup Clojure - name: Setup Clojure
uses: DeLaGuardo/setup-clojure@master uses: DeLaGuardo/setup-clojure@master
with: with:
tools-deps: '1.10.3.1053' tools-deps: '1.11.1.1155'
- name: Cache All The Things - name: Cache All The Things
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: | path: |
~/.m2/repository ~/.m2/repository

16
.github/workflows/test.yml vendored
View file

@ -9,17 +9,17 @@ jobs:
matrix: matrix:
java: [ '8', '11', '14', '17', '18' ] java: [ '8', '11', '14', '17', '18' ]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- uses: actions/setup-java@v2 - uses: actions/setup-java@v3
with: with:
distribution: 'adopt' distribution: 'temurin'
java-version: ${{ matrix.java }} java-version: ${{ matrix.java }}
- name: Setup Clojure - name: Setup Clojure
uses: DeLaGuardo/setup-clojure@master uses: DeLaGuardo/setup-clojure@master
with: with:
tools-deps: '1.10.3.1053' tools-deps: '1.11.1.1155'
- name: Cache All The Things - name: Cache All The Things
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: | path: |
~/.m2/repository ~/.m2/repository
@ -52,7 +52,7 @@ jobs:
graalvm: [ '21.1.0' ] graalvm: [ '21.1.0' ]
base: [ 'java11', 'java16' ] base: [ 'java11', 'java16' ]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Setup GraalVM - name: Setup GraalVM
uses: DeLaGuardo/setup-graalvm@5.0 uses: DeLaGuardo/setup-graalvm@5.0
with: with:
@ -61,9 +61,9 @@ jobs:
- name: Setup Clojure - name: Setup Clojure
uses: DeLaGuardo/setup-clojure@master uses: DeLaGuardo/setup-clojure@master
with: with:
tools-deps: '1.10.3.1053' tools-deps: '1.11.1.1155'
- name: Cache All The Things - name: Cache All The Things
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: | path: |
~/.m2/repository ~/.m2/repository

1
CHANGELOG.md
View file

@ -3,6 +3,7 @@
Only accretive/fixative changes will be made from now on. Only accretive/fixative changes will be made from now on.
* 1.2.next in progress * 1.2.next in progress
* Address [#214](https://github.com/seancorfield/next-jdbc/issues/214) by updating test/CI versions.
* Address [#212](https://github.com/seancorfield/next-jdbc/issues/212) by documenting the problem with SQLite's JDBC driver. * Address [#212](https://github.com/seancorfield/next-jdbc/issues/212) by documenting the problem with SQLite's JDBC driver.
* Fix [#211](https://github.com/seancorfield/next-jdbc/issues/211) by auto-creating `clojure_test` DB in MySQL if needed; also streamline the CI processes. * Fix [#211](https://github.com/seancorfield/next-jdbc/issues/211) by auto-creating `clojure_test` DB in MySQL if needed; also streamline the CI processes.
* Fix [#210](https://github.com/seancorfield/next-jdbc/issues/210) by updating CI to test against MySQL and SQL Server. * Fix [#210](https://github.com/seancorfield/next-jdbc/issues/210) by updating CI to test against MySQL and SQL Server.

38
deps.edn
View file

@ -1,28 +1,28 @@
{:mvn/repos {"sonatype" {:url "https://oss.sonatype.org/content/repositories/snapshots/"}} {:mvn/repos {"sonatype" {:url "https://oss.sonatype.org/content/repositories/snapshots/"}}
:paths ["src" "resources"] :paths ["src" "resources"]
:deps {org.clojure/clojure {:mvn/version "1.10.3"} :deps {org.clojure/clojure {:mvn/version "1.11.1"}
org.clojure/java.data {:mvn/version "1.0.95"} org.clojure/java.data {:mvn/version "1.0.95"}
camel-snake-kebab/camel-snake-kebab {:mvn/version "0.4.2"}} camel-snake-kebab/camel-snake-kebab {:mvn/version "0.4.3"}}
:aliases :aliases
{;; for help: clojure -A:deps -T:build help/doc {;; for help: clojure -A:deps -T:build help/doc
:build {:deps {io.github.seancorfield/build-clj :build {:deps {io.github.seancorfield/build-clj
{:git/tag "v0.8.0" :git/sha "9bd8b8a"}} {:git/tag "v0.8.3" :git/sha "7ac1f8d"}}
:ns-default build} :ns-default build}
;; versions to test against: ;; versions to test against:
:1.10 {:override-deps {org.clojure/clojure {:mvn/version "1.10.3"}}} :1.10 {:override-deps {org.clojure/clojure {:mvn/version "1.10.3"}}}
:1.11 {:override-deps {org.clojure/clojure {:mvn/version "1.11.0"}}} :1.11 {:override-deps {org.clojure/clojure {:mvn/version "1.11.1"}}}
:master {:override-deps {org.clojure/clojure {:mvn/version "1.12.0-master-SNAPSHOT"}}} :master {:override-deps {org.clojure/clojure {:mvn/version "1.12.0-master-SNAPSHOT"}}}
;; running tests/checks of various kinds: ;; running tests/checks of various kinds:
:test {:extra-paths ["test"] ; can also run clojure -X:test :test {:extra-paths ["test"] ; can also run clojure -X:test
:extra-deps {org.clojure/test.check {:mvn/version "1.1.1"} :extra-deps {org.clojure/test.check {:mvn/version "1.1.1"}
io.github.cognitect-labs/test-runner io.github.cognitect-labs/test-runner
{:git/tag "v0.5.0" :git/sha "48c3c67"} {:git/tag "v0.5.1" :git/sha "dfb30dd"}
;; connection pooling ;; connection pooling
;; 5.0.0 is not compatible with JDK 8: ;; 5.0.0 is not compatible with JDK 8:
com.zaxxer/HikariCP {:mvn/version "3.4.2"} com.zaxxer/HikariCP {:mvn/version "5.0.1"}
com.mchange/c3p0 {:mvn/version "0.9.5.5"} com.mchange/c3p0 {:mvn/version "0.9.5.5"}
;; JDBC drivers ;; JDBC drivers
;; compatible with JDK8+: ;; compatible with JDK8+:
@ -34,23 +34,23 @@
org.hsqldb/hsqldb {:mvn/version "2.5.0"} org.hsqldb/hsqldb {:mvn/version "2.5.0"}
com.h2database/h2 {:mvn/version "1.4.200"} com.h2database/h2 {:mvn/version "1.4.200"}
net.sourceforge.jtds/jtds {:mvn/version "1.3.1"} net.sourceforge.jtds/jtds {:mvn/version "1.3.1"}
org.mariadb.jdbc/mariadb-java-client {:mvn/version "2.7.4"} org.mariadb.jdbc/mariadb-java-client {:mvn/version "3.0.7"}
mysql/mysql-connector-java {:mvn/version "8.0.27"} mysql/mysql-connector-java {:mvn/version "8.0.30"}
org.postgresql/postgresql {:mvn/version "42.3.1"} org.postgresql/postgresql {:mvn/version "42.4.1"}
io.zonky.test/embedded-postgres {:mvn/version "1.3.1"} io.zonky.test/embedded-postgres {:mvn/version "2.0.0"}
;; 14.1.0 doesn't spin up fast enough: tests timeout at startup after 10s ;; 14.1.0 doesn't spin up fast enough: tests timeout at startup after 10s
io.zonky.test.postgres/embedded-postgres-binaries-darwin-amd64 {:mvn/version "13.4.0"} io.zonky.test.postgres/embedded-postgres-binaries-darwin-amd64 {:mvn/version "14.4.0"}
io.zonky.test.postgres/embedded-postgres-binaries-linux-amd64 {:mvn/version "13.4.0"} io.zonky.test.postgres/embedded-postgres-binaries-linux-amd64 {:mvn/version "14.4.0"}
io.zonky.test.postgres/embedded-postgres-binaries-windows-amd64 {:mvn/version "13.4.0"} io.zonky.test.postgres/embedded-postgres-binaries-windows-amd64 {:mvn/version "14.4.0"}
org.xerial/sqlite-jdbc {:mvn/version "3.36.0.3"} org.xerial/sqlite-jdbc {:mvn/version "3.39.2.0"}
com.microsoft.sqlserver/mssql-jdbc {:mvn/version "9.4.1.jre8"} com.microsoft.sqlserver/mssql-jdbc {:mvn/version "9.4.1.jre8"}
;; supplementary test stuff ;; supplementary test stuff
;; use log4j 2.x: ;; use log4j 2.x:
org.apache.logging.log4j/log4j-api {:mvn/version "2.17.1"} org.apache.logging.log4j/log4j-api {:mvn/version "2.18.0"}
;; bridge into log4j: ;; bridge into log4j:
org.apache.logging.log4j/log4j-1.2-api {:mvn/version "2.17.1"} org.apache.logging.log4j/log4j-1.2-api {:mvn/version "2.18.0"}
org.apache.logging.log4j/log4j-jcl {:mvn/version "2.17.1"} org.apache.logging.log4j/log4j-jcl {:mvn/version "2.18.0"}
org.apache.logging.log4j/log4j-jul {:mvn/version "2.17.1"} org.apache.logging.log4j/log4j-jul {:mvn/version "2.18.0"}
org.apache.logging.log4j/log4j-slf4j-impl {:mvn/version "2.17.1"}} org.apache.logging.log4j/log4j-slf4j-impl {:mvn/version "2.18.0"}}
:jvm-opts ["-Dlog4j2.configurationFile=log4j2-info.properties"] :jvm-opts ["-Dlog4j2.configurationFile=log4j2-info.properties"]
:exec-fn cognitect.test-runner.api/test}}} :exec-fn cognitect.test-runner.api/test}}}