- (ho-type (intern-in-keyword (slot-value dsd 'type)))
- (sql-type (ho-type-to-sql-type ho-type))
- (length (when (consp ho-type) (cadr ho-type))))
- #+allergo (declare (ignore name))
- (setf (slot-value dsd 'ho-type) ho-type)
- (setf (slot-value dsd 'sql-type) sql-type)
- (setf (slot-value dsd 'type) (ho-type-to-lisp-type ho-type))
- (let ((ia (compute-effective-slot-definition-initargs
- cl #+lispworks name dsds)))
- (apply
- #'make-instance 'hyperobject-esd
- :ho-type ho-type
- :sql-type sql-type
- :length length
- :print-formatter (slot-value dsd 'print-formatter)
- :subobject (slot-value dsd 'subobject)
- :hyperlink (slot-value dsd 'hyperlink)
- :hyperlink-parameters (slot-value dsd 'hyperlink-parameters)
- :description (slot-value dsd 'description)
- :user-name (slot-value dsd 'user-name)
- :index (slot-value dsd 'index)
- ia))))
-
-(defun ho-type-to-lisp-type (ho-type)
- (when (consp ho-type)
- (setq ho-type (car ho-type)))
- (check-type ho-type symbol)
- (case ho-type
- ((or :string :cdata :varchar :char)
+ (value-type (canonicalize-value-type (slot-value dsd 'value-type))))
+ (multiple-value-bind (sql-type length) (value-type-to-sql-type value-type)
+ (setf (slot-value dsd 'sql-type) sql-type)
+ (setf (slot-value dsd 'type) (value-type-to-lisp-type value-type))
+ (let ((ia (compute-effective-slot-definition-initargs
+ cl #+lispworks name dsds)))
+ (apply
+ #'make-instance 'hyperobject-esd
+ :value-type value-type
+ :sql-type sql-type
+ :length length
+ :print-formatter (slot-value dsd 'print-formatter)
+ :subobject (slot-value dsd 'subobject)
+ :hyperlink (slot-value dsd 'hyperlink)
+ :hyperlink-parameters (slot-value dsd 'hyperlink-parameters)
+ :description (slot-value dsd 'description)
+ :user-name (slot-value dsd 'user-name)
+ :index (slot-value dsd 'index)
+ :value-constraint (slot-value dsd 'value-constraint)
+ :null-allowed (slot-value dsd 'null-allowed)
+ ia)))))
+
+(defun value-type-to-lisp-type (value-type)
+ (case (if (atom value-type)
+ value-type
+ (car value-type))
+ ((:string :cdata :varchar :char)