projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r1679: Fix read-double-from-socket-bug
[clsql.git]
/
interfaces
/
aodbc
/
aodbc-sql.cl
diff --git
a/interfaces/aodbc/aodbc-sql.cl
b/interfaces/aodbc/aodbc-sql.cl
index c1a74c9f90c80f4d52d2432660b9bb44b594d91a..2e83b5a89262bfd0d9dc3a51e5dd9feb8326f371 100644
(file)
--- a/
interfaces/aodbc/aodbc-sql.cl
+++ b/
interfaces/aodbc/aodbc-sql.cl
@@
-7,7
+7,7
@@
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Feb 2002
;;;;
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Feb 2002
;;;;
-;;;; $Id: aodbc-sql.cl,v 1.
1 2002/03/23 14:04:52
kevin Exp $
+;;;; $Id: aodbc-sql.cl,v 1.
6 2002/03/25 23:48:46
kevin Exp $
;;;;
;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
;;;;
;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
@@
-20,6
+20,11
@@
(in-package :clsql-aodbc)
(in-package :clsql-aodbc)
+(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 database-initialize-database-type ((database-type (eql :aodbc)))
t)
(defmethod database-initialize-database-type ((database-type (eql :aodbc)))
t)
@@
-55,9
+60,10
@@
(setf (database-aodbc-conn database) nil)
t)
(setf (database-aodbc-conn database) nil)
t)
-(defmethod database-query (query-expression (database aodbc-database)
)
+(defmethod database-query (query-expression (database aodbc-database)
types)
(handler-case
(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
(error ()
(error 'clsql-sql-error
:database database
@@
-78,11
+84,11
@@
(defstruct aodbc-result-set
(query nil)
(defstruct aodbc-result-set
(query nil)
- (full-set nil))
+ (types nil :type cons)
+ (full-set nil :type boolean))
-(defmethod database-query-result-set (query-expression
- (database aodbc-database)
- &optional full-set)
+(defmethod database-query-result-set (query-expression (database aodbc-database)
+ &key full-set types)
(handler-case
(multiple-value-bind (query column-names)
(dbi:sql query-expression
(handler-case
(multiple-value-bind (query column-names)
(dbi:sql query-expression
@@
-90,9
+96,11
@@
:row-count nil
:column-names t
:query t
:row-count nil
:column-names t
:query t
+ :types types
)
(values
)
(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
))
(length column-names)
nil ;; not able to return number of rows with aodbc
))