r8936: merged classic-tests into tests

[clsql.git] / db-aodbc / aodbc-sql.lisp

diff --git a/db-aodbc/aodbc-sql.lisp b/db-aodbc/aodbc-sql.lisp
index 641764b23fc7812119a756d85e9689456f021112..24a6e47ea34b2fd3d403d0c60e5fd49c98696fb6 100644 (file)
--- a/db-aodbc/aodbc-sql.lisp
+++ b/db-aodbc/aodbc-sql.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: aodbc-sql.lisp,v 1.1 2002/09/30 10:19:23 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,12 +16,10 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :clsql-aodbc)
-
+(in-package #:clsql-aodbc)
 
 ;; interface foreign library loading routines
-(defmethod database-type-library-loaded ((database-type (eql :aodbc)))
+(defmethod clsql-base-sys:database-type-library-loaded ((database-type (eql :aodbc)))
   "T if foreign library was able to be loaded successfully. "
   (when (find-package :dbi) ;; finds Allegro's DBI (AODBC) package
     t))
@@ -72,11 +70,11 @@
   (setf (database-aodbc-conn database) nil)
   t)
 
-(defmethod database-query (query-expression (database aodbc-database) types) 
+(defmethod database-query (query-expression (database aodbc-database) result-types) 
   #+aodbc-v2
   (handler-case
       (dbi:sql query-expression :db (database-aodbc-conn database)
-              :types types)
+              :types result-types)
     (error ()
       (error 'clsql-sql-error
             :database database
@@ -101,8 +99,9 @@
   (types nil :type cons)
   (full-set nil :type boolean))
 
-(defmethod database-query-result-set (query-expression (database aodbc-database) 
-                                     &key full-set types)
+(defmethod database-query-result-set ((query-expression string)
+                                     (database aodbc-database) 
+                                     &key full-set result-types)
   #+aodbc-v2
   (handler-case 
       (multiple-value-bind (query column-names)
@@ -111,11 +110,11 @@
                   :row-count nil
                   :column-names t
                   :query t
-                  :types types
+                  :types result-types
                   )
        (values
         (make-aodbc-result-set :query query :full-set full-set 
-                               :types types)
+                               :types result-types)
         (length column-names)
         nil ;; not able to return number of rows with aodbc
         ))
@@ -145,6 +144,6 @@
              (setf (car rest) elem))
        list))))
 
-                      
+#+ignore                      
 (when (clsql-base-sys:database-type-library-loaded :aodbc)
   (clsql-base-sys:initialize-database-type :database-type :aodbc))