X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql%2Fclasses.lisp;h=872830f7ebf1bba5e39e66fb5e568a73c77eb35a;hb=21ffe5f820036726c6353a16dfb478fb41aa700c;hp=a829d3894cbe4aa8e0e4767d247a05071a087a6e;hpb=f1ff5842ce264fbe47e8ef98e33e4aca3b71d863;p=clsql.git

diff --git a/sql/classes.lisp b/sql/classes.lisp
index a829d38..872830f 100644
--- a/sql/classes.lisp
+++ b/sql/classes.lisp
@@ -160,7 +160,10 @@
 		(convert-to-db-default-case (symbol-name type) database)))
       (format *sql-stream* "~@[~A.~]~A"
 	      (when qualifier
-		(convert-to-db-default-case (sql-escape qualifier) database))
+                (typecase qualifier 
+                  (string (format nil "~s" qualifier))
+                  (t (convert-to-db-default-case (sql-escape qualifier) 
+                                                 database))))
 	      (sql-escape (convert-to-db-default-case name database))))
     t))
 
@@ -579,9 +582,12 @@ uninclusive, and the args from that keyword to the end."
     (output-sql (apply #'vector selections) database)
     (when from
       (write-string " FROM " *sql-stream*)
-      (if (listp from)
-	  (output-sql (apply #'vector from) database)
-	(output-sql from database)))
+      (typecase from 
+        (list (output-sql (apply #'vector from) database))
+        (string (write-string 
+                 (sql-escape 
+                  (convert-to-db-default-case from database)) *sql-stream*))
+        (t (output-sql from database))))
     (when inner-join
       (write-string " INNER JOIN " *sql-stream*)
       (output-sql inner-join database))