fix #257

CHANGELOG.md

@@ -3,6 +3,7 @@
 Only accretive/fixative changes will be made from now on.
 
 * 1.3.next in progress
+  * Fix [#257](https://github.com/seancorfield/next-jdbc/issues/257) by making the `fdef` spec for `with-transaction` more permissive. Also add specs for `on-connection` and the `+options` variants of both macros.
   * Address [#256](https://github.com/seancorfield/next-jdbc/issues/256) by adding `with-transaction+options` and `on-connection+options`. Documentation TBD.
   * Update `tools.build` to 0.9.5 (and remove `:java-opts` from `build/test`)
 

src/next/jdbc/specs.clj

@@ -1,4 +1,4 @@
-;; copyright (c) 2019-2021 Sean Corfield, all rights reserved
+;; copyright (c) 2019-2023 Sean Corfield, all rights reserved
 
 (ns next.jdbc.specs
   "Specs for the core API of next.jdbc.
@@ -154,7 +154,26 @@
   :args (s/cat :binding (s/and vector?
                                (s/cat :sym simple-symbol?
                                       :transactable ::transactable
-                                            :opts (s/? ::opts-map)))
+                                      :opts (s/? any?)))
+               :body (s/* any?)))
+
+(s/fdef jdbc/with-transaction+options
+  :args (s/cat :binding (s/and vector?
+                               (s/cat :sym simple-symbol?
+                                      :transactable ::transactable
+                                      :opts (s/? any?)))
+               :body (s/* any?)))
+
+(s/fdef jdbc/on-connection
+  :args (s/cat :binding (s/and vector?
+                               (s/cat :sym simple-symbol?
+                                      :connectable ::connectable))
+               :body (s/* any?)))
+
+(s/fdef jdbc/on-connection+options
+  :args (s/cat :binding (s/and vector?
+                               (s/cat :sym simple-symbol?
+                                      :connectable ::connectable))
                :body (s/* any?)))
 
 (s/fdef connection/->pool