X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-aodbc%2Faodbc-sql.lisp;h=e83b3fe0aa1bfb0869e3fb36c777fc8959795643;hp=ed7bb249f009ebe43e09df71f98f2a39e8a3c3f7;hb=e567409d9fff3f7231c2a0bb69b345e19de2b246;hpb=8d558ce162d1360f92e4d65d054e2f61c786319e

diff --git a/db-aodbc/aodbc-sql.lisp b/db-aodbc/aodbc-sql.lisp
index ed7bb24..e83b3fe 100644
--- 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.2 2003/05/02 03:05:54 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,33 +16,28 @@
 ;;;; (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 clsql-base-sys:database-type-library-loaded ((database-type (eql :aodbc)))
+(defmethod clsql-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))
 
-(defmethod clsql-base-sys:database-type-load-foreign ((databae-type (eql :aodbc)))
+(defmethod clsql-sys:database-type-load-foreign ((databae-type (eql :aodbc)))
   t)
 
 (when (find-package :dbi)
-  (clsql-base-sys:database-type-load-foreign :aodbc)) 
-
-(defmethod database-initialize-database-type ((database-type (eql :aodbc)))
-  t)
+  (clsql-sys:database-type-load-foreign :aodbc))
 
 
 ;; AODBC interface
 
-(defclass aodbc-database (database)
-  ((aodbc-conn :accessor database-aodbc-conn :initarg :aodbc-conn)))
+(defclass aodbc-database (generic-odbc-database)
+  ((aodbc-db-type :accessor database-aodbc-db-type :initform :unknown)))
 
 (defmethod database-name-from-spec (connection-spec
-				    (database-type (eql :aodbc)))
+                                    (database-type (eql :aodbc)))
   (check-connection-spec connection-spec database-type (dsn user password))
   (destructuring-bind (dsn user password) connection-spec
     (declare (ignore password))
@@ -53,98 +48,57 @@
   #+aodbc-v2
   (destructuring-bind (dsn user password) connection-spec
     (handler-case
-	(make-instance 'aodbc-database
-	  :name (database-name-from-spec connection-spec :aodbc)
-	  :aodbc-conn
-	  (dbi:connect :user user
-		       :password password
-		       :data-source-name dsn))
-      (error () 	;; Init or Connect failed
-	(error 'clsql-connect-error
-	       :database-type database-type
-	       :connection-spec connection-spec
-	       :errno nil
-	       :error "Connection failed")))))
-
-(defmethod database-disconnect ((database aodbc-database))
-  #+aodbc-v2
-  (dbi:disconnect (database-aodbc-conn database))
-  (setf (database-aodbc-conn database) nil)
-  t)
-
-(defmethod database-query (query-expression (database aodbc-database) types) 
+        (make-instance 'aodbc-database
+          :name (database-name-from-spec connection-spec :aodbc)
+          :database-type :aodbc
+          :dbi-package (find-package '#:dbi)
+          :odbc-conn
+          (dbi:connect :user user
+                       :password password
+                       :data-source-name dsn))
+      (sql-error (e)
+        (error e))
+      (error ()         ;; Init or Connect failed
+        (error 'sql-connection-error
+               :database-type database-type
+               :connection-spec connection-spec
+               :message "Connection failed")))))
+
+
+(defmethod database-query (query-expression (database aodbc-database)
+                           result-types field-names)
   #+aodbc-v2
   (handler-case
-      (dbi:sql query-expression :db (database-aodbc-conn database)
-	       :types types)
+      (dbi:sql query-expression
+               :db (clsql-sys::odbc-conn database)
+               :types result-types
+               :column-names field-names)
+    #+ignore
     (error ()
-      (error 'clsql-sql-error
-	     :database database
-	     :expression query-expression
-	     :errno nil
-	     :error "Query failed"))))
-
-(defmethod database-execute-command (sql-expression 
-				     (database aodbc-database))
-  #+aodbc-v2
-  (handler-case
-      (dbi:sql sql-expression :db (database-aodbc-conn database))
-    (error ()
-      (error 'clsql-sql-error
-	     :database database
-	     :expression sql-expression
-	     :errno nil
-	     :error "Execute command failed"))))
-
-(defstruct aodbc-result-set
-  (query nil)
-  (types nil :type cons)
-  (full-set nil :type boolean))
-
-(defmethod database-query-result-set (query-expression (database aodbc-database) 
-				      &key full-set types)
-  #+aodbc-v2
-  (handler-case 
-      (multiple-value-bind (query column-names)
-	  (dbi:sql query-expression 
-		   :db (database-aodbc-conn database) 
-		   :row-count nil
-		   :column-names t
-		   :query t
-		   :types types
-		   )
-	(values
-	 (make-aodbc-result-set :query query :full-set full-set 
-				:types types)
-	 (length column-names)
-	 nil ;; not able to return number of rows with aodbc
-	 ))
-    (error ()
-      (error 'clsql-sql-error
-	     :database database
-	     :expression query-expression
-	     :errno nil
-	     :error "Query result set failed"))))
+      (error 'sql-database-data-error
+             :database database
+             :expression query-expression
+             :message "Query failed"))))
 
-(defmethod database-dump-result-set (result-set (database aodbc-database))
-  #+aodbc-v2
-  (dbi:close-query (aodbc-result-set-query result-set))
+(defmethod database-create (connection-spec (type (eql :aodbc)))
+  (warn "Not implemented."))
+
+(defmethod database-destroy (connection-spec (type (eql :aodbc)))
+  (warn "Not implemented."))
+
+(defmethod database-probe (connection-spec (type (eql :aodbc)))
+  (warn "Not implemented."))
+
+;;; Backend capabilities
+
+(defmethod database-underlying-type ((database aodbc-database))
+  (database-aodbc-db-type database))
+
+(defmethod db-backend-has-create/destroy-db? ((db-type (eql :aodbc)))
+  nil)
+
+(defmethod database-initialize-database-type ((database-type (eql :aodbc)))
   t)
 
-(defmethod database-store-next-row (result-set
-				    (database aodbc-database)
-				    list)
-  #+aodbc-v2
-  (let ((row (dbi:fetch-row (aodbc-result-set-query result-set) nil 'eof)))
-    (if (eq row 'eof)
-	nil
-      (progn
-	(loop for elem in row
-	    for rest on list
-	    do
-	      (setf (car rest) elem))
-	list))))
-
-#+ignore		       
-(when (clsql-base-sys:database-type-library-loaded :aodbc)
-  (clsql-base-sys:initialize-database-type :database-type :aodbc))
+(when (clsql-sys:database-type-library-loaded :aodbc)
+  (clsql-sys:initialize-database-type :database-type :aodbc))