Merge remote-tracking branch 'upstream/master' into params-merge

.travis.yml

@@ -0,0 +1,3 @@
+language: clojure
+lein: lein2
+script: lein do check, test

project.clj

@@ -2,5 +2,7 @@
   :description "SQL as Clojure data structures"
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
-  :url https://github.com/jkk/honeysql
+  :url "https://github.com/jkk/honeysql"
+  :scm {:name "git"
+        :url "https://github.com/jkk/honeysql"}
   :dependencies [[org.clojure/clojure "1.6.0"]])

src/honeysql/format.clj

@@ -254,7 +254,8 @@
 
 (extend-protocol ToSql
   clojure.lang.Keyword
-  (-to-sql [x] (let [s ^String (name x)]
+  (-to-sql [x]
+    (let [s (name x)]
       (condp = (.charAt s 0)
         \% (let [call-args (string/split (subs s 1) #"\." 2)]
              (to-sql (apply call (map keyword call-args))))
@@ -265,9 +266,11 @@
   java.lang.Number
   (-to-sql [x] (str x))
   java.lang.Boolean
-  (-to-sql [x] (if x "TRUE" "FALSE"))
+  (-to-sql [x]
+    (if x "TRUE" "FALSE"))
   clojure.lang.Sequential
-  (-to-sql [x] (if *fn-context?*
+  (-to-sql [x]
+    (if *fn-context?*
       ;; list argument in fn call
       (paren-wrap (comma-join (map to-sql x)))
       ;; alias
@@ -280,14 +283,16 @@
              (quote-identifier (second x))
              (to-sql (second x))))))
   SqlCall
-  (-to-sql [x] (binding [*fn-context?* true]
+  (-to-sql [x]
+    (binding [*fn-context?* true]
        (let [fn-name (name (.name x))
              fn-name (fn-aliases fn-name fn-name)]
          (apply fn-handler fn-name (.args x)))))
   SqlRaw
   (-to-sql [x] (.s x))
   clojure.lang.IPersistentMap
-  (-to-sql [x] (let [clause-ops (sort-clauses (keys x))
+  (-to-sql [x]
+    (let [clause-ops (sort-clauses (keys x))
           sql-str (binding [*subquery?* true
                             *fn-context?* false]
                     (space-join
@@ -299,7 +304,8 @@
   nil
   (-to-sql [x] "NULL")
   Object
-  (-to-sql [x] (let [[x pname] (if (instance? SqlParam x)
+  (-to-sql [x]
+    (let [[x pname] (if (instance? SqlParam x)
                       (let [pname (param-name x)]
                         (if (map? @*input-params*)
                           [(get @*input-params* pname) pname]