r9335: Automated commit for Debian build of clsql upstream-version-2.10.16

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

diff --git a/base/db-interface.lisp b/base/db-interface.lisp
index 64a15c59da3b11f7a95bbffed48fa32ad8c2c4fe..3ddfd89c032e64741fbd3f949dddecc8166dc8ba 100644 (file)
--- a/base/db-interface.lisp
+++ b/base/db-interface.lisp
@@ -19,7 +19,7 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(in-package #:clsql-base-sys)
+(in-package #:clsql-base)
 
 (defgeneric database-type-load-foreign (database-type)
   (:documentation
@@ -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."))
 
@@ -193,7 +186,8 @@ the given lisp type and parameters."))
   (:documentation "List all attributes in TABLE."))
 
 (defgeneric database-attribute-type (attribute table database &key owner)
-  (:documentation "Return the type of ATTRIBUTE in TABLE."))
+  (:documentation "Return the type of ATTRIBUTE in TABLE. Returns multiple values
+of TYPE_NAME (keyword) PRECISION SCALE NULLABLE."))
 
 (defgeneric database-add-attribute (table attribute database)
   (:documentation "Add the attribute to the table."))
@@ -284,8 +278,8 @@ the given lisp type and parameters."))
     (signal-closed-database-error database)))
 
 (defmethod database-query :before (query-expression (database database) 
-                                  result-set)
-  (declare (ignore query-expression result-set))
+                                  result-set field-names)
+  (declare (ignore query-expression result-set field-names))
   (unless (is-database-open database)
     (signal-closed-database-error database)))