added the '~* ANY' and Array operators / expressions

diff --git a/sql/expressions.lisp b/sql/expressions.lisp
index 63885153259d9fad208f1a9bc3636372936e340e..971609e2e68eee3cc2f171f24800cda10c77d71d 100644 (file)
--- a/sql/expressions.lisp
+++ b/sql/expressions.lisp
@@ -257,6 +257,28 @@
       (write-char #\) *sql-stream*)))
   t)
 
+(defclass sql-array-exp (sql-relational-exp)
+  ()
+  (:documentation "An SQL relational expression."))
+
+(defmethod output-sql ((expr sql-array-exp) database)
+  (with-slots (operator sub-expressions)
+    expr
+    (let ((subs (if (consp (car sub-expressions))
+                    (car sub-expressions)
+                    sub-expressions)))
+      (write-char #\( *sql-stream*)
+      (output-sql operator database)
+      (write-char #\[ *sql-stream*)
+      (do ((sub subs (cdr sub)))
+          ((null (cdr sub)) (output-sql (car sub) database))
+        (output-sql (car sub) database)
+        (write-char #\, *sql-stream*)
+        (write-char #\Space *sql-stream*))
+      (write-char #\] *sql-stream*)
+      (write-char #\) *sql-stream*)))
+  t)
+
 (defclass sql-upcase-like (sql-relational-exp)
   ()
   (:documentation "An SQL 'like' that upcases its arguments."))

diff --git a/sql/operations.lisp b/sql/operations.lisp
index 1b52925347434b6e6d56325d7a8ce35a164bc39b..3357761e53a257312bf9ce93793dcdcededb3127 100644 (file)
--- a/sql/operations.lisp
+++ b/sql/operations.lisp
@@ -128,6 +128,16 @@
   (make-instance 'sql-relational-exp
                  :operator '~* :sub-expressions rest))
 
+(defsql |sql-~* ANY| (:symbol "~* ANY") (&rest rest)
+       "This is the postgres regex match any in an array"
+  (make-instance 'sql-relational-exp
+                 :operator '|~* ANY| :sub-expressions rest))
+
+(defsql sql-array (:symbol "array") (&rest rest)
+       "This is the postgres regex match any in an array"
+  (make-instance 'sql-array-exp
+                 :operator 'array :sub-expressions rest))
+
 (defsql sql-uplike (:symbol "uplike") (&rest rest)
   (make-instance 'sql-upcase-like
                  :sub-expressions rest))