From 62c4760c6a558221698089e853770c9d5836df1d Mon Sep 17 00:00:00 2001
From: Michael Blume <blume.mike@gmail.com>
Date: Mon, 17 Jul 2017 20:18:55 -0700
Subject: [PATCH] Revert "Merge pull request #149"

Should #168
---
 src/honeysql/format.cljc       | 39 ++++++++++++----------------------
 test/honeysql/format_test.cljc |  7 ------
 2 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/src/honeysql/format.cljc b/src/honeysql/format.cljc
index e7e323e..400405d 100644
--- a/src/honeysql/format.cljc
+++ b/src/honeysql/format.cljc
@@ -37,8 +37,6 @@
 
 (def ^:dynamic *fn-context?* false)
 
-(def ^:dynamic *value-context?* false)
-
 (def ^:dynamic *subquery?* false)
 
 (def ^:dynamic *allow-dashed-names?* false)
@@ -96,10 +94,6 @@
 (defprotocol ToSql
   (to-sql [x]))
 
-(defn to-sql-value [x]
-  (binding [*value-context?* true]
-    (to-sql x)))
-
 (defmulti fn-handler (fn [op & args] op))
 
 (defn expand-binary-ops [op & args]
@@ -130,40 +124,40 @@
   (if (seq more)
     (apply expand-binary-ops "=" a b more)
     (cond
-     (nil? a) (str (to-sql-value b) " IS NULL")
-     (nil? b) (str (to-sql-value a) " IS NULL")
-     :else (str (to-sql-value a) " = " (to-sql-value b)))))
+     (nil? a) (str (to-sql b) " IS NULL")
+     (nil? b) (str (to-sql a) " IS NULL")
+     :else (str (to-sql a) " = " (to-sql b)))))
 
 (defmethod fn-handler "<>" [_ a b & more]
   (if (seq more)
     (apply expand-binary-ops "<>" a b more)
     (cond
-     (nil? a) (str (to-sql-value b) " IS NOT NULL")
-     (nil? b) (str (to-sql-value a) " IS NOT NULL")
-     :else (str (to-sql-value a) " <> " (to-sql-value b)))))
+     (nil? a) (str (to-sql b) " IS NOT NULL")
+     (nil? b) (str (to-sql a) " IS NOT NULL")
+     :else (str (to-sql a) " <> " (to-sql b)))))
 
 (defmethod fn-handler "<" [_ a b & more]
   (if (seq more)
     (apply expand-binary-ops "<" a b more)
-    (str (to-sql-value a) " < " (to-sql-value b))))
+    (str (to-sql a) " < " (to-sql b))))
 
 (defmethod fn-handler "<=" [_ a b & more]
   (if (seq more)
     (apply expand-binary-ops "<=" a b more)
-    (str (to-sql-value a) " <= " (to-sql-value b))))
+    (str (to-sql a) " <= " (to-sql b))))
 
 (defmethod fn-handler ">" [_ a b & more]
   (if (seq more)
     (apply expand-binary-ops ">" a b more)
-    (str (to-sql-value a) " > " (to-sql-value b))))
+    (str (to-sql a) " > " (to-sql b))))
 
 (defmethod fn-handler ">=" [_ a b & more]
   (if (seq more)
     (apply expand-binary-ops ">=" a b more)
-    (str (to-sql-value a) " >= " (to-sql-value b))))
+    (str (to-sql a) " >= " (to-sql b))))
 
 (defmethod fn-handler "between" [_ field lower upper]
-  (str (to-sql-value field) " BETWEEN " (to-sql-value lower) " AND " (to-sql-value upper)))
+  (str (to-sql field) " BETWEEN " (to-sql lower) " AND " (to-sql upper)))
 
 ;; Handles MySql's MATCH (field) AGAINST (pattern). The third argument
 ;; can be a set containing one or more of :boolean, :natural, or :expand.
@@ -172,7 +166,7 @@
        (comma-join
         (map to-sql (if (coll? fields) fields [fields])))
        ") AGAINST ("
-       (to-sql-value pattern)
+       (to-sql pattern)
        (when (seq opts)
          (str " " (space-join (for [opt opts]
                                 (case opt
@@ -319,17 +313,10 @@
       (paren-wrap sql-str)
       sql-str)))
 
-(declare format-predicate*)
-
 (defn seq->sql [x]
-  (cond
-    *value-context?*
-    ;; sequences are operators/functions
-    (format-predicate* x)
-    *fn-context?*
+  (if *fn-context?*
     ;; list argument in fn call
     (paren-wrap (comma-join (map to-sql x)))
-    :else
     ;; alias
     (str (to-sql (first x))
          ; Omit AS in FROM, JOIN, etc. - Oracle doesn't allow it
diff --git a/test/honeysql/format_test.cljc b/test/honeysql/format_test.cljc
index acc9cb3..d2b7615 100644
--- a/test/honeysql/format_test.cljc
+++ b/test/honeysql/format_test.cljc
@@ -115,13 +115,6 @@
               :order-by [[:amount :asc]]})
            ["SELECT amount, id, created_on FROM transactions UNION SELECT amount, id, created_on FROM (SELECT amount, id, created_on FROM other_transactions ORDER BY amount DESC LIMIT ?) ORDER BY amount ASC" 5]))))
 
-(deftest compare-expressions-test
-  (testing "Sequences should be fns when in value/comparison spots"
-    (is (= ["SELECT foo FROM bar WHERE (col1 mod ?) = (col2 + ?)" 4 4]
-           (format {:select [:foo]
-                    :from [:bar]
-                    :where [:= [:mod :col1 4] [:+ :col2 4]]})))))
-
 (deftest union-with-cte
   (is (= (format {:union [{:select [:foo] :from [:bar1]}
                           {:select [:foo] :from [:bar2]}]