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))")
"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)
database nil nil))))
(when row
(destructuring-bind (typname attlen atttypmod attnull) row
-
- (setf attlen (parse-integer attlen :junk-allowed t)
- atttypmod (parse-integer atttypmod :junk-allowed t))
-
+ (setf attlen (%get-int attlen)
+ atttypmod (%get-int atttypmod))
(let ((coltype (ensure-keyword typname))
- (colnull (if (string-equal "f" attnull) 1 0))
+ (colnull (typecase attnull
+ (string (if (string-equal "f" attnull) 1 0))
+ (null 1)
+ (T 0)))
collen
colprec)
- (setf (values collen colprec)
- (case coltype
- ((:numeric :decimal)
- (if (= -1 atttypmod)
- (values nil nil)
- (values (ash (- atttypmod 4) -16)
- (boole boole-and (- atttypmod 4) #xffff))))
- (otherwise
- (values
- (cond ((and (= -1 attlen) (= -1 atttypmod)) nil)
- ((= -1 attlen) (- atttypmod 4))
- (t attlen))
- nil))))
- (values coltype collen colprec colnull))))))
+ (setf (values collen colprec)
+ (case coltype
+ ((:numeric :decimal)
+ (if (= -1 atttypmod)
+ (values nil nil)
+ (values (ash (- atttypmod 4) -16)
+ (boole boole-and (- atttypmod 4) #xffff))))
+ (otherwise
+ (values
+ (cond ((and (= -1 attlen) (= -1 atttypmod)) nil)
+ ((= -1 attlen) (- atttypmod 4))
+ (t attlen))
+ nil))))
+ (values coltype collen colprec colnull))))))
(defmethod database-create-sequence (sequence-name
(database generic-postgresql-database))
(defmethod database-set-sequence-position (name (position integer)
(database generic-postgresql-database))
(values
- (parse-integer
+ (%get-int
(caar
(database-query
(format nil "SELECT SETVAL ('~A', ~A)" (escaped-database-identifier name) position)
(defmethod database-sequence-next (sequence-name
(database generic-postgresql-database))
(values
- (parse-integer
+ (%get-int
(caar
(database-query
(concatenate 'string "SELECT NEXTVAL ('" (escaped-database-identifier sequence-name) "')")
(defmethod database-sequence-last (sequence-name (database generic-postgresql-database))
(values
- (parse-integer
+ (%get-int
(caar
(database-query
(concatenate 'string "SELECT LAST_VALUE FROM " (escaped-database-identifier sequence-name))