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

jTDS support; PostgreSQL 12.2.0 support

Browse source
This commit is contained in:
Sean Corfield 2020-06-06 17:16:17 -07:00
parent 5e98c828a5
commit 6167440500
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -2,6 +2,11 @@
Only accretive/fixative changes will be made from now on. Only accretive/fixative changes will be made from now on.
Changes made on master since 1.0.462:
* Add tests for `"jtds"` database driver (against MS SQL Server), making it officially supported.
* Switch from OpenTable Embedded PostgreSQL to Zonky's version, so that testing can move forward from PostgreSQL 10.11 to 12.2.0.
* Add log4j2 as a test dependency so that I have better control over logging (which makes debugging easier!).
## Stable Builds ## Stable Builds
* 2020-05-31 -- 1.0.462 * 2020-05-31 -- 1.0.462

12
test/next/jdbc/test_fixtures.clj
View file

@ -5,7 +5,7 @@
(:require [clojure.string :as str] (:require [clojure.string :as str]
[next.jdbc :as jdbc] [next.jdbc :as jdbc]
[next.jdbc.sql :as sql]) [next.jdbc.sql :as sql])
(:import (com.opentable.db.postgres.embedded EmbeddedPostgres))) (:import (io.zonky.test.db.postgres.embedded EmbeddedPostgres)))
(set! *warn-on-reflection* true) (set! *warn-on-reflection* true)
@ -39,10 +39,16 @@
(def ^:private test-mssql (def ^:private test-mssql
(when (System/getenv "NEXT_JDBC_TEST_MSSQL") test-mssql-map)) (when (System/getenv "NEXT_JDBC_TEST_MSSQL") test-mssql-map))
(def ^:private test-jtds-map
{:dbtype "jtds" :dbname "model"
:user "sa" :password (System/getenv "MSSQL_SA_PASSWORD")})
(def ^:private test-jtds
(when (System/getenv "NEXT_JDBC_TEST_MSSQL") test-jtds-map))
(def ^:private test-db-specs (def ^:private test-db-specs
(cond-> [test-derby test-h2-mem test-h2 test-hsql test-sqlite test-postgres] (cond-> [test-derby test-h2-mem test-h2 test-hsql test-sqlite test-postgres]
test-mysql (conj test-mysql) test-mysql (conj test-mysql)
test-mssql (conj test-mssql))) test-mssql (conj test-mssql test-jtds)))
(def ^:private test-db-spec (atom nil)) (def ^:private test-db-spec (atom nil))
@ -52,7 +58,7 @@
(defn maria? [] (= "mariadb" (:dbtype @test-db-spec))) (defn maria? [] (= "mariadb" (:dbtype @test-db-spec)))
(defn mssql? [] (= "mssql" (:dbtype @test-db-spec))) (defn mssql? [] (#{"jtds" "mssql"} (:dbtype @test-db-spec)))
(defn mysql? [] (#{"mariadb" "mysql"} (:dbtype @test-db-spec))) (defn mysql? [] (#{"mariadb" "mysql"} (:dbtype @test-db-spec)))

2
test/next/jdbc_test.clj
View file

@ -303,7 +303,7 @@ VALUES ('Pear', 'green', 49, 47)
(is (instance? javax.sql.DataSource ds)) (is (instance? javax.sql.DataSource ds))
(is (str/index-of (pr-str ds) (str "jdbc:" (is (str/index-of (pr-str ds) (str "jdbc:"
(cond (jtds?) (cond (jtds?)
"jtds:server" "jtds:sqlserver"
(mssql?) (mssql?)
"sqlserver" "sqlserver"
:else :else