X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=sql%2Foperations.lisp;h=bc99d2a136eaf02297f8747a9c8e9eb250178393;hp=f05df97bd118d9bb2d26828d9ff1bc3dd97267a4;hb=155c60b5195d618ef93541699694d57a21be3246;hpb=71ac7a8d3e5bea99472b07fa2a089c7173abb1f7

diff --git a/sql/operations.lisp b/sql/operations.lisp
index f05df97..bc99d2a 100644
--- a/sql/operations.lisp
+++ b/sql/operations.lisp
@@ -12,7 +12,7 @@
 ;;;; (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.
@@ -37,16 +37,16 @@
   (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
@@ -65,8 +65,8 @@
 		 :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 
@@ -95,8 +95,8 @@
 		 :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))
@@ -137,9 +137,9 @@
 
 (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))
 
@@ -219,3 +219,10 @@
   (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))