r10516: 06 May 2005 Kevin Rosenberg <kevin@rosenberg.net>

        * sql/oodml.lisp: Change db-writer and db-reader processing to accept
        a symbol as well as function to serve as a function designator
        [issue noted by will@cesmail.net]

diff --git a/ChangeLog b/ChangeLog
index d80de2ccbc10a14acd552eec7925809af6d6b3d9..1b4dd49a2b03c2f9ff309e0d65c987869b8de54b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+06 May 2005 Kevin Rosenberg <kevin@rosenberg.net>
+       * sql/oodml.lisp: Change db-writer and db-reader processing to accept
+       a symbol as well as function to serve as a function designator
+       [issue noted by will@cesmail.net]
+

 05 May 2005 Kevin Rosenberg <kevin@rosenberg.net>
        * Version 3.1.13
        * sql/time.lisp: Fix error in submitted patch which caused error
 05 May 2005 Kevin Rosenberg <kevin@rosenberg.net>
        * Version 3.1.13
        * sql/time.lisp: Fix error in submitted patch which caused error

diff --git a/sql/oodml.lisp b/sql/oodml.lisp
index e2a487e2412c773a1d7db76f9e4a41d2639a946e..2e0f6a64182237f0cadc43eccb323e29922fbaf8 100644 (file)
--- a/sql/oodml.lisp
+++ b/sql/oodml.lisp
@@ -103,7 +103,7 @@
           ((typep slot-reader 'string)
            (setf (slot-value instance slot-name)
                  (format nil slot-reader value)))
           ((typep slot-reader 'string)
            (setf (slot-value instance slot-name)
                  (format nil slot-reader value)))

-          ((typep slot-reader 'function)
+          ((typep slot-reader '(or symbol function))

            (setf (slot-value instance slot-name)
                  (apply slot-reader (list value))))
           (t
            (setf (slot-value instance slot-name)
                  (apply slot-reader (list value))))
           (t


@@ -130,7 +130,7 @@
        (dbtype (specified-type slotdef)))
     (typecase dbwriter
       (string (format nil dbwriter val))
        (dbtype (specified-type slotdef)))
     (typecase dbwriter
       (string (format nil dbwriter val))

-      (function (apply dbwriter (list val)))
+      ((or symbol function) (apply dbwriter (list val)))

       (t
        (database-output-sql-as-type
        (typecase dbtype
       (t
        (database-output-sql-as-type
        (typecase dbtype