From 06edd82ff5f8a0d70d4b1dff271154538c3befc8 Mon Sep 17 00:00:00 2001 From: gered Date: Fri, 20 May 2016 18:19:07 -0400 Subject: [PATCH] rename post-fn to row-fn i think "row-fn" is a lot more clear as a name, especially since jdbc also uses the name row-fn to refer to the exact same thing --- src/views/honeysql/view.clj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/honeysql/view.clj b/src/views/honeysql/view.clj index ce88602..7453ab8 100644 --- a/src/views/honeysql/view.clj +++ b/src/views/honeysql/view.clj @@ -8,12 +8,12 @@ [clojure.java.jdbc :as j] [clojure.tools.logging :refer [warn]])) -(defrecord HSQLView [id db query-fn post-fn] +(defrecord HSQLView [id db query-fn row-fn] IView (id [_] id) (data [_ namespace parameters] (let [start (System/currentTimeMillis) - data (j/query db (hsql/format (apply query-fn parameters)) :row-fn post-fn) + data (j/query db (hsql/format (apply query-fn parameters)) :row-fn row-fn) time (- (System/currentTimeMillis) start)] (when (>= time 1000) (warn id "took" time "msecs")) data)) @@ -25,5 +25,5 @@ (defn view "Creates a Honey SQL view that uses a jdbc database configuration" - ([id db hsql-fn post-fn] (HSQLView. id db hsql-fn post-fn)) - ([id db hsql-fn] (view id db hsql-fn identity))) + [id db hsql-fn & {:keys [row-fn]}] + (HSQLView. id db hsql-fn (or row-fn identity)))