diff options
| author | Carlo Zancanaro <carlo@clearboxsystems.com.au> | 2013-06-23 01:56:15 +1000 |
|---|---|---|
| committer | Carlo Zancanaro <carlo@clearboxsystems.com.au> | 2013-06-23 01:56:15 +1000 |
| commit | 900d7f614bef4250046d829264ae0d9ad571494a (patch) | |
| tree | 229fb54f7ecf777519d4c9a3112b036d3c389bf9 | |
| parent | 8a436b230b8357eaed6fc59c6fdbeb86295e12f7 (diff) | |
Misc changes.
| -rw-r--r-- | src/clojure_sql/core.clj | 3 | ||||
| -rw-r--r-- | src/clojure_sql/dsl.clj | 11 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/clojure_sql/core.clj b/src/clojure_sql/core.clj index 97cee93..63c7128 100644 --- a/src/clojure_sql/core.clj +++ b/src/clojure_sql/core.clj @@ -7,8 +7,7 @@ [clojure-sql.util :as u] [clojure.walk])) - -(defmacro pull [ns & vlist] +(defmacro ^:private pull [ns & vlist] `(do ~@(for [i vlist :let [sym (symbol (name ns) (name i))]] `(def ~(with-meta i diff --git a/src/clojure_sql/dsl.clj b/src/clojure_sql/dsl.clj index 73de216..25ae6f8 100644 --- a/src/clojure_sql/dsl.clj +++ b/src/clojure_sql/dsl.clj @@ -10,15 +10,6 @@ ;; The DSL for making query maps ;; ============================================================== -;; important sections: -;; -PROJECTION- -;; -TABLES- -;; -FILTERS- -;; -SORTING- -;; -GROUPING- -;; -GROUPED FILTERS- - - ;; { ;; :tables => tablename -> table_alias ;; :fields => (table_alias, fieldname) -> field_alias @@ -215,7 +206,7 @@ Valid join types are :cross, :inner, :outer and :full-outer. An outer join is considered a LEFT outer join. To achieve a right outer - join reverse the query arguments. " + join reverse the query arguments." [left right & {:keys [on type]}] (if (= type :right) (join right left :on on :type :left) |