;; Object functions
-(defmethod database-get-type-specifier (type args database
+(defmethod database-get-type-specifier ((type symbol) args database
(db-type (eql :postgresql)))
- (declare (ignore type args database))
- "VARCHAR")
-
-(defmethod database-get-type-specifier ((type (eql 'string)) args database
- (db-type (eql :postgresql)))
- (declare (ignore database))
- (if args
- (format nil "CHAR(~A)" (car args))
- "VARCHAR"))
-
-(defmethod database-get-type-specifier ((type (eql 'tinyint)) args database
- (db-type (eql :postgresql)))
- (declare (ignore args database))
- "INT2")
-
-(defmethod database-get-type-specifier ((type (eql 'smallint)) args database
- (db-type (eql :postgresql)))
- (declare (ignore args database))
- "INT2")
-
-(defmethod database-get-type-specifier ((type (eql 'wall-time)) args database
- (db-type (eql :postgresql)))
- (declare (ignore args database))
- "TIMESTAMP WITHOUT TIME ZONE")
-
-(defmethod database-get-type-specifier ((type (eql 'number)) args database
- (db-type (eql :postgresql)))
- (declare (ignore database))
- (cond
- ((and (consp args) (= (length args) 2))
- (format nil "NUMERIC(~D,~D)" (first args) (second args)))
- ((and (consp args) (= (length args) 1))
- (format nil "NUMERIC(~D)" (first args)))
- (t
- "NUMERIC")))
+ "Special database types for POSTGRESQL backends"
+ (declare (ignore database db-type))
+ (case type
+ ;; his used to be without because we didnt track timezones well
+ ;; Now we do, so it should include them
+ (wall-time
+ "TIMESTAMP WITH TIME ZONE")
+ (string
+ ;; TODO: the default to CHAR here seems specious as the PG docs claim
+ ;; that char is slower than varchar
+ (if args
+ (format nil "CHAR(~A)" (car args))
+ "VARCHAR"))
+ (number
+ (cond
+ ((and (consp args) (= (length args) 2))
+ (format nil "NUMERIC(~D,~D)" (first args) (second args)))
+ ((and (consp args) (= (length args) 1))
+ (format nil "NUMERIC(~D)" (first args)))
+ (t "NUMERIC")))
+ ((tinyint smallint) "INT2")
+ (t (call-next-method))))
;;; Backend functions
(when seq
(setf const (remove :auto-increment const))
(unless (member :default const)
- (let* ((next (format nil "nextval('~a')" (escaped-database-identifier seq))))
+ (let* ((next (format nil " nextval('~a')" (escaped-database-identifier seq))))
(setf const (append const (list :default next))))))
(append cdef const))))
(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
(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)))
(defmethod db-type-has-auto-increment? ((db-type (eql :postgresql)))
t)
+
+(defmethod clsql-sys::database-escape-backslashes ((database generic-postgresql-database))
+ t)