X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=sql%2Fclasses.lisp;h=80d735c1ee07eed15b4a6d13f20d35116382477f;hp=bd87f785648f2cebcac80f7e1d9084a90fd97300;hb=21ae7203d719886a1f044992e463d5f463727ac0;hpb=d0b59237966d6fbc27adcbbae11fa85087ea122d diff --git a/sql/classes.lisp b/sql/classes.lisp index bd87f78..80d735c 100644 --- 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 @@ -662,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)) @@ -768,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))