X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-odbc%2Fodbc-api.lisp;h=a15d628f8c3c82120ed7cbf7e91f00ba5f6465b2;hp=1d82470d62e350efc919867bf09c8418f47dd75b;hb=d107be8f0cad113b96b6cfe443cc4d7c08126db4;hpb=af6f86714c42fb34e4d914136cf18f336fc2460e diff --git a/db-odbc/odbc-api.lisp b/db-odbc/odbc-api.lisp index 1d82470..a15d628 100644 --- 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)) +(defparameter +null-handle-ptr+ (make-null-pointer :void)) (defvar *info-output* nil "Stream to send SUCCESS_WITH_INFO messages.") @@ -97,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) - (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 @@ -115,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) - (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 @@ -838,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) - (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))) @@ -857,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) - #+ingore(eq (sql-state +null-ptr+ +null-ptr+ hstmt) + #+ingore(eq (sql-state +null-handle-ptr+ +null-handle-ptr+ hstmt) $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)