Automated commit for debian release 6.7.2-1

[clsql.git] / sql / fddl.lisp

diff --git a/sql/fddl.lisp b/sql/fddl.lisp
index 267ee290f1dfe583650f68a39e2c73e4f4d55119..c4fc1955a3e3a66c7ec76a98bde7db61a1978aed 100644 (file)
--- a/sql/fddl.lisp
+++ b/sql/fddl.lisp
@@ -309,8 +309,10 @@ nil by default which means that only attributes owned by users
 are listed. If OWNER is a string denoting a user name, only
 attributes owned by OWNER are listed. If OWNER is :all then all
 attributes are listed."
-  (database-list-attributes (escaped-database-identifier name database) database
-                            :owner owner))
+  (database-list-attributes
+   (database-identifier name database)
+   database
+   :owner owner))
 
 (defun attribute-type (attribute table &key (owner nil)
                                  (database *default-database*))
@@ -323,8 +325,8 @@ returned. If OWNER is a string denoting a user name, the
 attribute, if it exists, must be owned by OWNER else nil is
 returned, whereas if OWNER is :all then the attribute, if it
 exists, will be returned regardless of its owner."
-  (database-attribute-type (escaped-database-identifier attribute database)
-                           (escaped-database-identifier table database)
+  (database-attribute-type (database-identifier attribute database)
+                           (database-identifier table database)
                            database
                            :owner owner))
 
@@ -342,15 +344,16 @@ second element is its SQL type, the third is the type precision,
 the fourth is the scale of the attribute and the fifth is 1 if
 the attribute accepts null values and otherwise 0."
   (with-slots (attribute-cache) database
-    (let ((table-ident (escaped-database-identifier table database)))
-      (multiple-value-bind (val found) (gethash table-ident attribute-cache)
+    (let ((table-ident (database-identifier table database)))
+      (multiple-value-bind (val found)
+          (gethash table attribute-cache)
         (if (and found (second val))
             (second val)
             (let ((types (mapcar #'(lambda (attribute)
                                      (cons attribute
                                            (multiple-value-list
                                             (database-attribute-type
-                                             (escaped-database-identifier attribute
+                                             (database-identifier attribute
                                                                   database)
                                              table-ident
                                              database
@@ -359,10 +362,10 @@ the attribute accepts null values and otherwise 0."
                                                   :owner owner))))
               (cond
                 ((and (not found) (eq t *cache-table-queries-default*))
-                 (setf (gethash table-ident attribute-cache)
+                 (setf (gethash table attribute-cache)
                        (list :unspecified types)))
                 ((and found (eq t (first val))
-                      (setf (gethash table-ident attribute-cache)
+                      (setf (gethash table attribute-cache)
                             (list t types)))))
               types))))))