*** /home/timur/.sbcl/site/postmodern-1.12/s-sql/s-sql.lisp~	2008-04-30 00:42:23.000000000 +0400
--- /home/timur/.sbcl/site/postmodern-1.12/s-sql/s-sql.lisp	2008-07-04 12:38:50.000000000 +0400
***************
*** 493,499 ****
  (defun expand-joins (args)
    "Helper for the select operator. Turns the part following :from into
  the proper SQL syntax for joining tables."
!   (labels ((is-join (x) (member x '(:left-join :right-join :inner-join :cross-join))))
      (when (null args)
        (error "Empty :from clause in select"))
      (when (is-join (car args))
--- 493,500 ----
  (defun expand-joins (args)
    "Helper for the select operator. Turns the part following :from into
  the proper SQL syntax for joining tables."
!   (labels ((is-join (x) (member x '(:left-join :right-join :inner-join :cross-join
!                                     :outer-join))))
      (when (null args)
        (error "Empty :from clause in select"))
      (when (is-join (car args))
***************
*** 508,514 ****
                                  (error "Incorrect join form in select."))
                                `(" " ,(ecase join
                                          (:left-join "LEFT") (:right-join "RIGHT")
!                                         (:inner-join "INNER") (:cross-join "CROSS"))
                                  " JOIN " ,@(sql-expand name)
                                  " ON " ,@(sql-expand clause))))
                            (t (prog1 `(,@(if first () '(", ")) ,@(sql-expand (car rest)))
--- 509,516 ----
                                  (error "Incorrect join form in select."))
                                `(" " ,(ecase join
                                          (:left-join "LEFT") (:right-join "RIGHT")
!                                         (:inner-join "INNER") (:cross-join "CROSS")
!                                         (:outer-join "FULL OUTER"))
                                  " JOIN " ,@(sql-expand name)
                                  " ON " ,@(sql-expand clause))))
                            (t (prog1 `(,@(if first () '(", ")) ,@(sql-expand (car rest)))