projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r9050: Automated commit for Debian build of clsql upstream-version-2.7.6
[clsql.git]
/
db-odbc
/
odbc-api.lisp
diff --git
a/db-odbc/odbc-api.lisp
b/db-odbc/odbc-api.lisp
index 38877a7c112ffadd254ea91d09f10b6c8fcbaf3e..a15d628f8c3c82120ed7cbf7e91f00ba5f6465b2 100644
(file)
--- a/
db-odbc/odbc-api.lisp
+++ b/
db-odbc/odbc-api.lisp
@@
-31,6
+31,7
@@
May be locally bound to something else if a certain type is necessary.")
as possible second argument) to the desired representation of date/time/timestamp.")
(defvar +null-ptr+ (make-null-pointer :byte))
as possible second argument) to the desired representation of date/time/timestamp.")
(defvar +null-ptr+ (make-null-pointer :byte))
+(defparameter +null-handle-ptr+ (make-null-pointer :void))
(defvar *info-output* nil
"Stream to send SUCCESS_WITH_INFO messages.")
(defvar *info-output* nil
"Stream to send SUCCESS_WITH_INFO messages.")
@@
-64,7
+65,6
@@
as possible second argument) to the desired representation of date/time/timestam
#.$SQL_MAX_MESSAGE_LENGTH msg-length)
(let ((err (convert-from-foreign-string error-message))
(state (convert-from-foreign-string sql-state)))
#.$SQL_MAX_MESSAGE_LENGTH msg-length)
(let ((err (convert-from-foreign-string error-message))
(state (convert-from-foreign-string sql-state)))
-
(free-foreign-object error-message)
(free-foreign-object sql-state)
(values
(free-foreign-object error-message)
(free-foreign-object sql-state)
(values
@@
-98,9
+98,9
@@
as possible second argument) to the desired representation of date/time/timestam
(#.$SQL_SUCCESS_WITH_INFO
(when ,print-info
(multiple-value-bind (error-message sql-state)
(#.$SQL_SUCCESS_WITH_INFO
(when ,print-info
(multiple-value-bind (error-message sql-state)
- (handle-error (or ,henv +null-ptr+)
- (or ,hdbc +null-ptr+)
- (or ,hstmt +null-ptr+))
+ (handle-error (or ,henv +null-
handle-
ptr+)
+ (or ,hdbc +null-
handle-
ptr+)
+ (or ,hstmt +null-
handle-
ptr+))
(when *info-output*
(format *info-output* "[ODBC info ~A] ~A state: ~A"
,result-code error-message
(when *info-output*
(format *info-output* "[ODBC info ~A] ~A state: ~A"
,result-code error-message
@@
-116,9
+116,9
@@
as possible second argument) to the desired representation of date/time/timestam
:odbc-message "Still executing"))
(#.$SQL_ERROR
(multiple-value-bind (error-message sql-state)
:odbc-message "Still executing"))
(#.$SQL_ERROR
(multiple-value-bind (error-message sql-state)
- (handle-error (or ,henv +null-ptr+)
- (or ,hdbc +null-ptr+)
- (or ,hstmt +null-ptr+))
+ (handle-error (or ,henv +null-
handle-
ptr+)
+ (or ,hdbc +null-
handle-
ptr+)
+ (or ,hstmt +null-
handle-
ptr+))
(error
'clsql-base-sys:clsql-odbc-error
:odbc-message error-message
(error
'clsql-base-sys:clsql-odbc-error
:odbc-message error-message
@@
-839,7
+839,7
@@
as possible second argument) to the desired representation of date/time/timestam
data-length)))
(error "wrong type. preliminary."))
while (and (= res $SQL_SUCCESS_WITH_INFO)
data-length)))
(error "wrong type. preliminary."))
while (and (= res $SQL_SUCCESS_WITH_INFO)
- (equal (sql-state +null-
ptr+ +null
-ptr+ hstmt)
+ (equal (sql-state +null-
handle-ptr+ +null-handle
-ptr+ hstmt)
"01004"))
do (setf res (%sql-get-data hstmt column-nr c-type data-ptr
+max-precision+ out-len-ptr)))
"01004"))
do (setf res (%sql-get-data hstmt column-nr c-type data-ptr
+max-precision+ out-len-ptr)))
@@
-858,9
+858,9
@@
as possible second argument) to the desired representation of date/time/timestam
(error "wrong type. preliminary."))
while
(and (= res $SQL_SUCCESS_WITH_INFO)
(error "wrong type. preliminary."))
while
(and (= res $SQL_SUCCESS_WITH_INFO)
- #+ingore(eq (sql-state +null-
ptr+ +null
-ptr+ hstmt)
+ #+ingore(eq (sql-state +null-
handle-ptr+ +null-handle
-ptr+ hstmt)
$sql-data-truncated)
$sql-data-truncated)
- (equal (sql-state +null-
ptr+ +null
-ptr+ hstmt)
+ (equal (sql-state +null-
handle-ptr+ +null-handle
-ptr+ hstmt)
"01004"))
do (setf res (%sql-get-data hstmt column-nr c-type data-ptr
+max-precision+ out-len-ptr)
"01004"))
do (setf res (%sql-get-data hstmt column-nr c-type data-ptr
+max-precision+ out-len-ptr)