projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r10540: 17 May 2005 Kevin Rosenberg <kevin@rosenberg.net>
[clsql.git]
/
sql
/
oodml.lisp
diff --git
a/sql/oodml.lisp
b/sql/oodml.lisp
index 4644bf1c1589fdb351bb5ea1833f688d68c7daa1..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
@@
-261,8
+261,9
@@
(sels (generate-selection-list view-class))
(res (apply #'select (append (mapcar #'cdr sels)
(list :from view-table
(sels (generate-selection-list view-class))
(res (apply #'select (append (mapcar #'cdr sels)
(list :from view-table
- :where view-qual)
- (list :result-types nil)))))
+ :where view-qual
+ :result-types nil
+ :database vd)))))
(when res
(get-slot-values-from-view instance (mapcar #'car sels) (car res)))))
(when res
(get-slot-values-from-view instance (mapcar #'car sels) (car res)))))