Merge 9cf71871f3 into d1eb29b28f

src/honeysql/format.clj

@@ -187,6 +187,9 @@
    :right-join 140
    :full-join 150
    :where 160
+   :aggregate 162
+   :over 165
+   :partition 167
    :group-by 170
    :having 180
    :order-by 190
@@ -511,7 +514,17 @@
 
 (defmethod format-clause :delete-from [[_ table] _]
   (str "DELETE FROM " (to-sql table)))
-  
+
+(defmethod format-clause :over [[_ part-clause] _]
+  (str "OVER " (to-sql part-clause)))
+
+(defmethod format-clause :aggregate [[_ aggregate-fn] _]
+  (str (to-sql aggregate-fn)))
+
+(defmethod format-clause :partition-by [[_ fields] _]
+  (str "PARTITION BY "
+       (comma-join (map to-sql fields))))
+
 (defn cte->sql
   [[cte-name query]]
   (str (to-sql cte-name) " AS " (to-sql query)))

src/honeysql/helpers.clj

@@ -224,7 +224,30 @@
 (defn delete-from
   ([table] (delete-from nil table))
   ([m table] (build-clause :delete-from m table)))
-  
+
+(defmethod build-clause :over [_ m table]
+  (assoc m :over table))
+
+(defn over
+  ([part-clause] (over nil part-clause))
+  ([m part-clause] (build-clause :over m part-clause)))
+
+(defhelper merge-over [m fields]
+  (update-in m [:over] (partial apply merge) (collify fields)))
+
+(defhelper aggregate [m aggregate-fn]
+  (assoc m :aggregate aggregate-fn))
+
+(defn aggregate
+  ([table] (aggregate nil table))
+  ([m table] (build-clause :aggregate m table)))
+
+(defhelper spartition-by [m fields]
+  (assoc m :partition-by (collify fields)))
+
+(defhelper merge-partition-by [m fields]
+  (update-in m [:partition-by] concat (collify fields)))
+
 (defmethod build-clause :with [_ m ctes]
   (assoc m :with ctes))