From 534a26be238d2e54737488acfa96456905e57646 Mon Sep 17 00:00:00 2001 From: Russ Tyndall Date: Sun, 12 Jun 2011 11:58:39 -0400 Subject: [PATCH] changed generate-sql-reference to read [foo bar] and [foo.bar] as the same attribute expression --- sql/syntax.lisp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/sql/syntax.lisp b/sql/syntax.lisp index 4ec07f5..68fa8aa 100644 --- a/sql/syntax.lisp +++ b/sql/syntax.lisp @@ -110,9 +110,17 @@ reader syntax is disabled." (defun generate-sql-reference (&rest arglist) (cond ((= (length arglist) 1) ; string, table or attribute - (if (stringp (car arglist)) - (sql-expression :string (car arglist)) - (sql-expression :attribute (car arglist)))) + (let ((arg (first arglist))) + (typecase arg + (string (sql-expression :string arg)) + (symbol ;; handle . separated names + (let* ((sn (symbol-name arg)) + (idx (position #\. sn))) + (cond + (idx (sql-expression :table (intern (subseq sn 0 idx)) + :attribute (intern (subseq sn (+ idx 1))) )) + (T (sql-expression :attribute arg)))) + )))) ((<= 2 (length arglist)) (let ((sqltype (when (keywordp (caddr arglist)) (caddr arglist) nil))) (cond -- 2.34.1