Version 5.0.2: Add missing slot accessor, make defgenerics match defmethod

diff --git a/ChangeLog b/ChangeLog
index dc2a4b48193f474ae55d883dfbfb1236d414a525..58c270f8faf07374084759e0b27cafee2eb42f32 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-08  Kevin Rosenberg <kevin@rosenberg.net>
+       * Version 5.0.2
+       * sql/database.lisp: Fix missing slot-accessor 
+       (Thanks to Stelian Ionescu)
+       * sql/generics.lisp: Add missing keyword to defgeneric
+       (Thanks to Stelian Ionescu)
+

 2010-02-07  Kevin Rosenberg <kevin@rosenberg.net>
        * Version 5.0.1
        * sql/{base-classes,database}.lisp: Add encoding slot for 
 2010-02-07  Kevin Rosenberg <kevin@rosenberg.net>
        * Version 5.0.1
        * sql/{base-classes,database}.lisp: Add encoding slot for 

diff --git a/debian/changelog b/debian/changelog
index ffa633de332ea3d820890de68110f9cfe37bbd4c..846ec3282b0490985f734310c3ac482ffc53a966 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-sql (5.0.2-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 08 Feb 2010 16:18:52 -0700
+

 cl-sql (5.0.1-1) unstable; urgency=low
 
   * New upstream
 cl-sql (5.0.1-1) unstable; urgency=low
 
   * New upstream

diff --git a/sql/database.lisp b/sql/database.lisp
index d4d1d91e7b15dd7911add8d32f56376e77811d7a..382f552955219276e2ba935f8e194b3156b9f5ea 100644 (file)
--- a/sql/database.lisp
+++ b/sql/database.lisp
@@ -317,7 +317,7 @@ system specified by DATABASE-TYPE."
   (when (typep db 'database)
     (setf (slot-value db 'encoding) encoding)
     (when (eql (slot-value db 'state) :open)
   (when (typep db 'database)
     (setf (slot-value db 'encoding) encoding)
     (when (eql (slot-value db 'state) :open)

-      (case database-type
+      (case (database-type db)

         ;; FIXME: If database object is open then
         ;; send command to SQL engine specifying the character
         ;; encoding for the database
         ;; FIXME: If database object is open then
         ;; send command to SQL engine specifying the character
         ;; encoding for the database

diff --git a/sql/generics.lisp b/sql/generics.lisp
index 860771e862eda4191a3c1d9feba37ab84536fff3..f022ff92947c6614368b9c61fad0e5295b54b7a3 100644 (file)
--- a/sql/generics.lisp
+++ b/sql/generics.lisp
@@ -72,7 +72,7 @@ represented by SLOTS are initialised from the values of the
 supplied slots with other attributes having default
 values. Furthermore, OBJECT becomes associated with DATABASE."))
 
 supplied slots with other attributes having default
 values. Furthermore, OBJECT becomes associated with DATABASE."))
 

-(defgeneric update-records-from-instance (object &key database)
+(defgeneric update-records-from-instance (object &key database this-class)

   (:documentation
    "Using an instance of a View Class, OBJECT, update the table
 that stores its instance data. DATABASE defaults to
   (:documentation
    "Using an instance of a View Class, OBJECT, update the table
 that stores its instance data. DATABASE defaults to


@@ -88,7 +88,7 @@ associated with DATABASE."))
 table of the database associated with OBJECT. If OBJECT is not
 yet associated with a database, an error is signalled."))
 
 table of the database associated with OBJECT. If OBJECT is not
 yet associated with a database, an error is signalled."))
 

-(defgeneric update-instance-from-records (object &key database)
+(defgeneric update-instance-from-records (object &key database this-class)

   (:documentation
    "Updates the slot values of the View Class instance OBJECT
 using the attribute values of the appropriate table of DATABASE
   (:documentation
    "Updates the slot values of the View Class instance OBJECT
 using the attribute values of the appropriate table of DATABASE