Renamed fill-gaps-only to fill-gaps-only-p, and added the :fill-gaps-only-p initarg...

[clinton/lisp-on-lines.git] / src / backend / clsql.lisp

diff --git a/src/backend/clsql.lisp b/src/backend/clsql.lisp
index 6de317b..a6e9c68 100644 (file)
--- 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,9 +26,9 @@
         (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)
@@ -263,10 +263,11 @@ 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))))))
 
 (def-compare-expr standard-db-object expr-= sql-=)
 (def-compare-expr standard-db-object expr-< sql-<)