X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql%2Fgeneric-postgresql.lisp;h=178b3b0473901ac0909fd64381a2de2b816620db;hb=534849c88501e0ea2ee5dbf78d13d8cb73814d71;hp=ecf6ddfde7ca2f404147c08aca113c95ec8e5e9a;hpb=f1d668746523a72a6893a46380468a9e033545e4;p=clsql.git

diff --git a/sql/generic-postgresql.lisp b/sql/generic-postgresql.lisp
index ecf6ddf..178b3b0 100644
--- a/sql/generic-postgresql.lisp
+++ b/sql/generic-postgresql.lisp
@@ -140,10 +140,11 @@
               database nil nil))
        result))))
 
-(defmethod database-list-attributes ((table string)
+(defmethod database-list-attributes ((table %database-identifier)
                                      (database generic-postgresql-database)
                                      &key (owner nil))
-  (let* ((owner-clause
+  (let* ((table (unescaped-database-identifier table))
+         (owner-clause
           (cond ((stringp owner)
                  (format nil " AND (relowner=(SELECT usesysid FROM pg_user WHERE usename='~A'))" owner))
                 ((null owner) " AND (not (relowner=1))")
@@ -166,9 +167,12 @@
                                                "tableoid") :test #'equal))
                    result))))
 
-(defmethod database-attribute-type (attribute (table string)
+(defmethod database-attribute-type ((attribute %database-identifier)
+                                    (table %database-identifier)
                                     (database generic-postgresql-database)
-                                    &key (owner nil))
+                                    &key (owner nil)
+                                    &aux (table (unescaped-database-identifier table))
+                                    (attribute (unescaped-database-identifier attribute)))
   (let ((row (car (database-query
                    (format nil "SELECT pg_type.typname,pg_attribute.attlen,pg_attribute.atttypmod,pg_attribute.attnotnull FROM pg_type,pg_class,pg_attribute WHERE pg_class.oid=pg_attribute.attrelid AND pg_class.relname='~A' AND pg_attribute.attname='~A' AND pg_attribute.atttypid=pg_type.oid~A"
                            (string-downcase table)
@@ -280,11 +284,8 @@
 
 (defmethod database-add-autoincrement-sequence
     ((self standard-db-class) (database generic-postgresql-database))
-  (let ((ordered-slots (if (normalizedp self)
-                           (ordered-class-direct-slots self)
-                           (ordered-class-slots self))))
+  (let ((ordered-slots (slots-for-possibly-normalized-class self)))
     (dolist (slotdef ordered-slots)
-
       ;; ensure that referenceed sequences actually exist before referencing them
       (let ((sequence-name (auto-increment-sequence-name self slotdef database)))
         (when (and sequence-name
@@ -294,10 +295,7 @@
 (defmethod database-remove-autoincrement-sequence
     ((table standard-db-class)
      (database generic-postgresql-database))
-  (let ((ordered-slots
-          (if (normalizedp table)
-              (ordered-class-direct-slots table)
-              (ordered-class-slots table))))
+  (let ((ordered-slots (slots-for-possibly-normalized-class table)))
     (dolist (slotdef ordered-slots)
       ;; ensure that referenceed sequences are dropped with the table
       (let ((sequence-name (auto-increment-sequence-name table slotdef database)))