- (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))))
- (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)
- 'string)
+ (value-type (canonicalize-value-type (slot-value dsd 'value-type))))
+ (multiple-value-bind (sql-type sql-length)
+ (value-type-to-sql-type value-type)
+ (setf (esd-sql-type esd) sql-type)
+ (setf (esd-sql-length esd) sql-length))
+ (setf (slot-value esd 'type) (value-type-to-lisp-type value-type))
+ (setf (esd-value-type esd) value-type)
+ (setf (esd-user-name esd)
+ (aif (dsd-user-name dsd)
+ it
+ (string-downcase (symbol-name (slot-definition-name dsd)))))
+ (setf (esd-sql-name esd)
+ (aif (dsd-sql-name dsd)
+ it
+ (lisp-name-to-sql-name (slot-definition-name dsd))))
+ (setf (esd-sql-name esd)
+ (aif (dsd-sql-name dsd)
+ it
+ (lisp-name-to-sql-name (slot-definition-name dsd))))
+ (dolist (name '(print-formatter subobject hyperlink hyperlink-parameters
+ description value-constraint indexed null-allowed
+ unique short-description void-text read-only-groups
+ hidden-groups unit disable-predicate view-type
+ list-of-values stored))
+ (setf (slot-value esd name) (slot-value dsd name)))
+ esd))
+
+(defun lisp-name-to-sql-name (lisp)
+ "Convert a lisp name (atom or list, string or symbol) into a canonical
+SQL name"
+ (unless (stringp lisp)
+ (setq lisp
+ (typecase lisp
+ (symbol (symbol-name lisp))
+ (t (write-to-string lisp)))))
+ (do* ((len (length lisp))
+ (sql (make-string len))
+ (i 0 (1+ i)))
+ ((= i len) (string-upcase sql))
+ (declare (fixnum i)
+ (simple-string sql))
+ (setf (schar sql i)
+ (let ((c (char lisp i)))
+ (case c
+ ((#\- #\$ #\+ #\#) #\_)
+ (otherwise c))))))
+
+#+ho-normal-cesd
+(setq cl:*features* (delete :ho-normal-cesd cl:*features*))
+#+ho-normal-dsdc
+(setq cl:*features* (delete :ho-normal-dsdc cl:*features*))
+#+ho-normal-esdc
+(setq cl:*features* (delete :ho-normal-esdc cl:*features*))
+
+(defun lisp-type-is-a-string (type)
+ (or (eq type 'string)
+ (and (listp type) (some #'(lambda (x) (eq x 'string)) type))))
+
+(defun base-value-type (value-type)
+ (if (atom value-type)
+ value-type
+ (car value-type)))
+
+(defun value-type-to-lisp-type (value-type)
+ (case (base-value-type value-type)
+ ((:string :cdata :varchar :char)
+ '(or null string))
+ (:datetime
+ '(or null integer))