diff --git a/CHANGELOG.md b/CHANGELOG.md index 40798f9..cbf9161 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ 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 * 2020-05-31 -- 1.0.462 diff --git a/test/next/jdbc_test.clj b/test/next/jdbc_test.clj index 4d601a9..24e4e1c 100644 --- a/test/next/jdbc_test.clj +++ b/test/next/jdbc_test.clj @@ -8,7 +8,7 @@ [next.jdbc.connection :as c] [next.jdbc.test-fixtures :refer [with-test-db db ds column default-options stored-proc? - derby? mssql? mysql? postgres?]] + derby? jtds? mssql? mysql? postgres?]] [next.jdbc.prepare :as prep] [next.jdbc.result-set :as rs] [next.jdbc.specs :as specs]) @@ -302,10 +302,12 @@ VALUES ('Pear', 'green', 49, 47) :else (is (= {} etc))) (is (instance? javax.sql.DataSource ds)) (is (str/index-of (pr-str ds) (str "jdbc:" - (condp = (:dbtype (db)) - "mssql" "sqlserver" - "jtds" "jtds:sqlserver" - (:dbtype (db)))))) + (cond (jtds?) + "jtds:sqlserver" + (mssql?) + "sqlserver" + :else + (:dbtype (db)))))) ;; checks get-datasource on a DataSource is identity (is (identical? ds (jdbc/get-datasource ds))) (with-open [con (jdbc/get-connection ds {})] @@ -326,7 +328,6 @@ VALUES ('Pear', 'green', 49, 47) (catch Throwable t (println 'call-proc (:dbtype (db)) (ex-message t) (some-> t (ex-cause) (ex-message)))))))) - (deftest plan-misuse (let [s (pr-str (jdbc/plan (ds) ["select * from fruit"]))] (is (re-find #"missing reduction" s)))