some version updates

Signed-off-by: Sean Corfield <sean@corfield.org>
clojure · Mar 27, 2024 · 44b9e74 · 44b9e74
1 parent 25fcc83
commit 44b9e74
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 30 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-*.jar
+.calva/repl.calva-repl
 .classpath
 .clj-kondo/.cache
 .cpcache
@@ -7,6 +7,7 @@
 .project
 .rebl
 .settings
+*.jar
 /.lein-failures
 /.lein-repl-history
 /.nrepl-port
@@ -18,5 +19,3 @@ derby.log
 settings.xml
 target
 test-all.sh
-/postgres-down.sh
-/postgres-up.sh
diff --git a/.joker b/.joker
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,7 @@
+Changes not yet released
+* Update most testing dependencies (and update a couple of tests to match).
+* Drop support for Clojure 1.7.0. Test against 1.8, 1.9, 1.10, 1.11, and 1.12 (Alpha 9).
+
 Changes in 0.7.12
 
 * Make the protocols `ISQLValue`, `ISQLParameter`, and `IResultSetReadColumn` extensible via metadata.

diff --git a/deps.edn b/deps.edn
@@ -1,35 +1,34 @@
 ;; You can run clojure.java.jdbc tests with: clj -A:test:runner
 ;; You can also specify an alias to select which version of Clojure to test
-;; against: :1.7 :1.8 :1.9 :master
+;; against: :1.8 :1.9 :1.10 :1.11 :1.12
 
 {:paths ["src/main/clojure"]
  :aliases {:test
            {:extra-paths ["src/test/clojure"]
             :extra-deps {org.clojure/test.check {:mvn/version "1.1.1"}
                          org.apache.derby/derby {:mvn/version "10.14.2.0"}
-                         org.hsqldb/hsqldb {:mvn/version "2.4.1"}
+                         org.hsqldb/hsqldb$jdk8 {:mvn/version "2.7.2"}
                          com.h2database/h2 {:mvn/version "1.4.197"}
                          net.sourceforge.jtds/jtds {:mvn/version "1.3.1"}
                          ;; Note: Tests fail with 6.0.2+ driver
                          mysql/mysql-connector-java {:mvn/version "5.1.41"}
-                         org.postgresql/postgresql {:mvn/version "42.2.2.jre7"}
-                         com.impossibl.pgjdbc-ng/pgjdbc-ng {:mvn/version "0.7.1"}
-                         org.xerial/sqlite-jdbc {:mvn/version "3.23.1"}
-                         ;; Note: Assumes Java 8; there's a .jre7 version as well
-                         com.microsoft.sqlserver/mssql-jdbc {:mvn/version "6.2.2.jre8"}}}
-           :1.7 {:override-deps {org.clojure/clojure {:mvn/version "1.7.0"}}}
+                         org.postgresql/postgresql {:mvn/version "42.7.3"}
+                         com.impossibl.pgjdbc-ng/pgjdbc-ng {:mvn/version "0.8.9"}
+                         org.xerial/sqlite-jdbc {:mvn/version "3.45.2.0"}
+                         ;; Note: Assumes Java 8; there's a .jre11 version as well
+                         com.microsoft.sqlserver/mssql-jdbc {:mvn/version "12.6.1.jre8"}}}
            :1.8 {:override-deps {org.clojure/clojure {:mvn/version "1.8.0"}}}
            :1.9 {:override-deps {org.clojure/clojure {:mvn/version "1.9.0"}}}
            :1.10 {:override-deps {org.clojure/clojure {:mvn/version "1.10.3"}}}
-           :master {:override-deps {org.clojure/clojure {:mvn/version "1.12.0-master-SNAPSHOT"}}}
+           :1.11 {:override-deps {org.clojure/clojure {:mvn/version "1.11.2"}}}
+           :1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.0-alpha9"}}}
            :perf {:extra-paths ["src/perf/clojure"]
-                  :extra-deps {criterium {:mvn/version "0.4.6"}}
+                  :extra-deps {criterium/criterium {:mvn/version "0.4.6"}}
                   :jvm-opts ["-server"
                              "-Xmx4096m"
                              "-Dclojure.compiler.direct-linking=true"]}
            :runner
