Skip to content

changed assertion Error to Exception issue #49 #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ibarrick wants to merge 21 commits into
base: master
Choose a base branch
from
Open

changed assertion Error to Exception issue #49 #142

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
5d6002c
changed assertion Error to Exception
ibarrick May 5, 2016
b6de247
changed test cases
ibarrick May 5, 2016
d634f7d
added batch insert support
ibarrick Jun 20, 2016
af21fcf
updated version
ibarrick May 22, 2018
0758c10
added support for returning keys from batch insert
ibarrick Jun 14, 2018
b9386c8
bumped version number
ibarrick Jun 14, 2018
bf0fb30
added before and after hooks as well as a debug switch in call-option…
ibarrick Jun 14, 2018
bfca254
bumped version number
ibarrick Jun 14, 2018
5d95346
handle IN by passing in NULL if list is empty
ibarrick Apr 23, 2019
c9d4e3f
added support for transaction retries to yesql
ibarrick Sep 4, 2019
832b35c
Revert "added support for transaction retries to yesql"
ibarrick Sep 10, 2019
a3e20d1
fix clojure 1.9 issue
ibarrick Sep 10, 2019
b10fe92
make hooks an atom for runtime modifications
ibarrick Sep 16, 2019
fc7d9f4
fix issues with fix
ibarrick Sep 16, 2019
08081a8
fix hooks issue
ibarrick Sep 17, 2019
249be1d
added uuid field to yesql
ibarrick Jan 3, 2020
fd631bc
0.7.0 include safely for exponential backoff
ibarrick Jan 3, 2020
347501e
0.7.1
ibarrick Jan 3, 2020
1bbd9f9
only retry SQLExceptions
ibarrick Jan 21, 2020
abbb0db
version 0.7.2
ibarrick Jan 21, 2020
36b3f1f
update jdbc
ibarrick Jul 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
added batch insert support
  • Loading branch information
@ibarrick
ibarrick committed Jun 20, 2016
commit d634f7d6469322753e48ce5649e6710af8278f49
2 changes: 1 addition & 1 deletion project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
:url "https://github.com/krisajenkins/yesql"}
:profiles {:dev {:dependencies [[expectations "2.1.3" :exclusions [org.clojure/clojure]]
[org.apache.derby/derby "10.12.1.1"]]
:plugins [[lein-autoexpect "1.4.0"]
:plugins [[lein-autoexpect "1.4.0" :exclusions [org.clojure/tools.namespace]]
[lein-expectations "0.0.8" :exclusions [org.clojure/clojure]]]}
:1.5 {:dependencies [[org.clojure/clojure "1.5.1"]]}
:1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}
Expand Down
50 changes: 31 additions & 19 deletions src/yesql/generate.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
(defn rewrite-query-for-jdbc
[tokens initial-args]
(let [{:keys [expected-keys expected-positional-count]} (analyse-statement-tokens tokens)
actual-keys (set (keys (dissoc initial-args :?)))
actual-keys (set (keys (dissoc (if (or (vector? initial-args) (list? initial-args)) (apply merge initial-args) initial-args) :?)))
actual-positional-count (count (:? initial-args))
missing-keys (set/difference expected-keys actual-keys)]
(if-not (empty? missing-keys)
Expand All @@ -50,23 +50,33 @@
"Expected %d positional parameters. Got %d."
"Supply positional parameters as {:? [...]}"])
expected-positional-count actual-positional-count))))
(let [[final-query final-parameters consumed-args]
(reduce (fn [[query parameters args] token]
(cond
(string? token) [(str query token)
parameters
args]
(symbol? token) (let [[arg new-args] (if (= '? token)
[(first (:? args)) (update-in args [:?] rest)]
[(get args (keyword token)) args])]
[(str query (args-to-placeholders arg))
(vec (if (in-list-parameter? arg)
(concat parameters arg)
(conj parameters arg)))
new-args])))
["" [] initial-args]
tokens)]
(concat [final-query] final-parameters))))
(if (or (vector? initial-args) (list? initial-args))
(let [[final-query final-parameters consumed-args]
(reduce (fn [[query parameters args] token]
(cond
(string? token) [(str query token)
parameters
args]
(symbol? token) [(str query (args-to-placeholders ""))
(conj parameters (keyword token))
args])) ["" [] initial-args] tokens)] (concat [final-query] (mapv (apply juxt final-parameters) initial-args)))
(let [[final-query final-parameters consumed-args]
(reduce (fn [[query parameters args] token]
(cond
(string? token) [(str query token)
parameters
args]
(symbol? token) (let [[arg new-args] (if (= '? token)
[(first (:? args)) (update-in args [:?] rest)]
[(get args (keyword token)) args])]
[(str query (args-to-placeholders arg))
(vec (if (in-list-parameter? arg)
(concat parameters arg)
(conj parameters arg)))
new-args])))
["" [] initial-args]
tokens)]
(concat [final-query] final-parameters)))))

;; Maintainer's note: clojure.java.jdbc.execute! returns a list of
;; rowcounts, because it takes a list of parameter groups. In our
Expand All @@ -78,7 +88,9 @@

(defn insert-handler
[db statement-and-params call-options]
(jdbc/db-do-prepared-return-keys db statement-and-params))
(if (vector? (second statement-and-params))
(apply jdbc/db-do-prepared db statement-and-params)
(jdbc/db-do-prepared-return-keys db statement-and-params)))

(defn query-handler
[db sql-and-params
Expand Down