Add NULLS support to order-by expressions (#115)

r0man · web-flow · commit d09db975d98c · 2019-02-11T21:46:32.000+01:00
diff --git a/src/sqlingvo/compiler.cljc b/src/sqlingvo/compiler.cljc
@@ -308,6 +308,11 @@
 (defmethod compile-fn :desc [db node]
   (compile-direction db node))
 
+(defmethod compile-fn :nulls [db node]
+  (let [[_ args direction] (:children node)]
+    (concat-sql (compile-sql db args) " NULLS "
+                (-> direction :val name str/upper-case))))
+
 (defmethod compile-fn :raw [db node]
   (-> (:children node)
       (second)
diff --git a/test/sqlingvo/select_test.cljc b/test/sqlingvo/select_test.cljc
@@ -864,7 +864,7 @@
                              '(over (rank)
                                     (partition-by
                                      :depname
-                                     (sql/order-by (desc :salary) :empno)))
+                                     (order-by (desc :salary) :empno)))
                              :pos)]
               (sql/from :empsalary))
             :ss))
@@ -970,6 +970,11 @@
           (sql/from :table))
         ["SELECT array_agg(\"a\" ORDER BY \"b\" DESC) FROM \"table\""]))
 
+(deftest test-select-array-agg-order-by-desc-nulls-last
+  (sql= (sql/select db ['(array_agg :a (order-by (nulls (desc :b) :last)))]
+          (sql/from :table))
+        ["SELECT array_agg(\"a\" ORDER BY \"b\" DESC NULLS LAST) FROM \"table\""]))
+
 (deftest test-select-string-agg-order-by
   (sql= (sql/select db ['(string_agg :a "," (order-by :a))]
           (sql/from :table))
