Add support for where in, select distinct (#9)

* Using - throws uncaught exception

* Add support for select distinct and where in

Author: Ian Bishop

src/sqly/core.clj

@@ -4,7 +4,10 @@
    [camel-snake-kebab.core :refer [->snake_case]]))
 
 (def ^:dynamic *output-ident-style*
-  #(->snake_case %1 :separator "-"))
+  #(try
+     (->snake_case %1 :separator "-")
+     (catch Exception _
+       %1)))
 
 (defmacro with-output-ident-style [f & body]
   `(binding [*output-ident-style* ~f]
@@ -98,6 +101,12 @@
               "and"
               (as-ident higher opts)])))
 
+(defn emit-in
+  ([v]
+   (emit-in v {}))
+  ([v opts]
+   (emit-infix-op v (assoc opts :separator ","))))
+
 (defn emit-literal-identifier
   ([v]
    (emit-literal-identifier v {}))
@@ -126,6 +135,7 @@
 (def-ops #'emit-sql '[sql])
 (def-ops #'emit-between '[between])
 (def-ops #'emit-literal-identifier '[ident])
+(def-ops #'emit-in '[in])
 
 (defn emit-function
   ([v]
@@ -234,7 +244,9 @@
                     (fn [[k v]]
                       (if ((set (keys *remapped-idents*)) v)
                         [k v]
-                        (list '= k v)))))
+                        (if (coll? v)
+                          (list 'in k v)
+                          (list '= k v))))))
          expr (if (< (count expr) 1)
                 (list* 'and expr)
                 (cons 'and expr))]
@@ -262,14 +274,15 @@
          (str/join " "))))
 
 (defn emit-select [{:keys [select
+                           distinct?
                            from
                            where
                            order-by
                            group-by
                            limit
                            join]}]
   (when select
-    (->> [["select" select]
+    (->> [[(str "select" (when distinct? " distinct")) select]
           ["from" from #'emit-from-clause]
           ["where" where #'emit-where-clause]
           ["group by" group-by]

test/sqly/core_test.clj

@@ -371,3 +371,22 @@
                     {:select [:related_id :type :description]
                      :from :b_events
                      :where {:related_id "{{related-id}}"}}]}))))
+
+(deftest select-distinct-test
+  (is (= (canon
+          ["select distinct id1,id2,id3 from a_events"])
+         (sql/sql
+          '{:select [:id1 :id2 :id3]
+            :distinct? true
+            :from :a_events}))))
+
+(deftest where-in-test
+  (is (= (canon
+          ["select id,name from a_events"
+           " where (id in ('foo','bar'))"
+           " and (name = 'baz')"])
+         (sql/sql
+          '{:select [:id :name]
+            :from :a_events
+            :where {:id ["foo" "bar"]
+                    :name "baz"}}))))