X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql%2Foodml.lisp;h=466e86a55945fa280a6f3e0a8c7034e304087d00;hb=78da4831fd20e83f64c74fd6140ed6e8ee73a495;hp=b570cedcbb96d6aa8e6ac9b10012ae33e47d2f71;hpb=ef93cbe09e01bb540651e6719eb4e8fe7ebeefd0;p=clsql.git

diff --git a/sql/oodml.lisp b/sql/oodml.lisp
index b570ced..466e86a 100644
--- a/sql/oodml.lisp
+++ b/sql/oodml.lisp
@@ -225,11 +225,14 @@
                                    (db-value-from-slot s val database))))
                        sds)))
     (cond ((and avps (view-database obj))
-           (update-records (sql-expression :table vct)
-                           :av-pairs avps
-                           :where (key-qualifier-for-instance
-                                   obj :database database)
-                           :database database))
+           (let ((where (key-qualifier-for-instance
+                         obj :database database)))
+             (unless where
+               (error "update-record-from-slots: could not generate a where clause for ~a" obj))
+             (update-records (sql-expression :table vct)
+                             :av-pairs avps
+                             :where where
+                             :database database)))
           ((and avps (not (view-database obj)))
            (insert-records :into (sql-expression :table vct)
                            :av-pairs avps
@@ -283,7 +286,7 @@
                    (setf pk (or pk
                                 (slot-value obj (slot-definition-name pk-slot))))))
                 (t
-                 (insert-records :into (sql-expression :table view-class-table)
+		 (insert-records :into (sql-expression :table view-class-table)
                                  :av-pairs record-values
                                  :database database)
 
@@ -292,19 +295,26 @@
 				     (not (null (view-class-slot-autoincrement-sequence pk-slot))))
 				 (setf (slot-value obj (slot-definition-name pk-slot))
 				       (database-last-auto-increment-id database
-								       table
+								       view-class-table
 								       pk-slot)))))
-		  (setf pk (or pk
-			       (slot-value
-				obj (slot-definition-name pk-slot)))))
-                 (when (eql this-class nil)
-                   (setf (slot-value obj 'view-database) database))))))
+		  (when pk-slot
+		    (setf pk (or pk
+				 (slot-value
+				  obj (slot-definition-name pk-slot)))))
+		  (when (eql this-class nil)
+		    (setf (slot-value obj 'view-database) database)))))))
     ;; handle slots with defaults
-    (dolist (slot slots)
-      (when (and (slot-exists-p slot 'db-constraints)
-		 (listp (view-class-slot-db-constraints slot))
-		 (member :default (view-class-slot-db-constraints slot)))
-	(update-slot-from-record obj (slot-definition-name slot))))
+    (let* ((view-class (or this-class (class-of obj)))
+	   (slots (if (normalizedp view-class)
+		     (ordered-class-direct-slots view-class)
+		     (ordered-class-slots view-class)))) 
+      (dolist (slot slots)
+	(when (and (slot-exists-p slot 'db-constraints)
+		   (listp (view-class-slot-db-constraints slot))
+		   (member :default (view-class-slot-db-constraints slot)))
+	  (unless (and (slot-boundp obj (slot-definition-name slot))
+		       (slot-value obj (slot-definition-name slot)))
+	    (update-slot-from-record obj (slot-definition-name slot))))))
 
     pk))