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

Merge jTDS, updated PostgreSQL testing to multi-rs

Browse source
This commit is contained in:
Sean Corfield 2020-06-06 17:26:28 -07:00
commit e201abdc1e
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -2,6 +2,12 @@
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!).
* WIP: support for stored procedures and multiple result sets!
## Stable Builds ## Stable Builds
* 2020-05-31 -- 1.0.462 * 2020-05-31 -- 1.0.462

11
test/next/jdbc_test.clj
View file

@ -8,7 +8,7 @@
[next.jdbc.connection :as c] [next.jdbc.connection :as c]
[next.jdbc.test-fixtures :refer [with-test-db db ds column [next.jdbc.test-fixtures :refer [with-test-db db ds column
default-options stored-proc? default-options stored-proc?
derby? mssql? mysql? postgres?]] derby? jtds? mssql? mysql? postgres?]]
[next.jdbc.prepare :as prep] [next.jdbc.prepare :as prep]
[next.jdbc.result-set :as rs] [next.jdbc.result-set :as rs]
[next.jdbc.specs :as specs]) [next.jdbc.specs :as specs])
@ -302,9 +302,11 @@ VALUES ('Pear', 'green', 49, 47)
:else (is (= {} etc))) :else (is (= {} etc)))
(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:"
(condp = (:dbtype (db)) (cond (jtds?)
"mssql" "sqlserver" "jtds:sqlserver"
"jtds" "jtds:sqlserver" (mssql?)
"sqlserver"
:else
(:dbtype (db)))))) (:dbtype (db))))))
;; checks get-datasource on a DataSource is identity ;; checks get-datasource on a DataSource is identity
(is (identical? ds (jdbc/get-datasource ds))) (is (identical? ds (jdbc/get-datasource ds)))
@ -326,7 +328,6 @@ VALUES ('Pear', 'green', 49, 47)
(catch Throwable t (catch Throwable t
(println 'call-proc (:dbtype (db)) (ex-message t) (some-> t (ex-cause) (ex-message)))))))) (println 'call-proc (:dbtype (db)) (ex-message t) (some-> t (ex-cause) (ex-message))))))))
(deftest plan-misuse (deftest plan-misuse
(let [s (pr-str (jdbc/plan (ds) ["select * from fruit"]))] (let [s (pr-str (jdbc/plan (ds) ["select * from fruit"]))]
(is (re-find #"missing reduction" s))) (is (re-find #"missing reduction" s)))