X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql%2Fobjects.lisp;h=823df46069cd0ff6f5248db9859ee458798593f2;hb=e3f355aa2b125569097bd7108fbbd14daa23e7aa;hp=0d87e0ed65850e91dea75f3048a1395bc4fbd8d1;hpb=e3ed4080f0a28d94e81aad7452fb1f81e1e50253;p=clsql.git

diff --git a/sql/objects.lisp b/sql/objects.lisp
index 0d87e0e..823df46 100644
--- a/sql/objects.lisp
+++ b/sql/objects.lisp
@@ -20,7 +20,7 @@
     :initform nil
     :initarg :view-database
     :db-kind :virtual))
-  (:metaclass standard-db-class)
+  (:metaclass view-metaclass)
   (:documentation "Superclass for all CLSQL View Classes."))
 
 (defmethod view-database ((self standard-db-object))
@@ -29,7 +29,7 @@
 (defvar *db-deserializing* nil)
 (defvar *db-initializing* nil)
 
-(defmethod slot-value-using-class ((class standard-db-class) instance slot)
+(defmethod slot-value-using-class ((class view-metaclass) instance slot)
   (declare (optimize (speed 3)))
   (unless *db-deserializing*
     (let ((slot-name (%slot-name slot))
@@ -43,7 +43,7 @@
               (setf (slot-value instance slot-name) nil))))))
   (call-next-method))
 
-(defmethod (setf slot-value-using-class) (new-value (class standard-db-class)
+(defmethod (setf slot-value-using-class) (new-value (class view-metaclass)
 					  instance slot)
   (declare (ignore new-value instance slot))
   (call-next-method))
@@ -92,7 +92,7 @@
 ;; Build the database tables required to store the given view class
 ;;
 
-(defmethod database-pkey-constraint ((class standard-db-class) database)
+(defmethod database-pkey-constraint ((class view-metaclass) database)
   (let ((keylist (mapcar #'view-class-slot-column (keyslots-for-class class))))
     (when keylist 
       (format nil "CONSTRAINT ~APK PRIMARY KEY~A"
@@ -113,7 +113,7 @@
                                       &key (database *default-database*))
   (let ((schemadef nil)
         (tclass (find-class view-class-name)))
-    (dolist (slotdef (ordered-class-slots tclass))
+    (dolist (slotdef (class-slots tclass))
       (let ((res (database-generate-column-definition view-class-name
                                                       slotdef database)))
         (when res (setf schemadef (cons res schemadef)))))
@@ -144,7 +144,7 @@ the view. The argument DATABASE has a default value of
         (error "Class ~s not found." view-class-name)))
   (values))
 
-(defmethod %install-class ((self standard-db-class) database &aux schemadef)
+(defmethod %install-class ((self view-metaclass) database &aux schemadef)
   (dolist (slotdef (ordered-class-slots self))
     (let ((res (database-generate-column-definition (class-name self)
                                                     slotdef database)))
@@ -218,7 +218,7 @@ SUPERS is nil then STANDARD-DB-OBJECT automatically becomes the
 superclass of the newly-defined View Class."
   `(progn
      (defclass ,class ,supers ,slots ,@options
-	       (:metaclass standard-db-class))
+	       (:metaclass view-metaclass))
      (finalize-inheritance (find-class ',class))))
 
 (defun keyslots-for-class (class)