From c736565bd55fa0491eb4cd322b5461806f5e4ea3 Mon Sep 17 00:00:00 2001 From: Mike Blume Date: Fri, 23 Jan 2015 12:49:23 -0800 Subject: [PATCH 1/2] avoid name collision with clojure.core/update present in 1.7, currently in alpha --- src/honeysql/helpers.clj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/honeysql/helpers.clj b/src/honeysql/helpers.clj index 0646928..a19d2d2 100644 --- a/src/honeysql/helpers.clj +++ b/src/honeysql/helpers.clj @@ -1,4 +1,5 @@ -(ns honeysql.helpers) +(ns honeysql.helpers + (:refer-clojure :exclude [update])) (defmulti build-clause (fn [name & args] name)) From 2cafa5940ec63d071b9d81ebbe7bcc20ff4cbbd0 Mon Sep 17 00:00:00 2001 From: Mike Blume Date: Mon, 2 Mar 2015 15:07:50 -0800 Subject: [PATCH 2/2] avoid collision with update in tests as well --- test/honeysql/core_test.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/honeysql/core_test.clj b/test/honeysql/core_test.clj index 161b52f..4bdabda 100644 --- a/test/honeysql/core_test.clj +++ b/test/honeysql/core_test.clj @@ -1,5 +1,5 @@ (ns honeysql.core-test - (:refer-clojure :exclude [format]) + (:refer-clojure :exclude [format update]) (:require [clojure.test :refer [deftest testing is]] [honeysql.core :as sql] [honeysql.helpers :refer :all]))