(defmethod output-sql ((expr sql-query-modifier-exp) database)
(with-slots (modifier components)
expr
- (output-sql modifier database)
+ (%write-operator modifier database)
(write-string " " *sql-stream*)
(output-sql (car components) database)
(when components
(when *in-subselect*
(write-string "(" *sql-stream*))
(write-string "SELECT " *sql-stream*)
- (when (and limit (eql :mssql (database-underlying-type database)))
- (write-string " TOP " *sql-stream*)
- (output-sql limit database)
- (write-string " " *sql-stream*))
(when all
(write-string " ALL " *sql-stream*))
(when (and distinct (not all))
(write-string " ON " *sql-stream*)
(output-sql distinct database)
(write-char #\Space *sql-stream*)))
+ (when (and limit (eql :mssql (database-underlying-type database)))
+ (write-string " TOP " *sql-stream*)
+ (output-sql limit database)
+ (write-string " " *sql-stream*))
(let ((*in-subselect* t))
(output-sql (apply #'vector selections) database))
(when from
(write-string " FROM " *sql-stream*)
- (flet ((ident-table-equal (a b)
- (and (if (and (eql (type-of a) 'sql-ident-table)
- (eql (type-of b) 'sql-ident-table))
- (string-equal (slot-value a 'alias)
- (slot-value b 'alias))
- t)
- (string-equal (sql-escape (slot-value a 'name))
- (sql-escape (slot-value b 'name))))))
+ (labels ((ident-string-val (a)
+ (typecase a
+ (sql-ident
+ (or (ignore-errors (slot-value a 'alias))
+ (ignore-errors (slot-value a 'name))))
+ (string a)))
+ (ident-table-equal (a b)
+ ;; The things should be type compatable
+ (string-equal (ident-string-val a)
+ (ident-string-val b))))
(typecase from
(list (output-sql (apply #'vector
(remove-duplicates from
(write-string " ON " *sql-stream*)
(output-sql on database))
(when where
- (write-string " WHERE " *sql-stream*)
- (let ((*in-subselect* t))
- (output-sql where database)))
+ (let ((where-out (string-trim
+ '(#\newline #\space #\tab #\return)
+ (with-output-to-string (*sql-stream*)
+ (let ((*in-subselect* t))
+ (output-sql where database))))))
+ (when (> (length where-out) 0)
+ (write-string " WHERE " *sql-stream*)
+ (write-string where-out *sql-stream*))))
(when group-by
(write-string " GROUP BY " *sql-stream*)
(if (listp group-by)
(declaim (inline listify))
(defun listify (x)
- (if (atom x)
- (list x)
- x))
+ (if (listp x)
+ x
+ (list x)))
(defmethod output-sql ((stmt sql-create-table) database)
(flet ((output-column (column-spec)