luciano/honeysql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix #228 by allowing no predicates in where/merge-where

Browse source
This commit is contained in:
Sean Corfield 2018-09-24 18:44:01 -07:00
parent 284d0142b6
commit ea3e9b40bd
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -3,6 +3,7 @@
* `#sql/inline nil` should produce `NULL`. Fix #221. (@seancorfield) * `#sql/inline nil` should produce `NULL`. Fix #221. (@seancorfield)
* `#sql/inline :kw` should produce `"kw"`. Fix #224 via PR #225. (@vincent-dm) Note: this introduces a new protocol, `Inlinable`, which controls inline value rendering, and changes the behavior of `#sql/inline :foo/bar` to produce just `"bar"` (where it was probably invalid SQL before). * `#sql/inline :kw` should produce `"kw"`. Fix #224 via PR #225. (@vincent-dm) Note: this introduces a new protocol, `Inlinable`, which controls inline value rendering, and changes the behavior of `#sql/inline :foo/bar` to produce just `"bar"` (where it was probably invalid SQL before).
* Alias expressions `[:col :alias]` are now checked to have exactly two elements. Fix #226. * Alias expressions `[:col :alias]` are now checked to have exactly two elements. Fix #226.
* Allow `where` and `merge-where` to be given no predicates. Fix #228.
## 0.9.3 ## 0.9.3

2
src/honeysql/helpers.cljc
View file

@ -78,7 +78,7 @@
[logic-op preds] (if (keyword? (first preds)) [logic-op preds] (if (keyword? (first preds))
[(first preds) (rest preds)] [(first preds) (rest preds)]
[:and preds]) [:and preds])
pred (if (= 1 (count preds)) pred (if (>= 1 (count preds))
(first preds) (first preds)
(into [logic-op] preds))] (into [logic-op] preds))]
[m pred logic-op])) [m pred logic-op]))