X-Git-Url: https://git.hcoop.net/clinton/lisp-on-lines.git/blobdiff_plain/a6644385238aac1694af714e321c34456bea3441..d75822e6994bf139e0ba2fddf3eee28e0cda5f2c:/src/meta-model.lisp

diff --git a/src/meta-model.lisp b/src/meta-model.lisp
index 9065071..aabd2ff 100644
--- a/src/meta-model.lisp
+++ b/src/meta-model.lisp
@@ -16,11 +16,15 @@
     :initform nil)
    (base-type
     :accessor meta-model.base-type
-    :initform 'clsql)))
+    :initarg :base-type
+    :initform :clsql)))
 
 (defmethod meta-model.metadata ((self (eql nil)))
   nil)
 
+(defmethod meta-model.metadata ((self symbol))
+  (meta-model.metadata (make-instance self)))
+
 (defun gen-supers (supers)
   (let (subclassp)
     (dolist (x supers)
@@ -31,36 +35,32 @@
 	(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)))
+  `(eval-when (:compile-toplevel :load-toplevel :execute)
+    (defclass ,name ,(gen-supers supers)
+      ()
+      (:default-initargs :metadata ',slots :base-type ,base-type))))
   
   
 (defmacro def-meta-model (name supers slots &rest options)
-  `(progn
+  `(eval-when (:compile-toplevel :load-toplevel :execute)
      (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-class-expander (model base-type name args))
-
+(defgeneric def-base-type-class-expander (base-type model name args))
 
-(defmacro def-base-class (name (model) &rest args)
-  (let ((i (make-instance model)))
-    `(progn 
-       ,(def-base-class-expander i :clsql name args)
-       (defmethod meta-model.metadata ((m ,name))
-	 ',(meta-model.metadata i)))))
-  
+(defmethod def-base-class-expander ((model t) name args)
+  (def-base-type-class-expander (meta-model.base-type model) model name args))
 
 (defmethod base-class-name ((model t))
   (class-name (class-of (meta-model.instance model))))
-  
-
 
 (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))
@@ -162,7 +162,8 @@
     (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) 
@@ -184,6 +185,49 @@
 	    (getf (cdr att) :home-key) 
 	    (getf (cdr att) :foreign-key))))
   
+(defgeneric expr-= (instance slot-name value)
+  (:documentation "Create search expression for appropriate backend."))
+
+(defgeneric expr-> (instance slot-name value)
+  (:documentation "Create search expression for appropriate backend."))
+
+(defgeneric expr-< (instance slot-name value)
+  (:documentation "Create search expression for appropriate backend."))
+
+(defgeneric expr-ends-with (instance slot-name value)
+  (:documentation "Create search expression for appropriate backend."))
+
+(defgeneric expr-starts-with (instance slot-name value)
+  (:documentation "Create search expression for appropriate backend."))
+
+(defgeneric expr-contains (instance slot-name value)
+  (:documentation "Create search expression for appropriate backend."))
+
+(defgeneric expr-and (instance &rest args)
+  (:documentation "Create search expression for appropriate backend."))
+
+(defgeneric expr-or (instance &rest args)
+  (:documentation "Create search expression for appropriate backend."))
+
+(defgeneric expr-not (instance &rest args)
+  (:documentation "Create search expression for appropriate backend."))
+
+(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))
+     (,expr (prepare-slot-name-for-select instance slot-name) ,(typecase value-format
+                                 (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))
+     (apply ,expr args)))
\ No newline at end of file