Fix JDBC-176

Author: seancorfield

CHANGES.md

@@ -1,5 +1,6 @@
 Changes coming in 0.7.9
 
+* Fix behavior of multi-inserts when database does not support generated keys [JDBC-176](https://dev.clojure.org/jira/browse/JDBC-176).
 * Support Oracle SID style URLs (`dbtype` can be `oracle:sid` which maps to `oracle:thin` and uses `:` as the separator before the `dbname` value) [JDBC-173](https://dev.clojure.org/jira/browse/JDBC-173).
 
 Changes in 0.7.8

deps.edn

@@ -20,7 +20,8 @@
            :1.7 {:override-deps {org.clojure/clojure {:mvn/version "1.7.0"}}}
            :1.8 {:override-deps {org.clojure/clojure {:mvn/version "1.8.0"}}}
            :1.9 {:override-deps {org.clojure/clojure {:mvn/version "1.9.0"}}}
-           :master {:override-deps {org.clojure/clojure {:mvn/version "1.10.0-master-SNAPSHOT"}}}
+           :1.10 {:override-deps {org.clojure/clojure {:mvn/version "1.10.0"}}}
+           :master {:override-deps {org.clojure/clojure {:mvn/version "1.11.0-master-SNAPSHOT"}}}
            :perf {:extra-paths ["src/perf/clojure"]
                   :extra-deps {criterium {:mvn/version "0.4.4"}}
                   :jvm-opts ["-server"

run-tests.sh

@@ -44,7 +44,7 @@ dbs="derby h2 hsqldb sqlite"
 # Start with clean databases each time to avoid slowdown
 rm -rf clojure_test_*
 
-versions="1.7 1.8 1.9 master"
+versions="1.7 1.8 1.9 1.10 master"
 for v in $versions
 do
   TEST_DBS="$dbs $*" clj -A:test:runner:$v

src/main/clojure/clojure/java/jdbc.clj

@@ -958,7 +958,7 @@ http://clojure-doc.org/articles/ecosystem/java_jdbc/home.html"}
         (^{:once true} fn* []
          (let [counts (if multi?
                         (.executeBatch stmt)
-                        (.executeUpdate stmt))]
+                        (vector (.executeUpdate stmt)))]
            (try
              (let [rs (.getGeneratedKeys stmt)
                    result (cond multi?

src/test/clojure/clojure/java/jdbc_test.clj

@@ -68,7 +68,8 @@
 (def mysql-db {:dbtype   "mysql"
                :dbname   "clojure_test"
                :user     "clojure_test"
-               :password "clojure_test"})
+               :password "clojure_test"
+               :useSSL   false})
 
 (def derby-db {:dbtype "derby"
                :dbname "clojure_test_derby"