-           {:extra-deps {com.cognitect/test-runner
-                         {:git/url "https://github.com/cognitect-labs/test-runner"
-                          :sha "76568540e7f40268ad2b646110f237a60295fa3c"}}
+           {:extra-deps {io.github.cognitect-labs/test-runner
+                         {:git/tag "v0.5.1" :git/sha "dfb30dd"}}
             :main-opts ["-m" "cognitect.test-runner"
                         "-d" "src/test/clojure"]}}}
diff --git a/pom.xml b/pom.xml
@@ -78,7 +78,8 @@
   	<dependency>
   		<groupId>org.hsqldb</groupId>
   		<artifactId>hsqldb</artifactId>
-  		<version>2.4.1</version>
+  		<version>2.7.2</version>
+      <classifier>jdk8</classifier>
   		<scope>test</scope>
   	</dependency>
     <dependency>
@@ -90,13 +91,13 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.2.2.jre7</version>
+      <version>42.7.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.xerial</groupId>
       <artifactId>sqlite-jdbc</artifactId>
-      <version>3.41.2.2</version>
+      <version>3.45.2.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/run-tests.sh b/run-tests.sh
@@ -44,10 +44,10 @@ 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 1.10 master"
+versions="1.8 1.9 1.10 1.11 1.12"
 for v in $versions
 do
-  TEST_DBS="$dbs $*" clj -A:test:runner:$v
+  TEST_DBS="$dbs $*" clj -M:test:runner:$v
   if test $? -ne 0
   then
     exit $?

diff --git a/src/main/clojure/clojure/java/jdbc.clj b/src/main/clojure/clojure/java/jdbc.clj
@@ -540,7 +540,7 @@ http://clojure-doc.org/articles/ecosystem/java_jdbc/home.html"}
   locales where the lower case version of a character is not a valid SQL
   entity name (e.g., Turkish)."
   [^String s]
-  (.toLowerCase s (Locale/US)))
+  (.toLowerCase s Locale/US))
 
 (defn result-set-seq
   "Creates and returns a lazy sequence of maps corresponding to the rows in the
@@ -1507,7 +1507,8 @@ http://clojure-doc.org/articles/ecosystem/java_jdbc/home.html"}
                      (map second rs)))
               result-set-fn
               (throw (ex-info (str "Cannot apply result-set-fn to"
-                                   " non-homogeneous generated keys array") rs))
+                                   " non-homogeneous generated keys array")
+                              {:generated-keys rs}))
               :else
               ;; non-non-homogeneous generated keys array - return as-is
               rs))

diff --git a/src/test/clojure/clojure/java/jdbc_test.clj b/src/test/clojure/clojure/java/jdbc_test.clj
@@ -974,8 +974,8 @@
                              [])
                            (execute-multi-insert db)))]
        (case (db-type db)
-         ;; SQLite only returns the last key inserted in a batch
-         "sqlite" (is (= [(returned-key db 2)] new-keys))
+         ;; SQLite returns nothing useful now
+         "sqlite" (is (= [] new-keys))
          ;; Derby returns a single row count
          "derby"  (is (= [(returned-key db 1)] new-keys))
          ;; H2 returns dummy keys
@@ -1015,8 +1015,8 @@
                  0)
                (execute-multi-insert db))]
        (case (db-type db)
-         ;; SQLite only returns the last key inserted in a batch
-         "sqlite" (is (= 1 n))
+         ;; SQLite returns nothing useful now
+         "sqlite" (is (= 0 n))
          ;; Derby returns a single row count
          "derby"  (is (= 1 n))
          ;; H2 returns (zero) keys now
@@ -1215,6 +1215,7 @@
         (is (= [1] delete-result))
         (is (= [] rows))))))
 
+#_{:clj-kondo/ignore [:invalid-arity]}
 (deftest illegal-insert-arguments
   (doseq [db (test-specs)]
     (illegal-arg-or-spec "insert!" (sql/insert! db))
@@ -1276,6 +1277,7 @@
                                      [[:foo :int :default 0]]
                                      {:entities (sql/quoted :mysql)}))))
 
+#_{:clj-kondo/ignore [:unresolved-symbol]}
 (comment
    db (sql/create-table-ddl
        table