From b600348808a791c91eba7fc9483c49aacd26595f Mon Sep 17 00:00:00 2001
From: Sean Corfield <sean@corfield.org>
Date: Sat, 6 Mar 2021 22:10:43 -0800
Subject: [PATCH] Addresses #283 on the v1 branch

---
 CHANGELOG.md                     |  3 ++
 src/honey/sql/helpers.cljc       | 75 +++++++++++++++++---------------
 test/honey/sql/helpers_test.cljc |  4 --
 3 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26876b6..42620b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changes
 
+* 2.0.0-alpha3 in progress
+  * Reconcile `where` behavior with recent 1.0 changes.
+
 * 2.0.0-alpha2 (for early testing)
   * Since Alpha 1, a lot more documentation has been written and docstrings have been added to most functions in `honey.sql.helpers`.
   * Numerous small improvements have been made to clauses and helpers around insert/upsert.
diff --git a/src/honey/sql/helpers.cljc b/src/honey/sql/helpers.cljc
index b9ba8e8..c490519 100644
--- a/src/honey/sql/helpers.cljc
+++ b/src/honey/sql/helpers.cljc
@@ -11,47 +11,50 @@
   (into (vec current) args))
 
 (defn- and-merge
-  "Recursively merge args into the current expression."
+  [current arg]
+  (if-let [conj' (and (sequential? arg) (#{:and :or} (first arg)))]
+    (cond (= conj' (first current))
+          (into (vec current) (rest arg))
+          (seq current)
+          (into [conj' current] (rest arg))
+          :else
+          (into [conj'] (rest arg)))
+    (cond (= :and (first current))
+          (conj (vec current) arg)
+          (seq current)
+          (conj [:and current] arg)
+          :else
+          (conj [:and] arg))))
+
+(defn- and-merges
   [current args]
-  (let [args (remove nil? args)]
-   (cond (= :and (first args))
-         (recur current [args])
-         (= :or (first args))
-         (recur [:or current] (rest args))
-         :else
-         (let [arg    (first args)
-               conj-1 (#{:and :or} (first current))
-               conj-2 (#{:and :or} (and (sequential? arg) (first arg)))]
-           (cond (empty? args)
-            ;; nothing more to merge:
-                 (vec current)
-                 (and conj-1 conj-2 (= conj-1 conj-2))
-            ;; both conjunctions and they match:
-                 (recur (default-merge current (rest arg)) (rest args))
-                 (and conj-1 conj-2)
-            ;; both conjunctions but they don't match:
-                 (if (= :and conj-1)
-                   (recur (default-merge current [arg]) (rest args))
-                   (recur (default-merge [:and current] (rest arg)) (rest args)))
-                 conj-1
-            ;; current is conjunction; arg is not
-                 (recur (default-merge (if (= :and conj-1) current [:and current]) [arg]) (rest args))
-                 (and conj-2 (seq current))
-            ;; arg is conjunction; current is not
-                 (recur (default-merge [conj-2 current] (rest arg)) (rest args))
-                 (seq current)
-            ;; current non-empty; neither is a conjunction
-                 (recur (default-merge [:and current] [arg]) (rest args))
-                 :else ; current is empty; use arg as current
-                 (recur (if (sequential? arg) arg [arg]) (rest args)))))))
+  (let [args (remove nil? args)
+        result
+        (cond (keyword? (first args))
+              (and-merges current [args])
+              (seq args)
+              (let [[arg & args] args]
+                (and-merges (and-merge current arg) args))
+              :else
+              current)]
+    (case (count result)
+      0 nil
+      1 (if (sequential? (first result))(first result) result)
+      2 (if (#{:and :or} (first result))
+          (second result)
+          result)
+      result)))
 
 (def ^:private special-merges
-  {:where  #'and-merge
-   :having #'and-merge})
+  {:where  #'and-merges
+   :having #'and-merges})
 
 (defn- helper-merge [data k args]
-  (let [merge-fn (special-merges k default-merge)]
-    (clojure.core/update data k merge-fn args)))
+  (if-let [merge-fn (special-merges k)]
+    (if-let [clause (merge-fn (get data k) args)]
+      (assoc data k clause)
+      data)
+    (clojure.core/update data k default-merge args)))
 
 (defn- generic [k args]
   (if (map? (first args))
diff --git a/test/honey/sql/helpers_test.cljc b/test/honey/sql/helpers_test.cljc
index a01e9a1..320ca19 100644
--- a/test/honey/sql/helpers_test.cljc
+++ b/test/honey/sql/helpers_test.cljc
@@ -563,7 +563,3 @@
                  (f {k [:and [:a] [:b]]}
                     :or
                     [:x] [:y]))))))))
-
-(comment
-  (where {:where [:and [:a] [:b]]} [:and [:x] [:y]])
-  .)