Fixed bug when query or delete macros a not given conditions.

weavejester · Apr 21, 2011 · 379ece1 · 379ece1
1 parent e107bfe
commit 379ece1
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/lobos/internal.clj b/src/lobos/internal.clj
@@ -107,8 +107,10 @@
 
 (defmacro query [db-spec sname tname & [conditions]]
   `(query-from-where ~db-spec "select *" ~sname ~tname
-                     (schema/expression ~conditions)))
+                     (when-not ~(nil? conditions)
+                       (schema/expression ~conditions))))
 
 (defmacro delete [db-spec sname tname & [conditions]]
   `(query-from-where ~db-spec "delete" ~sname ~tname
-                     (schema/expression ~conditions)))
+                     (when-not ~(nil? conditions)
+                       (schema/expression ~conditions))))