X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=base%2Fdb-interface.lisp;fp=base%2Fdb-interface.lisp;h=2904f3d46365d877e8c6dc55357b1ea59e6e0641;hp=93e39734085ef66d45fc529d8b356bd9735a7421;hb=5691bb90517d7c565a141d131da76c3de1f8d566;hpb=7fe2be1c1362639b32fab48534f3dce614586ff4

diff --git a/base/db-interface.lisp b/base/db-interface.lisp
index 93e3973..2904f3d 100644
--- a/base/db-interface.lisp
+++ b/base/db-interface.lisp
@@ -56,12 +56,12 @@ was called with the connection-spec."))
 	   (signal-nodb-error database))
   (:documentation "Internal generic implementation of disconnect."))
 
-(defgeneric database-query (query-expression database types)
-  (:method (query-expression (database closed-database) types)
-	   (declare (ignore query-expression types))
+(defgeneric database-query (query-expression database result-types)
+  (:method (query-expression (database closed-database) result-types)
+	   (declare (ignore query-expression result-types))
 	   (signal-closed-database-error database))  
-  (:method (query-expression (database t) types)
-	   (declare (ignore query-expression types))
+  (:method (query-expression (database t) result-types)
+	   (declare (ignore query-expression result-types))
 	   (signal-nodb-error database))
   (:documentation "Internal generic implementation of query."))
 
@@ -77,13 +77,13 @@ was called with the connection-spec."))
 
 ;;; Mapping and iteration
 (defgeneric database-query-result-set
-    (query-expression database &key full-set types)
-  (:method (query-expression (database closed-database) &key full-set types)
-	   (declare (ignore query-expression full-set types))
+    (query-expression database &key full-set result-types)
+  (:method (query-expression (database closed-database) &key full-set result-types)
+	   (declare (ignore query-expression full-set result-types))
 	   (signal-closed-database-error database)
 	   (values nil nil nil))
-  (:method (query-expression (database t) &key full-set types)
-	   (declare (ignore query-expression full-set types))
+  (:method (query-expression (database t) &key full-set result-types)
+	   (declare (ignore query-expression full-set result-types))
 	   (signal-nodb-error database)
 	   (values nil nil nil))
   (:documentation