Pulling in changes from darcs patch:

[clsql.git] / sql / generics.lisp

diff --git a/sql/generics.lisp b/sql/generics.lisp
index 792a9dec90c5ac7277369e4905b1755a995908e0..0814d0f2674d1bdf556c6bd4f0e128107daa0baa 100644 (file)
--- a/sql/generics.lisp
+++ b/sql/generics.lisp
@@ -21,6 +21,13 @@
 
 ;; FDML
 
 
 ;; FDML
 

+(defgeneric choose-database-for-instance (object database)
+  (:documentation "Used by the oodml functions to select which
+ database object to use. Chooses the database associated with the
+ object primarily, falls back to the database provided as an argument
+ or the *DEFAULT-DATABASE*."))
+
+

 (defgeneric execute-command (expression &key database)
   (:documentation
    "Executes the SQL command EXPRESSION, which may be an SQL
 (defgeneric execute-command (expression &key database)
   (:documentation
    "Executes the SQL command EXPRESSION, which may be an SQL


@@ -84,7 +91,7 @@ case, a record is created in the appropriate table of DATABASE
 using values from the slot values of OBJECT, and OBJECT becomes
 associated with DATABASE."))
 
 using values from the slot values of OBJECT, and OBJECT becomes
 associated with DATABASE."))
 

-(defgeneric delete-instance-records (object)
+(defgeneric delete-instance-records (object &key database)

   (:documentation
    "Deletes the records represented by OBJECT in the appropriate
 table of the database associated with OBJECT. If OBJECT is not
   (:documentation
    "Deletes the records represented by OBJECT in the appropriate
 table of the database associated with OBJECT. If OBJECT is not