diff options
Diffstat (limited to 'src/clojure/contrib')
| -rw-r--r-- | src/clojure/contrib/java_utils.clj | 8 | ||||
| -rw-r--r-- | src/clojure/contrib/miglayout/internal.clj | 4 | ||||
| -rw-r--r-- | src/clojure/contrib/sql.clj | 18 | ||||
| -rw-r--r-- | src/clojure/contrib/sql/internal.clj | 4 | ||||
| -rw-r--r-- | src/clojure/contrib/test_contrib/test_java_utils.clj | 10 |
5 files changed, 22 insertions, 22 deletions
diff --git a/src/clojure/contrib/java_utils.clj b/src/clojure/contrib/java_utils.clj index a60f68c8..097afd9c 100644 --- a/src/clojure/contrib/java_utils.clj +++ b/src/clojure/contrib/java_utils.clj @@ -63,7 +63,7 @@ ([parent child & more] (reduce file (file parent child) more))) -(defn the-str +(defn as-str "Returns the name or string representation of x" [x] (if (instance? clojure.lang.Named x) @@ -71,15 +71,15 @@ (str x))) (defn get-system-property [stringable] - (System/getProperty (the-str stringable))) + (System/getProperty (as-str stringable))) (defn set-system-properties [settings] "Set some system properties. Nil clears a property." (doseq [[name val] settings] (if val - (System/setProperty (the-str name) val) - (System/clearProperty (the-str name))))) + (System/setProperty (as-str name) val) + (System/clearProperty (as-str name))))) (defmacro with-system-properties "setting => property-name value diff --git a/src/clojure/contrib/miglayout/internal.clj b/src/clojure/contrib/miglayout/internal.clj index 8a2131c5..2db25457 100644 --- a/src/clojure/contrib/miglayout/internal.clj +++ b/src/clojure/contrib/miglayout/internal.clj @@ -18,7 +18,7 @@ (:use (clojure.contrib [except :only (throwf)] [fcase :only (fcase)] - [java-utils :only (the-str)]))) + [java-utils :only (as-str)]))) (declare format-constraints) @@ -43,7 +43,7 @@ [& constraints] (let [formatted (apply str - (map the-str + (map as-str (rest (reduce concat [] (mapcat format-constraint constraints)))))] ;(prn formatted) diff --git a/src/clojure/contrib/sql.clj b/src/clojure/contrib/sql.clj index 3cfd644f..1ecdd605 100644 --- a/src/clojure/contrib/sql.clj +++ b/src/clojure/contrib/sql.clj @@ -18,7 +18,7 @@ (ns clojure.contrib.sql (:use (clojure.contrib [def :only (defalias)] - [java-utils :only (the-str)]) + [java-utils :only (as-str)]) clojure.contrib.sql.internal)) (defalias find-connection find-connection*) @@ -96,9 +96,9 @@ [name & specs] (do-commands (format "CREATE TABLE %s (%s)" - (the-str name) + (as-str name) (apply str - (map the-str + (map as-str (apply concat (interpose [", "] (map (partial interpose " ") specs)))))))) @@ -108,7 +108,7 @@ or keyword" [name] (do-commands - (format "DROP TABLE %s" (the-str name)))) + (format "DROP TABLE %s" (as-str name)))) (defn insert-values "Inserts rows into a table with values for specified columns only. @@ -117,7 +117,7 @@ order. When inserting complete rows (all columns), consider using insert-rows instead." [table column-names & value-groups] - (let [column-strs (map the-str column-names) + (let [column-strs (map as-str column-names) n (count (first value-groups)) template (apply str (interpose "," (replicate n "?"))) columns (if (seq column-names) @@ -125,7 +125,7 @@ "")] (apply do-prepared (format "INSERT INTO %s %s VALUES (%s)" - (the-str table) columns template) + (as-str table) columns template) value-groups))) (defn insert-rows @@ -149,7 +149,7 @@ (let [[where & params] where-params] (do-prepared (format "DELETE FROM %s WHERE %s" - (the-str table) where) + (as-str table) where) params))) (defn update-values @@ -159,11 +159,11 @@ strings or keywords (identifying columns) to updated values." [table where-params record] (let [[where & params] where-params - column-strs (map the-str (keys record)) + column-strs (map as-str (keys record)) columns (apply str (concat (interpose "=?, " column-strs) "=?"))] (do-prepared (format "UPDATE %s SET %s WHERE %s" - (the-str table) columns where) + (as-str table) columns where) (concat (vals record) params)))) (defn update-or-insert-values diff --git a/src/clojure/contrib/sql/internal.clj b/src/clojure/contrib/sql/internal.clj index 0559a763..af455fa2 100644 --- a/src/clojure/contrib/sql/internal.clj +++ b/src/clojure/contrib/sql/internal.clj @@ -14,7 +14,7 @@ (ns clojure.contrib.sql.internal (:use (clojure.contrib [except :only (throw-arg)] - [java-utils :only (the-str)]))) + [java-utils :only (as-str)]))) (def *db* {:connection nil :level 0}) @@ -26,7 +26,7 @@ [m] (let [p (java.util.Properties.)] (doseq [[key val] (seq m)] - (.setProperty p (the-str key) (the-str val))) + (.setProperty p (as-str key) (as-str val))) p)) (defn find-connection* diff --git a/src/clojure/contrib/test_contrib/test_java_utils.clj b/src/clojure/contrib/test_contrib/test_java_utils.clj index 427babca..21a4addc 100644 --- a/src/clojure/contrib/test_contrib/test_java_utils.clj +++ b/src/clojure/contrib/test_contrib/test_java_utils.clj @@ -32,15 +32,15 @@ (is (thrown? IllegalArgumentException (file "foo" "bar" "/boom" "baz" "quux")))) ) -(deftest test-the-str +(deftest test-as-str (testing "keyword to string" - (is (= "foo") (the-str :foo))) + (is (= "foo") (as-str :foo))) (testing "symbol to string" - (is (= "foo") (the-str 'foo))) + (is (= "foo") (as-str 'foo))) (testing "string to string" - (is (= "foo") (the-str "foo"))) + (is (= "foo") (as-str "foo"))) (testing "stringifying non-namish things" - (is (= "42") (the-str 42))) + (is (= "42") (as-str 42))) ) (deftest test-get-system-property |