;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
;;;; *************************************************************************
-(in-package #:clsql)
+(in-package #:clsql-sys)
;; Keep a hashtable for mapping symbols to sql generator functions,
;; for use by the bracketed reader syntax.
(apply #'make-query args))
(defsql sql-any (:symbol "any") (&rest rest)
- (make-instance 'sql-value-exp
- :modifier 'any :components rest))
+ (make-instance 'sql-function-exp
+ :name 'any :args rest))
(defsql sql-some (:symbol "some") (&rest rest)
- (make-instance 'sql-value-exp
- :modifier 'some :components rest))
+ (make-instance 'sql-function-exp
+ :name 'some :args rest))
(defsql sql-all (:symbol "all") (&rest rest)
- (make-instance 'sql-value-exp
- :modifier 'all :components rest))
+ (make-instance 'sql-function-exp
+ :name 'all :args rest))
(defsql sql-not (:symbol "not") (&rest rest)
(make-instance 'sql-value-exp
:operator 'except :sub-expressions rest))
(defsql sql-minus (:symbol "minus") (&rest rest)
- (make-instance 'sql-value-exp
- :modifier 'minus :components rest))
+ (make-instance 'sql-set-exp
+ :operator 'except :sub-expressions rest))
(defsql sql-limit (:symbol "limit") (&rest rest)
(make-instance 'sql-query-modifier-exp
:components '|NOT NULL|))
(defsql sql-exists (:symbol "exists") (&rest rest)
- (make-instance 'sql-value-exp
- :modifier 'exists :components rest))
+ (make-instance 'sql-function-exp
+ :name 'exists :args rest))
(defsql sql-* (:symbol "*") (&rest rest)
(if (zerop (length rest))
(defsql sql-in (:symbol "in") (&rest rest)
(make-instance 'sql-relational-exp
- :operator 'in :sub-expressions rest))
+ :operator 'in :sub-expressions rest))
-(defsql sql-concat (:symbol "||") (&rest rest)
+(defsql sql-concat (:symbol "concat") (&rest rest)
(make-instance 'sql-relational-exp
:operator '\|\| :sub-expressions rest))
(if (= (length rest) 3)
(make-instance 'sql-function-exp
:name 'substring :args rest)
- (error 'clsql-sql-syntax-error "SUBSTR must have 3 arguments.")))
+ (error 'sql-user-error :message "SUBSTR must have 3 arguments.")))
(defsql sql-is (:symbol "is") (&rest rest)
(make-instance 'sql-relational-exp
(defsql sql-between (:symbol "between") (&rest rest)
(if (= (length rest) 3)
(make-instance 'sql-between-exp :name 'between :args rest)
- (error 'clsql-sql-syntax-error "BETWEEN must have 3 arguments.")))
+ (error 'sql-user-error :message "BETWEEN must have 3 arguments.")))
(defsql sql-distinct (:symbol "distinct") (&rest rest)
(make-instance 'sql-query-modifier-exp :modifier 'distinct
:components rest))
+(defsql sql-coalesce (:symbol "coalesce") (&rest rest)
+ (make-instance 'sql-function-exp
+ :name 'coalesce :args rest))
+
+(defsql sql-nvl (:symbol "nvl") (&rest rest)
+ (make-instance 'sql-function-exp
+ :name 'coalesce :args rest))