From ddef4068bac180a2106072ac011452e14e9d63f9 Mon Sep 17 00:00:00 2001 From: Sean Corfield Date: Wed, 30 Sep 2020 13:00:09 -0700 Subject: [PATCH] Ensure DSL elements can be symbols (as well as keywords) --- src/honey/sql.cljc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/honey/sql.cljc b/src/honey/sql.cljc index e9c4e1e..6340cc5 100644 --- a/src/honey/sql.cljc +++ b/src/honey/sql.cljc @@ -431,12 +431,12 @@ (defn- format-dsl [x & [{:keys [aliased? nested? pretty?]}]] (let [[sqls params leftover] (reduce (fn [[sql params leftover] k] - (if-let [xs (k x)] + (if-let [xs (or (k x) (let [s (symbol (name k))] (get x s)))] (let [formatter (k @clause-format) [sql' & params'] (formatter k xs)] [(conj sql sql') (if params' (into params params') params) - (dissoc leftover k)]) + (dissoc leftover k (symbol (name k)))]) [sql params leftover])) [[] [] x] *clause-order*)]