r9137: add defgenerics

diff --git a/base/db-interface.lisp b/base/db-interface.lisp
index 64a15c59da3b11f7a95bbffed48fa32ad8c2c4fe..2d52105bd2bb3dc478c1cc7b570c9499896ab625 100644 (file)
--- a/base/db-interface.lisp
+++ b/base/db-interface.lisp
@@ -30,13 +30,6 @@
    "The internal generic implementation for checking if
 database type library loaded successfully."))
 
-(defgeneric database-type (database)
-  (:documentation
-   "Returns database type")
-  (:method (database)
-          (signal-no-database-error database)))
-
-
 (defgeneric database-initialize-database-type (database-type)
   (:documentation
    "The internal generic implementation of initialize-database-type."))

diff --git a/base/time.lisp b/base/time.lisp
index 44f10e15bd8b6be35fe2481871a9f4112a38a1bc..80e5bed24120e9b504e2e8405c4db89df674f2e1 100644 (file)
--- a/base/time.lisp
+++ b/base/time.lisp
@@ -785,6 +785,9 @@ with the given options"
         (t
          (values hours "AM"))))
 
+(defgeneric to-string (val &rest keys)
+  )
+
 (defmethod to-string ((time wall-time) &rest keys)
   (destructuring-bind (&key (style :daytime) &allow-other-keys)
       keys

diff --git a/base/utils.lisp b/base/utils.lisp
index 9fb6e7c2b59c99af41079353a57270cc4376b186..0968f96401ad3026bd113db01866c31cd009489f 100644 (file)
--- a/base/utils.lisp
+++ b/base/utils.lisp
@@ -342,7 +342,7 @@ list of characters and replacement strings."
   #+lowercase-reader
   (string-downcase str))
 
-(defmethod convert-to-db-default-case (str database)
+(defun convert-to-db-default-case (str database)
   (if database
       (case (db-type-default-case (database-underlying-type database))
        (:upper (string-upcase str))

diff --git a/clsql.asd b/clsql.asd
index 6bd2b9b414f96c729cae509829c9850cd25f1849..80bcc554200a7511b7a21331b5ace6e23cbdcbb0 100644 (file)
--- a/clsql.asd
+++ b/clsql.asd
@@ -40,7 +40,7 @@ a functional and an object oriented interface."
               (:module :core
                        :pathname ""
                        :components ((:file "generics")
-                                    (:file "classes")
+                                    (:file "classes" :depends-on ("generics"))
                                     (:file "operations" :depends-on ("classes"))
                                     (:file "syntax"))
                        :depends-on (:package))

diff --git a/sql/classes.lisp b/sql/classes.lisp
index c2cd651317291031fb6b82fcc59646db951bc6d0..c6cf764ab9debdfea53a8c2494aa77883702f92d 100644 (file)
--- a/sql/classes.lisp
+++ b/sql/classes.lisp
@@ -432,7 +432,7 @@ uninclusive, and the args from that keyword to the end."
                 (subseq select-args first-key-arg))
         select-args)))
 
-(defmethod make-query (&rest args)
+(defun make-query (&rest args)
   (multiple-value-bind (selections arglist)
       (query-get-selections args)
     (destructuring-bind (&key all flatp set-operation distinct from where

diff --git a/sql/generics.lisp b/sql/generics.lisp
index eabb8e5336f1fb07b745ca3271d59c1b6a1d373f..a8de765681f9521c8f8b5e0329c23ca1903f3440 100644 (file)
--- a/sql/generics.lisp
+++ b/sql/generics.lisp
@@ -24,4 +24,34 @@
 (defgeneric output-sql-hash-key (arg database)
   )
 
+(defgeneric collect-table-refs (sql)
+  )
+(defgeneric database-output-sql (arg database)
+  )
+(defgeneric database-constraint-description  (constraint database)
+  )
+(defgeneric database-pkey-constraint  (class database)
+  )
+(defgeneric database-constraint-statement  (constraints database)
+  )
+(defgeneric %install-class  (class database)
+  )
+(defgeneric database-generate-column-definition  (class slotdef database)
+  )
+(defgeneric update-slot-from-db  (instance slotdef val)
+  )
+(defgeneric key-value-from-db  (slotdef value database)
+  )
+(defgeneric get-slot-values-from-view  (obj slotdeflist values)
+  )
+(defgeneric database-output-sql-as-type  (type val database)
+  )
+(defgeneric read-sql-value  (val type database)
+  )
+(defgeneric postinitialize  (object)
+  )
+(defgeneric add-to-relation  (target slot-name value)
+  )
+(defgeneric remove-from-relation  (target slot-name value)
+  )