X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql%2Fclasses.lisp;h=9e2338cb9731bfd292713afcb4bb38f8d1727299;hb=f246c3c7b48792a869cb1bae0637a2f00a0920bd;hp=1be0e0b3d9f0728b53192ecd79b1eb506b30673a;hpb=90011694c27b5b22673a34cb6948a2a721a9b6cd;p=clsql.git

diff --git a/sql/classes.lisp b/sql/classes.lisp
index 1be0e0b..9e2338c 100644
--- a/sql/classes.lisp
+++ b/sql/classes.lisp
@@ -426,6 +426,20 @@
     :initform nil))
   (:documentation "An SQL SELECT query."))
 
+(defclass sql-object-query (%sql-expression)
+  ((objects
+    :initarg :objects
+    :initform nil)
+   (flatp
+    :initarg :flatp
+    :initform nil)
+   (exp
+    :initarg :exp
+    :initform nil)
+   (refresh
+    :initarg :refresh
+    :initform nil)))
+
 (defmethod collect-table-refs ((sql sql-query))
   (remove-duplicates (collect-table-refs (slot-value sql 'where))
                      :test (lambda (tab1 tab2)
@@ -459,7 +473,10 @@ uninclusive, and the args from that keyword to the end."
     (multiple-value-bind (selections arglist)
 	(query-get-selections args)
       (if (select-objects selections) 
-	  (apply #'select args)
+	  (destructuring-bind (&key flatp refresh &allow-other-keys) arglist
+	    (make-instance 'sql-object-query :objects selections
+			   :flatp flatp :refresh refresh
+			   :exp arglist))
 	  (destructuring-bind (&key all flatp set-operation distinct from where
 				    group-by having order-by order-by-descending
 				    offset limit inner-join on &allow-other-keys)
@@ -542,6 +559,13 @@ uninclusive, and the args from that keyword to the end."
       (write-string ")" *sql-stream*)))
   t)
 
+(defmethod output-sql ((query sql-object-query) database)
+  (with-slots (objects)
+      query
+    (when objects
+      (format *sql-stream* "(~{~A~^ ~})" objects))))
+
+
 ;; INSERT
 
 (defclass sql-insert (%sql-expression)