X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=interfaces%2Faodbc%2Faodbc-sql.cl;h=5eaa960da3d81b6befe01a77196dd9ef5325e3ab;hb=42a951e9f7152e7c145958f4dfed41d4e865c9fd;hp=e3eedb54a565b1f784e1c00b77c4bf43e2314fdb;hpb=01e78fad2d9c4c18f11ec032c80afa59212ba109;p=clsql.git diff --git a/interfaces/aodbc/aodbc-sql.cl b/interfaces/aodbc/aodbc-sql.cl index e3eedb5..5eaa960 100644 --- a/interfaces/aodbc/aodbc-sql.cl +++ b/interfaces/aodbc/aodbc-sql.cl @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: aodbc-sql.cl,v 1.3 2002/03/24 18:08:27 kevin Exp $ +;;;; $Id: aodbc-sql.cl,v 1.11 2002/05/27 17:19:30 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -20,14 +20,24 @@ (in-package :clsql-aodbc) +;; interface foreign library loading routines (defmethod 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))) + t) + +(when (find-package :dbi) + (clsql-base-sys:database-type-load-foreign :aodbc)) + (defmethod database-initialize-database-type ((database-type (eql :aodbc))) t) + +;; AODBC interface + (defclass aodbc-database (database) ((aodbc-conn :accessor database-aodbc-conn :initarg :aodbc-conn))) @@ -40,6 +50,7 @@ (defmethod database-connect (connection-spec (database-type (eql :aodbc))) (check-connection-spec connection-spec database-type (dsn user password)) + #+aodbc-v2 (destructuring-bind (dsn user password) connection-spec (handler-case (make-instance 'aodbc-database @@ -56,13 +67,16 @@ :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) field-types) +(defmethod database-query (query-expression (database aodbc-database) types) + #+aodbc-v2 (handler-case - (dbi:sql query-expression :db (database-aodbc-conn database)) + (dbi:sql query-expression :db (database-aodbc-conn database) + :types types) (error () (error 'clsql-sql-error :database database @@ -72,6 +86,7 @@ (defmethod database-execute-command (sql-expression (database aodbc-database)) + #+aodbc-v2 (handler-case (dbi:sql sql-expression :db (database-aodbc-conn database)) (error () @@ -83,11 +98,12 @@ (defstruct aodbc-result-set (query nil) - (field-types nil :type cons) + (types nil :type cons) (full-set nil :type boolean)) (defmethod database-query-result-set (query-expression (database aodbc-database) - &key full-set field-types) + &key full-set types) + #+aodbc-v2 (handler-case (multiple-value-bind (query column-names) (dbi:sql query-expression @@ -95,9 +111,11 @@ :row-count nil :column-names t :query t + :types types ) (values - (make-aodbc-result-set :query query :full-set full-set) + (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 )) @@ -109,12 +127,14 @@ :error "Query result set failed")))) (defmethod database-dump-result-set (result-set (database aodbc-database)) + #+aodbc-v2 (dbi:close-query (aodbc-result-set-query result-set)) 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 @@ -126,3 +146,5 @@ list)))) +(when (clsql-base-sys:database-type-library-loaded :aodbc) + (clsql-base-sys:initialize-database-type :database-type :aodbc))