;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
;;;; *************************************************************************
-(in-package #:clsql-sys)
+(in-package #:clsql)
(defvar +empty-string+ "''")
(if (and (not qualifier) (not type))
(write-string (sql-escape (convert-to-db-default-case
(symbol-name name) database)) *sql-stream*)
+ ;;; KMR: The TYPE field is used by CommonSQL for type conversion -- it
+ ;;; should not be output in SQL statements
+ #+ignore
(format *sql-stream* "~@[~A.~]~A~@[ ~A~]"
(when qualifier
- (convert-to-db-default-case (sql-escape qualifier) database))
+ (convert-to-db-default-case (sql-escape qualifier) database))
(sql-escape (convert-to-db-default-case name database))
(when type
- (convert-to-db-default-case (symbol-name type) database))))
+ (convert-to-db-default-case (symbol-name type) database)))
+ (format *sql-stream* "~@[~A.~]~A"
+ (when qualifier
+ (convert-to-db-default-case (sql-escape qualifier) database))
+ (sql-escape (convert-to-db-default-case name database))))
t))
(defmethod output-sql-hash-key ((expr sql-ident-attribute) database)
:initform nil)
(order-by-descending
:initarg :order-by-descending
+ :initform nil)
+ (inner-join
+ :initarg :inner-join
+ :initform nil)
+ (on
+ :initarg :on
: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)
(defvar *select-arguments*
'(:all :database :distinct :flatp :from :group-by :having :order-by
- :order-by-descending :set-operation :where :offset :limit))
+ :order-by-descending :set-operation :where :offset :limit
+ :inner-join :on))
(defun query-arg-p (sym)
(member sym *select-arguments*))
(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 &allow-other-keys)
+ offset limit inner-join on &allow-other-keys)
arglist
(if (null selections)
(error "No target columns supplied to select statement."))
: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))))))
+ :order-by-descending order-by-descending
+ :inner-join inner-join :on on))))))
(defvar *in-subselect* nil)
(defmethod output-sql ((query sql-query) database)
(with-slots (distinct selections from where group-by having order-by
- order-by-descending limit offset)
+ order-by-descending limit offset inner-join on)
query
(when *in-subselect*
(write-string "(" *sql-stream*))
(output-sql distinct database)
(write-char #\Space *sql-stream*)))
(output-sql (apply #'vector selections) database)
- (write-string " FROM " *sql-stream*)
- (if (listp from)
- (output-sql (apply #'vector from) database)
- (output-sql from database))
+ (when from
+ (write-string " FROM " *sql-stream*)
+ (if (listp from)
+ (output-sql (apply #'vector from) database)
+ (output-sql from database)))
+ (when inner-join
+ (write-string " INNER JOIN " *sql-stream*)
+ (output-sql inner-join database))
+ (when on
+ (write-string " ON " *sql-stream*)
+ (output-sql on database))
(when where
(write-string " WHERE " *sql-stream*)
(let ((*in-subselect* t))
(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)