projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r10545: add usec
[clsql.git]
/
sql
/
oodml.lisp
diff --git
a/sql/oodml.lisp
b/sql/oodml.lisp
index e2a487e2412c773a1d7db76f9e4a41d2639a946e..85730dccf7d7f2eedf870992d567bf6a704a2fc4 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
@@
-120,7
+120,7
@@
nil)
((typep slot-reader 'string)
(format nil slot-reader value))
nil)
((typep slot-reader 'string)
(format nil slot-reader value))
- ((typep slot-reader '
function
)
+ ((typep slot-reader '
(or symbol function)
)
(apply slot-reader (list value)))
(t
(error "Slot reader is of an unusual type.")))))
(apply slot-reader (list value)))
(t
(error "Slot reader is of an unusual type.")))))
@@
-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)))
+ (
(and (or symbol function) (not null))
(apply dbwriter (list val)))
(t
(database-output-sql-as-type
(typecase dbtype
(t
(database-output-sql-as-type
(typecase dbtype