r9361: Support for qualified sql identifiers with aliased table names.

[clsql.git] / sql / syntax.lisp

diff --git a/sql/syntax.lisp b/sql/syntax.lisp
index 371f046614ebe338a2d1325c4760968f184b2835..7a619f0c05b3b9ed848c2b977f8efdd51ed3ee82 100644 (file)
--- a/sql/syntax.lisp
+++ b/sql/syntax.lisp
@@ -14,7 +14,6 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-
 (in-package #:clsql-sys)
 
 (defvar *original-reader-enter* nil)
@@ -85,9 +84,11 @@ syntax is disabled."
 (defun sql-reader-open (stream char)
   (declare (ignore char))
   (let ((sqllist (read-delimited-list #\] stream t)))
-    (if (sql-operator (car sqllist))
-       (cons (sql-operator (car sqllist)) (cdr sqllist))
-      (apply #'generate-sql-reference sqllist))))
+    (cond ((string= (write-to-string (car sqllist)) "||")
+           (cons (sql-operator 'concat) (cdr sqllist)))
+          ((sql-operator (car sqllist))
+           (cons (sql-operator (car sqllist)) (cdr sqllist)))
+          (t (apply #'generate-sql-reference sqllist)))))
 
 ;; Internal function that disables the close syntax when leaving sql context.
 (defun disable-sql-close-syntax ()