random fixes

[clinton/lisp-on-lines.git] / src / meta-model.lisp

diff --git a/src/meta-model.lisp b/src/meta-model.lisp
index dead63e..de7335e 100644 (file)
--- a/src/meta-model.lisp
+++ b/src/meta-model.lisp
@@ -1,12 +1,25 @@
 (in-package :meta-model)
 
 (in-package :meta-model)
 

-(defvar *meta-models* nil)
-
-(defun list-meta-models ()
-  *meta-models*)
+(defvar *meta-models* (make-hash-table))

 
 (defclass meta-model-class ()
 
 (defclass meta-model-class ()

-  ((metadata
+  ((name
+    :accessor meta-model.name
+    :initarg :name
+    :initform nil)
+   (slots
+    :accessor meta-model.slots
+    :initarg :slots
+    :initform nil)
+   (superclasses
+    :accessor meta-model.superclasses
+    :initarg :superclasses
+    :initform nil)
+   (options
+    :accessor meta-model.options
+    :initarg :options
+    :initform nil)   
+   (metadata

     :accessor meta-model.metadata
     :initarg :metadata
     :initform nil)
     :accessor meta-model.metadata
     :initarg :metadata
     :initform nil)


@@ -22,49 +35,36 @@
 (defmethod meta-model.metadata ((self (eql nil)))
   nil)
 
 (defmethod meta-model.metadata ((self (eql nil)))
   nil)
 

-(defun gen-supers (supers)
-  (let (subclassp)
-    (dolist (x supers)
-      (when (member x (list-meta-models))
-       (setf subclassp t)))
-    (if subclassp
-       supers
-       (cons 'meta-model-class supers))))
-
-(defmethod %def-meta-model ((base-type t) name supers slots &rest options)
-  `(defclass ,name ,(gen-supers supers)
-     ()
-     (:default-initargs :metadata ',slots :base-type ,base-type)))
-  
-  
-(defmacro def-meta-model (name supers slots &rest options)
-  `(progn
-     (when (not (member (quote ,name) *meta-models*))
-       (setf *meta-models* (cons (quote ,name) *meta-models*)))
-
-     (let ((class ,(%def-meta-model (cadr (or (assoc :base-type options) '(t t))) name supers slots options)))
-       class)))
-
-(defgeneric def-base-type-class-expander (base-type model name args))
-
-(defmethod def-base-class-expander ((model t) name args)
-  (def-base-type-class-expander (meta-model.base-type model) model name args))
-
-(defmacro def-base-class (name (model) &rest args)
-  (let ((i (make-instance model)))
-   `(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 ((self symbol))
+  (meta-model.metadata (gethash self *meta-models*)))

 
 

-(defmethod base-class-name ((model t))
-  (class-name (class-of (meta-model.instance model))))
-  
+(defmethod meta-model.metadata ((self standard-object))
+  (meta-model.metadata (class-name (class-of self))))
+
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (defmethod make-meta-model (name supers slots options)
+  (let ((m (make-instance 'meta-model-class 
+                         :name name
+                         :superclasses supers
+                         :slots slots
+                         :options options
+                         ;; TODO : the metadata should inherit any superclasses
+                         :metadata slots)))
+    (setf (gethash name *meta-models*) m))))
+       
+(defmacro define-meta-model (name supers slots &rest options)
+  `(make-meta-model ',name ',supers ',slots ',options))
+
+(defgeneric generate-base-class-definition (base-type model name args))
+
+(defmethod generate-base-class-expander ((model t) name args)
+  (generate-base-class-definition (meta-model.base-type model) model name args))

 
 
 (defmethod view-class-metadata ((model t))
 
 
 (defmethod view-class-metadata ((model t))

+  "
+This is what meta-model.metadata used to be called,
+most of the below functions expect this method to exist"

   (meta-model.metadata model))
 
 (defun list-item-helper (type view &key (ret-fun #'car))
   (meta-model.metadata model))
 
 (defun list-item-helper (type view &key (ret-fun #'car))


@@ -106,7 +106,7 @@
              (list-item-helper
               type view
               :ret-fun #'rfun)))
              (list-item-helper
               type view
               :ret-fun #'rfun)))

-    (append (lister :key) (lister :base))))
+    (append (lister :key) (lister :base) (lister nil))))

                         
 (defmethod slot-type ((view t) slot)
   "returns the CLSQL type of SLOT"
                         
 (defmethod slot-type ((view t) slot)
   "returns the CLSQL type of SLOT"


@@ -160,14 +160,23 @@
                 :test-key :target-slot
                 :return-full t)))
 
                 :test-key :target-slot
                 :return-full t)))
 

-(defmethod explode-foreign-key ((model clsql:standard-db-object) slot)
+(defmethod explode-foreign-key ((model clsql:standard-db-object) slot &key (createp t))

   "returns the clsql view-class joined on SLOT"
   (dolist (s (list-join-attributes model))
     (when (equal (getf (cdr s) :home-key) slot)
   "returns the clsql view-class joined on SLOT"
   (dolist (s (list-join-attributes model))
     (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)))))))
+      (let* ((fkey (getf (cdr s) :foreign-key))
+            (new (sync-instance (make-instance (getf (cdr s) :join-class))))
+            (val (or (slot-value model (car s))
+                     (progn
+                       (when createp
+                         (setf
+                          (slot-value model slot)
+                          (slot-value new fkey))
+                         (sync-instance model)
+                         (slot-value model (car s)))))))
+           
+       (return-from explode-foreign-key 
+         (values val fkey))))))

 
 (defun find-join-helper (foreign-key)
   (lambda (class slot) 
 
 (defun find-join-helper (foreign-key)
   (lambda (class slot) 


@@ -219,14 +228,18 @@
 (defgeneric select-instances (instance &rest args)
   (:documentation "Select instances in backend dependent way"))
 
 (defgeneric select-instances (instance &rest args)
   (:documentation "Select instances in backend dependent way"))
 

+(defgeneric prepare-slot-name-for-select (instance slot-name)
+  (:method (i s) s))
+

 (defmacro def-compare-expr (instance-type name expr &key value-format)
   `(defmethod ,name ((instance ,instance-type) slot-name value)
      (declare (ignore instance))
 (defmacro def-compare-expr (instance-type name expr &key value-format)
   `(defmethod ,name ((instance ,instance-type) slot-name value)
      (declare (ignore instance))

-     (,expr slot-name ,(typecase value-format
+     (,expr (prepare-slot-name-for-select instance slot-name) ,(typecase value-format

                                  (null 'value)
                                  (string `(format nil ,value-format value))
                                  (t `(,value-format value))))))
 
                                  (null 'value)
                                  (string `(format nil ,value-format value))
                                  (t `(,value-format value))))))
 

+

 (defmacro def-logical-expr (instance-type name expr)
   `(defmethod ,name ((instance ,instance-type) &rest args)
      (declare (ignore instance))
 (defmacro def-logical-expr (instance-type name expr)
   `(defmethod ,name ((instance ,instance-type) &rest args)
      (declare (ignore instance))