Skip to content
This repository
Browse code

Bumped version to BETA2

  • Loading branch information...
commit d73c671571d149d86c9036a1ffdc2ed6118dc59f 1 parent 0fa2864
Lau B. Jensen authored
4  README.md
Source Rendered
@@ -21,14 +21,14 @@ Add the following to your **project.clj** or pom.xml:
21 21
 
22 22
 Cake/Lein artifact:
23 23
 
24  
-    [clojureql "1.0.0-beta1-SNAPSHOT"]
  24
+    [clojureql "1.0.0-beta2-SNAPSHOT"]
25 25
 
26 26
 Maven:
27 27
 
28 28
     <dependency>
29 29
       <groupId>clojureql</groupId>
30 30
       <artifactId>clojureql</artifactId>
31  
-      <version>1.0.0-beta1-SNAPSHOT</version>
  31
+      <version>1.0.0-beta2-SNAPSHOT</version>
32 32
     </dependency>
33 33
 
34 34
 Then execute
2  project.clj
... ...
@@ -1,4 +1,4 @@
1  
-(defproject clojureql "1.0.0-beta1-SNAPSHOT"
  1
+(defproject clojureql "1.0.0-beta2-SNAPSHOT"
2 2
   :description      "SQL abstractions for Clojure"
3 3
   :dependencies     [[org.clojure/clojure         "1.2.0"]
4 4
                      [org.clojure/clojure-contrib "1.2.0"]]
11  src/clojureql/core.clj
@@ -159,12 +159,12 @@
159 159
 (defmacro where [clause]
160 160
   "Constructs a where-clause for queries.
161 161
 
162  
-   (where (or (< :a 2) (>= :b 4))) => \"((a < 2) OR (b >= 4))\"
  162
+   (where (or (< :a 2) (>= :b 4))) => \"((a < ?) OR (b >= ?))\"
163 163
 
164  
-   Strings are auto quoted. Typically you will use this in conjunction with
165  
-   select, ie.
  164
+   If you call str on the result, you'll get the above. If you call
  165
+   (:env) you will see the captured environment
166 166
 
167  
-   (select tble (where ...))"
  167
+   Use as: (select tble (where ...))"
168 168
   `(where* ~(into {} (for [[local] &env] [(list 'quote local) local]))
169 169
            '~clause))
170 170
 
@@ -177,6 +177,9 @@
177 177
         (seq (:restriction table)))))
178 178
 
179 179
 (defn extract-aliases
  180
+  " Internal: Looks through the tables in 'joins' and finds tables
  181
+              which requires subselects. It returns a vector of the
  182
+              original name and the new name for each table "
180 183
   [joins]
181 184
   (for [[tbl-or-kwd pred] (map :data joins)
182 185
              :when (requires-subselect? tbl-or-kwd)
2  src/clojureql/predicates.clj
@@ -17,8 +17,6 @@
17 17
                     (str (to-tablename %))
18 18
                     "?"))
19 19
             (join-str (str \space op \space)))
20  
-       ;(join-str op (repeat (count (remove keyword? expression)) " ? "))
21  
-
22 20
        ")"))
23 21
 
24 22
 (defprotocol Predicate

0 notes on commit d73c671

Please sign in to comment.
Something went wrong with that request. Please try again.