X-Git-Url: https://git.hcoop.net/clinton/lisp-on-lines.git/blobdiff_plain/9d6c69fb50810bef64e6f3357a21b4f4397e2b1b..da26d00333fa0ced964dc777a00bd917c543e4ed:/src/backend/clsql.lisp

diff --git a/src/backend/clsql.lisp b/src/backend/clsql.lisp
index 14f8b15..8d593dc 100644
--- a/src/backend/clsql.lisp
+++ b/src/backend/clsql.lisp
@@ -10,7 +10,7 @@
 
 
 
-(defmethod sync-instance ((view clsql:standard-db-object) &key (fill-gaps-only nil) (database *default-database*))
+(defmethod sync-instance ((view clsql:standard-db-object) &key (fill-gaps-only-p nil) (database *default-database*))
   (labels ((sym->sql (sym) (string-downcase (substitute #\_ #\- (string sym))))
            (get-def (slot) (caar (query
                                   (format nil                                                             "SELECT DISTINCT adsrc from pg_attrdef join pg_attribute on attnum = adnum where adrelid = (select oid from pg_class where relname = '~A') and attname = '~A'" (sym->sql (class-name (class-of view))) (sym->sql slot)))))
@@ -26,14 +26,17 @@
         (setf (slot-value view slot) (get-default-value slot))
         (when (and (primary-key-p view slot)
                    (not (slot-value view slot))
-                   (not  fill-gaps-only))
+                   (not  fill-gaps-only-p))
           (error "No default value for primary key : ~A" slot))))
-    (when fill-gaps-only
+    (when fill-gaps-only-p
       (update-objects-joins (list view))
       (return-from sync-instance))
     (update-records-from-instance view :database database)
     (update-instance-from-records view :database database)
-    (update-objects-joins (list view))))
+    (update-objects-joins (list view)))
+
+  ;; return the modified and hopefully now persistent object
+  view)
 
 
 
@@ -209,7 +212,7 @@ AND fa.attnum = ANY (pg_constraint.confkey)"))
    :set t))
 
 (defun gen-many-to-many (row home-key foreign-key)
- (let ((name (sql->sym (string-upcase (format nil "~A->~A" (string (car row)) (string (second row)))))))
+ (let ((name (sql->sym (string-upcase (format nil "~A<-~A->~A" (string (car row)) (string foreign-key) (string (second row)))))))
    (setf row (mapcar #'sql->sym row))
    `(,name
      :accessor ,name
@@ -237,15 +240,20 @@ AND fa.attnum = ANY (pg_constraint.confkey)"))
 
 (defmacro def-view-class/meta (name supers slots &rest args)
   "Create and instrument CLSQL view-class NAME and
-appropriate meta-model class(its default name is %NAME-meta-model).
-(DEF-VIEW-CLASS/META NAME SUPERS SLOTS &key (MODEL-NAME (intern (format nil \"%~S-META-MODEL\" NAME))) &rest ARGS)."
+appropriate meta-model class its default name is %NAME-meta-model."
+
   (let ((model-name (cond ((eq :model-name (car args))
-                           (pop args)  ; remove keyword
-                           (pop args)) ; get value
+                           (pop args)	; remove keyword
+                           (pop args))	; get value
                           (t (intern (format nil "%~S-META-MODEL" name))))))
+
     `(progn
-       (def-meta-model ,model-name ,supers ,slots (:base-type :clsql) ,@args)
-       (def-base-class ,name (,model-name) ,@args))))
+      (let* ((m (def-meta-model ,model-name ,supers ,slots ,args))
+	     (i (make-instance m)))
+	(setf (meta-model.base-type i) :clsql)
+	(prog1 (eval (def-base-class-expander i ',name ',args))
+	  (defmethod meta-model.metadata ((self ,name))
+	    (meta-model.metadata i)))))))
 
 (defmacro def-view-class/table (table &optional (name (sql->sym table)) model-name)
   "takes the name of a table as a string and
@@ -258,17 +266,22 @@ creates a clsql view-class"
 	      (when (equalp (car exp) (sql->sym table))
 		(setf slots (cons (cdr exp) slots))))
 	    slots)))
-    `(def-view-class/meta ,name
-         ()
-       ,(append table-slots join-slots)
-       ,@(when model-name (list :model-name model-name)))))
+    `(eval-when (:compile-toplevel :load-toplevel :execute)
+      (def-view-class/meta ,name
+	  ()
+	,(append table-slots join-slots)
+	,@(when model-name (list :model-name model-name))))))
+
+
+(defmethod prepare-slot-name-for-select ((i standard-db-object) slot-name)
+  (clsql:sql-expression :attribute slot-name))
 
 (def-compare-expr standard-db-object expr-= sql-=)
 (def-compare-expr standard-db-object expr-< sql-<)        
 (def-compare-expr standard-db-object expr-> sql->)
-(def-compare-expr standard-db-object expr-ends-with sql-like :value-format "%~A")
-(def-compare-expr standard-db-object expr-starts-with sql-like :value-format "~A%")
-(def-compare-expr standard-db-object expr-contains sql-like :value-format "%~A%")
+(def-compare-expr standard-db-object expr-ends-with sql-uplike :value-format "%~A")
+(def-compare-expr standard-db-object expr-starts-with sql-uplike :value-format "~A%")
+(def-compare-expr standard-db-object expr-contains sql-uplike :value-format "%~A%")
 
 (def-logical-expr standard-db-object expr-and #'sql-and)