Fix dsl/not

funcool · Jun 15, 2017 · adfe9cb · adfe9cb
1 parent 5be8054
commit adfe9cb
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/suricatta/dsl.clj b/src/suricatta/dsl.clj
@@ -583,7 +583,8 @@
 (defn not
   "Negate a condition."
   [c]
-  (DSL/not c))
+  (defer
+    (DSL/not (-condition c))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Common Table Expresions

diff --git a/test/suricatta/dsl_test.clj b/test/suricatta/dsl_test.clj
@@ -468,3 +468,20 @@
       (is (= (fmt/sql q)
              "drop table t1"))))
 )
+
+(deftest dsl-not
+  (testing "boolean negation"
+    (let [q (->
+             (dsl/select :name)
+             (dsl/from :book)
+             (dsl/where (dsl/not "new")))]
+      (is (= (fmt/sql q)
+             "select name from book where not((new))"))))
+
+  (testing "negation of vector condition"
+    (let [q (->
+             (dsl/select :name)
+             (dsl/from :book)
+             (dsl/where (dsl/not ["title = ?" "test"])))]
+      (is (= (fmt/sql q)
+             "select name from book where not((title = ?))")))))