HCoop
/
clinton
/
lisp-on-lines.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added perform-set-attribute and a few other fixes to this builds again.
[clinton/lisp-on-lines.git]
/
src
/
meta-model.lisp
diff --git
a/src/meta-model.lisp
b/src/meta-model.lisp
index
a0c842a
..
dead63e
100644
(file)
--- a/
src/meta-model.lisp
+++ b/
src/meta-model.lisp
@@
-52,8
+52,9
@@
(defmacro def-base-class (name (model) &rest args)
(let ((i (make-instance model)))
(defmacro def-base-class (name (model) &rest args)
(let ((i (make-instance model)))
- `(prog1
- (eval ,(def-base-class-expander i name args))
+ `(progn
+ (eval-when (:compile-toplevel :load-toplevel :execute)
+ ,(def-base-class-expander i :clsql name args))
(defmethod meta-model.metadata ((m ,name))
',(meta-model.metadata i)))))
(defmethod meta-model.metadata ((m ,name))
',(meta-model.metadata i)))))
@@
-165,7
+166,8
@@
(when (equal (getf (cdr s) :home-key) slot)
(let ((val (slot-value model (car s))))
(return-from explode-foreign-key
(when (equal (getf (cdr s) :home-key) slot)
(let ((val (slot-value model (car s))))
(return-from explode-foreign-key
- (values (if val val (make-instance (getf (cdr s) :join-class))) (getf (cdr s) :foreign-key)))))))
+ (values (if val val (make-instance (getf (cdr s) :join-class)))
+ (getf (cdr s) :foreign-key)))))))
(defun find-join-helper (foreign-key)
(lambda (class slot)
(defun find-join-helper (foreign-key)
(lambda (class slot)