r9185: first effort at support field names in QUERY calls, still needs testing

[clsql.git] / base / db-interface.lisp

diff --git a/base/db-interface.lisp b/base/db-interface.lisp
index 64a15c59da3b11f7a95bbffed48fa32ad8c2c4fe..cfae08a402ef84c66d7f1ee47cc8e4accb5a5eb2 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."))
@@ -59,9 +52,9 @@ was called with the connection-spec."))
           (signal-no-database-error database))
   (:documentation "Internal generic implementation of disconnect."))
 
-(defgeneric database-query (query-expression database result-types)
-  (:method (query-expression (database t) result-types)
-          (declare (ignore query-expression result-types))
+(defgeneric database-query (query-expression database result-types field-names)
+  (:method (query-expression (database t) result-types field-names)
+          (declare (ignore query-expression result-types field-names))
           (signal-no-database-error database))
   (:documentation "Internal generic implementation of query."))
 
@@ -284,7 +277,7 @@ the given lisp type and parameters."))
     (signal-closed-database-error database)))
 
 (defmethod database-query :before (query-expression (database database) 
-                                  result-set)
+                                  result-set field-names)
   (declare (ignore query-expression result-set))
   (unless (is-database-open database)
     (signal-closed-database-error database)))