Fixes #74 by mollifying Eastwood

.gitignore

@@ -5,6 +5,7 @@ pom.xml.asc
 *.jar
 *.class
 /.cpcache
+/.eastwood
 /.lein-*
 /.nrepl-history
 /.nrepl-port

CHANGELOG.md

@@ -7,6 +7,7 @@ Only accretive/fixative changes will be made from now on.
 The following changes have been committed to the **master** branch since the 1.0.9 release:
 
 * Fix link to **All The Options** in **Migration from `clojure.java.jdbc`**. PR #71 (@laurio).
+* Address #74 by making several small changes to satisfy Eastwood.
 * Address #70 by adding **CLOB & BLOB SQL Types** to the **Tips & Tricks** section of **Friendly SQL Functions** and by adding `next.jdbc.result-set/clob-column-reader` and `next.jdbc.result-set/clob->string` helper to make it easier to deal with `CLOB` column data.
 * Clarify what `execute!` and `execute-one!` produce when the result set is empty (`[]` and `nil` respectively, and there are now tests for this). Similarly for `find-by-keys` and `get-by-id`.
 * Add **MS SQL Server** section to **Tips & Tricks** to note that returns an empty string for table names by default (so table-qualified column names are not available). Using the `:result-type` (scroll) and `:concurrency` options will cause table names to be returned.

src/next/jdbc.clj

@@ -232,4 +232,4 @@
   * `:rollback-only` -- `true` / `false`."
   [[sym transactable opts] & body]
   (let [con (vary-meta sym assoc :tag 'java.sql.Connection)]
-   `(transact ~transactable (^{:once true} fn* [~con] ~@body) (or ~opts {}))))
+   `(transact ~transactable (^{:once true} fn* [~con] ~@body) ~(or opts {}))))

src/next/jdbc/connection.clj

@@ -183,9 +183,8 @@
         (if-let [class-name (or classname (-> dbtype dbtypes :classname))]
           (swap! driver-cache update class-name
                  #(if % %
-                    (do
+                    (let [;; force DriverManager to be loaded
-                      ;; force DriverManager to be loaded
+                          _ (DriverManager/getLoginTimeout)]
-                      (DriverManager/getLoginTimeout)
                       (if (string? class-name)
                         (clojure.lang.RT/loadClassForName class-name)
                         (loop [[clazz & more] class-name]

test/next/jdbc/connection_test.clj

@@ -107,8 +107,8 @@
       (let [[url etc] (#'c/spec->url+etc db)
             ds (p/get-datasource (assoc etc :jdbcUrl url))]
         (if (= "derby" (:dbtype db))
-          (is {:create true} etc)
+          (is (= {:create true} etc))
-          (is {} etc))
+          (is (= {} etc)))
         (is (instance? javax.sql.DataSource ds))
         (is (str/index-of (pr-str ds) (str "jdbc:" (:dbtype db))))
         ;; checks get-datasource on a DataSource is identity

test/next/jdbc_test.clj

@@ -194,8 +194,8 @@ VALUES ('Pear', 'green', 49, 47)
       (let [[url etc] (#'c/spec->url+etc (db))
             ds (jdbc/get-datasource (assoc etc :jdbcUrl url))]
         (if (derby?)
-          (is {:create true} etc)
+          (is (= {:create true} etc))
-          (is {} etc))
+          (is (= {} etc)))
         (is (instance? javax.sql.DataSource ds))
         (is (str/index-of (pr-str ds) (str "jdbc:" (:dbtype (db)))))
         ;; checks get-datasource on a DataSource is identity