r10435: 21 Apr 2005 Kevin Rosenberg <kevin@rosenberg.net>

        * sql/syntax: Commit patch from Alan Shields to supress reader
        macros when *read-supress* is T.

diff --git a/ChangeLog b/ChangeLog
index 4f4a900a0c7eed8975c16f2c6841a49b39c408d6..8dffcbfde67862866db4b96a7604bc2d23889166 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+21 Apr 2005 Kevin Rosenberg <kevin@rosenberg.net>
+       * sql/syntax: Commit patch from Alan Shields to supress reader
+       macros when *read-supress* is T.
+       
 13 Apr 2005 Kevin Rosenberg <kevin@rosenberg.net>
        * Version 3.1.10
        * db-postgresql-socket/postgresql-socket-api.lisp: Commit patch

diff --git a/sql/syntax.lisp b/sql/syntax.lisp
index a898dfb47baf7aeef3a4038ed49309244c5ef05a..5ad83d8ca2c27f6ed6859cf7845abf823191e389 100644 (file)
--- a/sql/syntax.lisp
+++ b/sql/syntax.lisp
@@ -88,18 +88,19 @@ reader syntax is disabled."
 (defun sql-reader-open (stream char)
   (declare (ignore char))
   (let ((sqllist (read-delimited-list #\] stream t)))
-    (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)))))))
+    (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