r9456: relax type for server-version

[clsql.git] / sql / classes.lisp

diff --git a/sql/classes.lisp b/sql/classes.lisp
index bf74b6ecc3e4c8e6f01fee30820eaa91517421bf..80d735c1ee07eed15b4a6d13f20d35116382477f 100644 (file)
--- a/sql/classes.lisp
+++ b/sql/classes.lisp
@@ -100,8 +100,7 @@
            (call-next-method)))))
 
 (defmethod output-sql ((expr sql-ident) database)
-  (with-slots (name)
-      expr
+  (with-slots (name) expr
     (write-string
      (convert-to-db-default-case 
       (etypecase name
@@ -141,11 +140,16 @@
       :type ',type)))
 
 (defmethod output-sql ((expr sql-ident-attribute) database)
-  (with-slots (qualifier name type)
-      expr
+  (with-slots (qualifier name type) expr
     (if (and (not qualifier) (not type))
-       (write-string (sql-escape (convert-to-db-default-case 
-                                  (symbol-name name) database)) *sql-stream*)
+       (etypecase name
+         ;; Honor care of name
+         (string
+          (write-string name *sql-stream*))
+         (symbol
+          (write-string (sql-escape (convert-to-db-default-case 
+                                     (symbol-name name) database)) *sql-stream*)))
+      
        ;;; KMR: The TYPE field is used by CommonSQL for type conversion -- it
       ;;; should not be output in SQL statements
       #+ignore
@@ -581,9 +585,7 @@ uninclusive, and the args from that keyword to the end."
       (write-string " FROM " *sql-stream*)
       (typecase from 
         (list (output-sql (apply #'vector from) database))
-        (string (write-string 
-                 (sql-escape 
-                  (convert-to-db-default-case from database)) *sql-stream*))
+        (string (write-string from *sql-stream*))
         (t (output-sql from database))))
     (when inner-join
       (write-string " INNER JOIN " *sql-stream*)
@@ -659,7 +661,11 @@ uninclusive, and the args from that keyword to the end."
   (with-slots (into attributes values query)
     ins
     (write-string "INSERT INTO " *sql-stream*)
-    (output-sql into database)
+    (output-sql 
+     (typecase into
+       (string (sql-expression :attribute into))
+       (t into)) 
+     database)
     (when attributes
       (write-char #\Space *sql-stream*)
       (output-sql attributes database))
@@ -765,7 +771,8 @@ uninclusive, and the args from that keyword to the end."
                (write-char #\Space *sql-stream*)
                (write-string
                 (if (stringp db-type) db-type ; override definition
-                    (database-get-type-specifier (car type) (cdr type) database))
+                 (database-get-type-specifier (car type) (cdr type) database
+                                              (database-underlying-type database)))
                 *sql-stream*)
                (let ((constraints (database-constraint-statement  
                                    (if (and db-type (symbolp db-type))