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 780c19663d50eca6039b37ad42c7ef7adac6f9e1..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.
4 2002/03/24 18:39:32
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
;;;;
@@
-60,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)
field-
types)
+(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
@@
-83,11
+84,11
@@
(defstruct aodbc-result-set
(query nil)
(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)
(full-set nil :type boolean))
(defmethod database-query-result-set (query-expression (database aodbc-database)
- &key full-set
field-
types)
+ &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
@@
-95,10
+96,11
@@
:row-count nil
:column-names t
:query t
:row-count nil
:column-names t
:query t
+ :types types
)
(values
(make-aodbc-result-set :query query :full-set full-set
)
(values
(make-aodbc-result-set :query query :full-set full-set
- :
field-types field-
types)
+ :
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
))