r10546: 18 May 2005 Kevin Rosenberg <kevin@rosenberg.net>

[clsql.git] / sql / syntax.lisp

diff --git a/sql/syntax.lisp b/sql/syntax.lisp
index 514f410438ede39fb8f33c09c37c435b2a60832c..5ad83d8ca2c27f6ed6859cf7845abf823191e389 100644 (file)
--- a/sql/syntax.lisp
+++ b/sql/syntax.lisp
@@ -88,13 +88,19 @@ reader syntax is disabled."
 (defun sql-reader-open (stream char)
   (declare (ignore char))
   (let ((sqllist (read-delimited-list #\] stream t)))
-    (cond ((string= (write-to-string (car sqllist)) "||")
-           (cons (sql-operator 'concat-op) (cdr sqllist)))
-          ((and (= (length sqllist) 1) (eql (car sqllist) '*))
-           (apply #'generate-sql-reference sqllist))
-          ((sql-operator (car sqllist))
-           (cons (sql-operator (car sqllist)) (cdr sqllist)))
-          (t (apply #'generate-sql-reference sqllist)))))
+    (unless *read-suppress*
+      (handler-case
+         (cond ((string= (write-to-string (car sqllist)) "||")
+                (cons (sql-operator 'concat-op) (cdr sqllist)))
+               ((and (= (length sqllist) 1) (eql (car sqllist) '*))
+                (apply #'generate-sql-reference sqllist))
+               ((sql-operator (car sqllist))
+                (cons (sql-operator (car sqllist)) (cdr sqllist)))
+               (t (apply #'generate-sql-reference sqllist)))
+       (sql-user-error (c)
+         (error 'sql-user-error
+                :message (format nil "Error ~A occured while attempting to parse '~A' at file position ~A"
+                                 (sql-user-error-message c) sqllist (file-position stream))))))))
 
 (defun disable-sql-close-syntax ()
   "Internal function that disables the close syntax when leaving
@@ -134,17 +140,23 @@ reader syntax is disabled."
 ;; Exported functions for dealing with SQL syntax 
 
 (defun sql (&rest args)
-  "Returns an SQL string generated from the SQL expressions
-ARGS. The expressions are translated into SQL strings and then
-concatenated with a single space delimiting each expression."
+  "Returns an SQL string generated from the expressions ARGS. The
+expressions are translated into SQL strings and then concatenated
+with a single space delimiting each expression. An error of type
+SQL-USER-ERROR is signalled if any element in ARGS is not of the
+supported types (a symbol, string, number or symbolic SQL
+expression) or a list or vector containing only these supported
+types."
   (format nil "~{~A~^ ~}" (mapcar #'sql-output args)))
 
 (defun sql-expression (&key string table alias attribute type)
-  "Returns an SQL expression constructed from the supplied arguments
-which may be combined as follows: ATTRIBUTE and TYPE; ATTRIBUTE;
-ALIAS or TABLE and ATTRIBUTE and TYPE; ALIAS or TABLE and
-ATTRIBUTE; TABLE, ATTRIBUTE and TYPE; TABLE and ATTRIBUTE; TABLE
-and ALIAS; TABLE; and STRING."
+  "Returns an SQL expression constructed from the supplied
+arguments which may be combined as follows: ATTRIBUTE and TYPE;
+ATTRIBUTE; ALIAS or TABLE and ATTRIBUTE and TYPE; ALIAS or TABLE
+and ATTRIBUTE; TABLE, ATTRIBUTE and TYPE; TABLE and ATTRIBUTE;
+TABLE and ALIAS; TABLE; and STRING. An error of type
+SQL-USER-ERROR is signalled if an unsupported combination of
+keyword arguments is specified."
   (cond
     (string
      (make-instance 'sql :string string))
@@ -156,24 +168,29 @@ and ALIAS; TABLE; and STRING."
      (make-instance 'sql-ident-table :name table
                     :table-alias alias))))
 
-(defun sql-operator (operation)
-  "Returns the Lisp symbol corresponding to the SQL operation
-  represented by the symbol OPERATION."
-  (typecase operation
+(defun sql-operator (operator)
+  "Returns the Lisp symbol corresponding to the SQL operator
+  represented by the symbol OPERATOR. If OPERATOR does not
+  represent a supported SQL operator or is not a symbol, nil is
+  returned."
+  (typecase operator
     (string nil)
-    (symbol (values (gethash (symbol-name-default-case (symbol-name operation))
+    (symbol (values (gethash (symbol-name-default-case (symbol-name operator))
                              *sql-op-table*)))))
 
-(defun sql-operation (operation &rest rest)
-  "Returns an SQL expression constructed from the supplied SQL
-operator or function OPERATION and its arguments REST. If
-OPERATION is passed the symbol FUNCTION then the first value in
-REST is taken to be a valid SQL function and the remaining values
-in REST its arguments."
-  (if (sql-operator operation)
-      (apply (symbol-function (sql-operator operation)) rest)
+(defun sql-operation (operator &rest args)
+  "Returns an SQL expression constructed from the supplied symbol
+OPERATOR representing an SQL operator or function and its
+arguments ARGS. An error of type SQL-USER-ERROR is signalled if
+OPERATOR is not a symbol representing a supported SQL
+operator. If OPERATOR is passed the symbol FUNCTION then the
+first value in ARGS must be a string representing a valid SQL
+function and the remaining values in ARGS its arguments as
+strings."
+  (if (sql-operator operator)
+      (apply (symbol-function (sql-operator operator)) args)
       (error 'sql-user-error 
              :message 
-             (format nil "~A is not a recognized SQL operator." operation))))
+             (format nil "~A is not a recognized SQL operator." operator))))