projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r9166: Automated commit for clsql debian-version-2.9.4-2
[clsql.git]
/
sql
/
classes.lisp
diff --git
a/sql/classes.lisp
b/sql/classes.lisp
index c6cf764ab9debdfea53a8c2494aa77883702f92d..df84cd4b8d5ff9dad158ecb7c1d03c7404839515 100644
(file)
--- a/
sql/classes.lisp
+++ b/
sql/classes.lisp
@@
-147,11
+147,14
@@
(with-slots (qualifier name type params)
expr
(if (and (not qualifier) (not type))
(with-slots (qualifier name type params)
expr
(if (and (not qualifier) (not type))
- (write-string (sql-escape (convert-to-db-default-case (symbol-name name) database)) *sql-stream*)
+ (write-string (sql-escape (convert-to-db-default-case
+ (symbol-name name) database)) *sql-stream*)
(format *sql-stream* "~@[~A.~]~A~@[ ~A~]"
(format *sql-stream* "~@[~A.~]~A~@[ ~A~]"
- (if qualifier (sql-escape qualifier) qualifier)
+ (when qualifier
+ (convert-to-db-default-case (sql-escape qualifier) database))
(sql-escape (convert-to-db-default-case name database))
(sql-escape (convert-to-db-default-case name database))
- type))
+ (when type
+ (convert-to-db-default-case (symbol-name type) database))))
t))
(defmethod output-sql-hash-key ((expr sql-ident-attribute) database)
t))
(defmethod output-sql-hash-key ((expr sql-ident-attribute) database)
@@
-170,7
+173,7
@@
(declare (ignore environment))
(with-slots (alias name)
sql
(declare (ignore environment))
(with-slots (alias name)
sql
- `(make-instance 'sql-ident-table :name
name :
alias ',alias)))
+ `(make-instance 'sql-ident-table :name
',name :table-
alias ',alias)))
(defun generate-sql (expr database)
(let ((*sql-stream* (make-string-output-stream)))
(defun generate-sql (expr database)
(let ((*sql-stream* (make-string-output-stream)))
@@
-690,8
+693,9
@@
uninclusive, and the args from that keyword to the end."
;; Column constraint types
;;
(defparameter *constraint-types*
;; Column constraint types
;;
(defparameter *constraint-types*
- '(("NOT-NULL" . "NOT NULL")
- ("PRIMARY-KEY" . "PRIMARY KEY")))
+ (list
+ (cons (symbol-name-default-case "NOT-NULL") "NOT NULL")
+ (cons (symbol-name-default-case "PRIMARY-KEY") "PRIMARY KEY")))
;;
;; Convert type spec to sql syntax
;;
;; Convert type spec to sql syntax