- (multiple-value-bind (sql-type length) (value-type-to-sql-type value-type)\r
- (setf (slot-value dsd 'sql-type) sql-type)\r
- (setf (slot-value dsd 'type) (value-type-to-lisp-type value-type))\r
- (let ((ia (compute-effective-slot-definition-initargs cl #+lispworks name dsds)))\r
- (apply\r
- #'make-instance 'hyperobject-esd \r
- :value-type value-type\r
- :sql-type sql-type\r
- :length length\r
- :print-formatter (slot-value dsd 'print-formatter)\r
- :subobject (slot-value dsd 'subobject)\r
- :hyperlink (slot-value dsd 'hyperlink)\r
- :hyperlink-parameters (slot-value dsd 'hyperlink-parameters)\r
- :description (slot-value dsd 'description)\r
- :user-name (slot-value dsd 'user-name)\r
- :user-name-plural (slot-value dsd 'user-name-plural)\r
- :index (slot-value dsd 'index)\r
- :value-constraint (slot-value dsd 'value-constraint)\r
- :null-allowed (slot-value dsd 'null-allowed)\r
- ia)))))\r
-\r
-(defmethod compute-effective-slot-definition :around ((cl hyperobject-class) #+ho-normal-cesd name dsds)\r
- #+ho-normal-cesd (declare (ignore name))\r
- (let* ((esd (call-next-method))\r
- (dsd (car dsds))\r
- (value-type (canonicalize-value-type (slot-value dsd 'value-type))))\r
- (multiple-value-bind (sql-type length) (value-type-to-sql-type value-type)\r
- (setf (slot-value esd 'sql-type) sql-type)\r
- (setf (slot-value esd 'length) length)\r
- (setf (slot-value esd 'type) (value-type-to-lisp-type value-type))\r
- (setf (slot-value esd 'value-type) value-type)\r
- (dolist (name '(print-formatter subobject hyperlink hyperlink-parameters\r
- description value-constraint index null-allowed user-name))\r
- (setf (slot-value esd name) (slot-value dsd name)))\r
- esd)))\r
-\r
+ (multiple-value-bind (sql-type sql-length) \r
+ (value-type-to-sql-type value-type)\r
+ (setf (esd-sql-type esd) sql-type)\r
+ (setf (esd-sql-length esd) sql-length))\r
+ (setf (slot-value esd 'type) (value-type-to-lisp-type value-type))\r
+ (setf (esd-value-type esd) value-type)\r
+ (setf (esd-user-name esd)\r
+ (aif (dsd-user-name dsd)\r
+ it\r
+ (string-downcase (symbol-name (slot-definition-name dsd)))))\r
+ (setf (esd-sql-name esd)\r
+ (aif (dsd-sql-name dsd)\r
+ it\r
+ (lisp-name-to-sql-name (slot-definition-name dsd))))\r
+ (setf (esd-sql-name esd)\r
+ (aif (dsd-sql-name dsd)\r
+ it\r
+ (lisp-name-to-sql-name (slot-definition-name dsd))))\r
+ (dolist (name '(print-formatter subobject hyperlink hyperlink-parameters\r
+ description value-constraint indexed null-allowed\r
+ unique short-description void-text read-only-groups\r
+ hidden-groups unit disable-predicate view-type\r
+ list-of-values stored))\r
+ (setf (slot-value esd name) (slot-value dsd name)))\r
+ esd))\r
+\r
+(defun lisp-name-to-sql-name (lisp)\r
+ "Convert a lisp name (atom or list, string or symbol) into a canonical\r
+SQL name"\r
+ (unless (stringp lisp)\r
+ (setq lisp\r
+ (typecase lisp\r
+ (symbol (symbol-name lisp))\r
+ (t (write-to-string lisp)))))\r
+ (do* ((len (length lisp))\r
+ (sql (make-string len))\r
+ (i 0 (1+ i)))\r
+ ((= i len) (string-upcase sql))\r
+ (declare (fixnum i)\r
+ (simple-string sql))\r
+ (setf (schar sql i)\r
+ (let ((c (char lisp i)))\r
+ (case c\r
+ ((#\- #\$ #\+ #\#) #\_)\r
+ (otherwise c))))))\r