diff options
| author | Carlo Zancanaro <carlo@clearboxsystems.com.au> | 2013-06-16 01:26:31 +1000 |
|---|---|---|
| committer | Carlo Zancanaro <carlo@clearboxsystems.com.au> | 2013-06-16 01:26:31 +1000 |
| commit | 4ab5ae273750c0d52ec72f103fe9165b52d2abb6 (patch) | |
| tree | e44bea2b9bdbc117dc7530334b756e4b1574597b /src/clojure_sql/dsl.clj | |
| parent | 233e9bd34462d3b02a7a3af148994f9a013b34ab (diff) | |
Fix up some more join stuff, and a bit of sorting stuff.
Diffstat (limited to 'src/clojure_sql/dsl.clj')
| -rw-r--r-- | src/clojure_sql/dsl.clj | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/clojure_sql/dsl.clj b/src/clojure_sql/dsl.clj index a75b8f7..6f01198 100644 --- a/src/clojure_sql/dsl.clj +++ b/src/clojure_sql/dsl.clj @@ -157,18 +157,19 @@ (assoc query :sort-by (for [field fields-seq] (if (vector? field) - (resolve-field table-name (:fields query) field) + [(resolve-field table-name (:fields query) (first field)) (second field)] [(resolve-field table-name (:fields query) field) :asc]))))) (let [id 10] - (-> (table :x) + (-> (table {:x :carlo-table}) (project [:x]) (select `(and (in :x [1 2 3 :y]) (= :x ~id))) (join (-> (table :y) (project [:y])) - :on `(= :x :y)) + :on `(= :x :y) + :type :left) (join (-> (table :z) (project [:x]))) - (sort-by [:x]))) + (sort-by [[:x :desc]]))) |