X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql%2Fclasses.lisp;h=b7cd0c6b95f16157ecfba0748f1d973c372edab8;hb=f69c5bfba59d54628f9a08b83413ec3df3c92432;hp=df84cd4b8d5ff9dad158ecb7c1d03c7404839515;hpb=9a70270bf9a1d60323ded33ce52bd0904544c70b;p=clsql.git

diff --git a/sql/classes.lisp b/sql/classes.lisp
index df84cd4..b7cd0c6 100644
--- a/sql/classes.lisp
+++ b/sql/classes.lisp
@@ -436,22 +436,30 @@ uninclusive, and the args from that keyword to the end."
         select-args)))
 
 (defun make-query (&rest args)
-  (multiple-value-bind (selections arglist)
-      (query-get-selections args)
-    (destructuring-bind (&key all flatp set-operation distinct from where
-                              group-by having order-by order-by-descending
-                              offset limit &allow-other-keys)
-        arglist
-      (if (null selections)
-          (error "No target columns supplied to select statement."))
-      (if (null from)
-          (error "No source tables supplied to select statement."))
-      (make-instance 'sql-query :selections selections
-                     :all all :flatp flatp :set-operation set-operation
-                     :distinct distinct :from from :where where
-                     :limit limit :offset offset
-                     :group-by group-by :having having :order-by order-by
-                     :order-by-descending order-by-descending))))
+  (flet ((select-objects (target-args)
+           (and target-args
+                (every #'(lambda (arg)
+                           (and (symbolp arg)
+                                (find-class arg nil)))
+                       target-args))))
+    (multiple-value-bind (selections arglist)
+	(query-get-selections args)
+      (if (select-objects selections) 
+	  (apply #'select args)
+	  (destructuring-bind (&key all flatp set-operation distinct from where
+				    group-by having order-by order-by-descending
+				    offset limit &allow-other-keys)
+	      arglist
+	    (if (null selections)
+		(error "No target columns supplied to select statement."))
+	    (if (null from)
+		(error "No source tables supplied to select statement."))
+	    (make-instance 'sql-query :selections selections
+			   :all all :flatp flatp :set-operation set-operation
+			   :distinct distinct :from from :where where
+			   :limit limit :offset offset
+			   :group-by group-by :having having :order-by order-by
+			   :order-by-descending order-by-descending))))))
 
 (defvar *in-subselect* nil)