diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b29836..1301349 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changes +* 2.0.next in progress + * Support PostgreSQL's `&&` operator. + * 2.0.0-rc2 (for testing; 2021-05-10) * Fix #326 by allowing `ON`/`USING` to be optional and not dropping parameters on the floor. * Fix #325 by making the `%` function call syntax respect `:quoted true` and/or `:dialect` options, and also allowing for qualified column names. (PR from @lognush) diff --git a/src/honey/sql.cljc b/src/honey/sql.cljc index 2dedaec..50c65f0 100644 --- a/src/honey/sql.cljc +++ b/src/honey/sql.cljc @@ -920,7 +920,7 @@ (def ^:private infix-ops (-> #{"mod" "and" "or" "xor" "<>" "<=" ">=" "||" "<->" - "like" "not-like" "regexp" + "like" "not-like" "regexp" "&&" "ilike" "not-ilike" "similar-to" "not-similar-to" "is" "is-not" "not=" "!=" "regex"} (into (map str "+-*%|&^=<>")) @@ -931,7 +931,7 @@ (atom))) (def ^:private op-ignore-nil (atom #{:and :or})) -(def ^:private op-variadic (atom #{:and :or :+ :* :||})) +(def ^:private op-variadic (atom #{:and :or :+ :* :|| :&&})) (defn- unwrap [x opts] (if-let [m (meta x)]