use md5sum-string instead of md5sum-sequence to adjust to upstream changes
[clsql.git] / db-odbc / odbc-api.lisp
index 1775b315a8555cf80783fed67caa668d2ba33f86..208dafa7536190665644a5709ad9fb99f04eb81b 100644 (file)
@@ -2,11 +2,9 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:     odbc-ff-interface.lisp
-;;;; Purpose:  Function definitions for UFFI interface to ODBC
-;;;; Author:   Kevin M. Rosenberg, Paul Meurer
-;;;;
-;;;; $Id: odbc-package.lisp 7061 2003-09-07 06:34:45Z kevin $
+;;;; Name:     odbc-api.lisp
+;;;; Purpose:  Low-level ODBC API using UFFI
+;;;; Authors:  Kevin M. Rosenberg and Paul Meurer
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2004 by Kevin M. Rosenberg
 ;;;; and Copyright (C) Paul Meurer 1999 - 2001. All rights reserved.
 
 (in-package #:odbc)
 
-(defvar *null* (make-null-pointer :byte))
-(defvar *binary-format* :unsigned-byte-vector)
-(defvar *time-conversion-function* 'identity)
-(defvar *trace-sql* nil)
+(defvar *null* nil
+  "Lisp representation of SQL Null value, default = nil.
+May be locally bound to something else if a certain type is necessary.")
+
 
-(defun %null-ptr ()
-  (allocate-foreign-object :pointer-void))
+(defvar *binary-format* :unsigned-byte-vector)
+(defvar *time-format*
+  (lambda (time)
+    (clsql-sys:format-time nil time :format :iso))
+   "Bound to a function that converts from a clsql:wall-time to the desired
+    representation of date/time/timestamp.
+    By default, returns an iso-timestring.")
+
+(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.")
 
 (defmacro %put-str (ptr string &optional max-length)
   (let ((size (gensym)))
     `(let ((,size (length ,string)))
        (when (and ,max-length (> ,size ,max-length))
-         (error "string \"~a\" of length ~d is longer than max-length: ~d"
-                ,string ,size ,max-length))
-       (dotimes (i ,size)
-         (setf (deref-array ,ptr '(:array :unsigned-char) i) (char ,string i)))
-       (setf (deref-array ,ptr '(:array :unsigned-char) ,size) 0))))
+         (error 'clsql:sql-database-data-error
+                :message
+                (format nil "string \"~a\" of length ~d is longer than max-length: ~d"
+                        ,string ,size ,max-length)))
+      (with-cast-pointer (char-ptr ,ptr :byte)
+        (dotimes (i ,size)
+          (setf (deref-array char-ptr '(:array :byte) i)
+                (char-code (char ,string i))))
+        (setf (deref-array char-ptr '(:array :byte) ,size) 0)))))
+
+(defmacro with-allocate-foreign-string ((var len) &body body)
+  "Safely does uffi:allocate-foreign-string-- making sure we do the uffi:free-foreign-object"
+  `(let ((,var))
+    (unwind-protect
+         (progn
+           (setf ,var (uffi:allocate-foreign-string ,len))
+           ,@body)
+      (when ,var
+        (uffi:free-foreign-object ,var)))))
+
+(defmacro with-allocate-foreign-strings (bindings &rest body)
+  (if bindings
+      `(with-allocate-foreign-string ,(car bindings)
+        (with-allocate-foreign-strings ,(cdr bindings)
+          ,@body))
+      `(progn ,@body)))
 
 (defun handle-error (henv hdbc hstmt)
-  (with-foreign-objects ((sql-state '(:array :unsigned-char 256))
-                        (error-message '(:array :unsigned-char
-                                         #.$SQL_MAX_MESSAGE_LENGTH))
-                        (error-code :long)
-                        (msg-length :short))
+  (with-allocate-foreign-strings ((sql-state 256)
+                                  (error-message #.$SQL_MAX_MESSAGE_LENGTH))
+   (with-foreign-objects ((error-code #.$ODBC-LONG-TYPE)
+                          (msg-length :short))
     (SQLError henv hdbc hstmt sql-state
               error-code error-message
-             $SQL_MAX_MESSAGE_LENGTH msg-length)
+              #.$SQL_MAX_MESSAGE_LENGTH msg-length)
     (values
      (convert-from-foreign-string error-message)
      (convert-from-foreign-string sql-state)
-     (deref-pointer msg-length :short) 
-     (deref-pointer error-code :long))))
+     (deref-pointer msg-length :short)
+     (deref-pointer error-code #.$ODBC-LONG-TYPE)))))
 
-; test this: return a keyword for efficiency
 (defun sql-state (henv hdbc hstmt)
-  (with-foreign-objects ((sql-state '(:array :unsigned-char 256))
-                        (error-message '(:array :unsigned-char
-                                         #.$SQL_MAX_MESSAGE_LENGTH))
-                        (error-code :long)
-                        (msg-length :short))
+  (with-allocate-foreign-strings ((sql-state 256)
+                                  (error-message #.$SQL_MAX_MESSAGE_LENGTH))
+   (with-foreign-objects ((error-code #.$ODBC-LONG-TYPE)
+                          (msg-length :short))
     (SQLError henv hdbc hstmt sql-state error-code
-             error-message $SQL_MAX_MESSAGE_LENGTH msg-length)
-    (convert-from-foreign-string sql-state) ;(%cstring-to-keyword sql-state)
-    ))
+              error-message #.$SQL_MAX_MESSAGE_LENGTH msg-length)
+    (convert-from-foreign-string sql-state)
+    ;; test this: return a keyword for efficiency
+    ;;(%cstring-to-keyword state)
+    )))
 
 (defmacro with-error-handling ((&key henv hdbc hstmt (print-info t))
                                    odbc-call &body body)
-  (let ((result-code (gensym)))
+  (let ((result-code (gensym "RC-")))
     `(let ((,result-code ,odbc-call))
+
+      ;; Check for allegro v7 & v8 bug with ODBC calls returning
+      ;; 32-bit unsigned ints, not 16-bit signed ints
+      #+(and allegro mswindows)
+      (when (> ,result-code #xFFFF)
+        (warn (format nil "16-bit return bug: result-code #x~X for expression ~S"
+                      ,result-code (quote ,odbc-call)))
+        (setq ,result-code (logand ,result-code #xFFFF))
+        (when (> ,result-code #x7FFF)
+          (setq ,result-code (- ,result-code #x10000))))
+
        (case ,result-code
          (#.$SQL_SUCCESS
           (progn ,result-code ,@body))
          (#.$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)))
-              (warn "[ODBC info] ~a state: ~a"
-                   ,result-code error-message
-                   sql-state)))
+                (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
+                        sql-state))))
           (progn ,result-code ,@body))
          (#.$SQL_INVALID_HANDLE
-          (error "[ODBC error] Invalid handle"))
+          (error
+           'clsql-sys:sql-database-error
+           :message "ODBC: Invalid handle"))
          (#.$SQL_STILL_EXECUTING
-          (error "[ODBC error] Still executing"))
+          (error
+           'clsql-sys:sql-temporary-error
+           :message "ODBC: 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)))
-            (error "[ODBC error] ~a; state: ~a" error-message sql-state)))
+              (handle-error (or ,henv +null-handle-ptr+)
+                            (or ,hdbc +null-handle-ptr+)
+                            (or ,hstmt +null-handle-ptr+))
+            (error
+             'clsql-sys:sql-database-error
+             :message error-message
+             :secondary-error-id sql-state)))
+         (#.$SQL_NO_DATA_FOUND
+          (progn ,result-code ,@body))
+         ;; work-around for Allegro 7.0beta AMD64 which returns negative numbers
          (otherwise
+          (multiple-value-bind (error-message sql-state)
+              (handle-error (or ,henv +null-handle-ptr+)
+                            (or ,hdbc +null-handle-ptr+)
+                            (or ,hstmt +null-handle-ptr+))
+            (error
+             'clsql-sys:sql-database-error
+             :message error-message
+             :secondary-error-id sql-state))
+          #+ignore
           (progn ,result-code ,@body))))))
 
 (defun %new-environment-handle ()
-  (with-foreign-object (phenv 'sql-handle-ptr)
-    (with-error-handling
-       ()
-      (SQLAllocEnv phenv)
-      (deref-pointer phenv 'sql-handle-ptr))))
+  (let ((henv
+         (with-foreign-object (phenv 'sql-handle)
+           (with-error-handling
+               ()
+             (SQLAllocHandle $SQL_HANDLE_ENV +null-handle-ptr+ phenv)
+             (deref-pointer phenv 'sql-handle)))))
+    (%set-attr-odbc-version henv $SQL_OV_ODBC3)
+    henv))
+
 
 (defun %sql-free-environment (henv)
-  (with-error-handling 
+  (with-error-handling
     (:henv henv)
     (SQLFreeEnv henv)))
 
 (defun %new-db-connection-handle (henv)
-  (with-foreign-object (phdbc 'sql-handle-ptr)
+  (with-foreign-object (phdbc 'sql-handle)
+    (setf (deref-pointer phdbc 'sql-handle) +null-handle-ptr+)
     (with-error-handling
       (:henv henv)
-      (SQLAllocConnect henv phdbc)
-      (deref-pointer phdbc 'sql-handle-ptr))))
+      (SQLAllocHandle $SQL_HANDLE_DBC henv phdbc)
+      (deref-pointer phdbc 'sql-handle))))
 
 (defun %free-statement (hstmt option)
-  (with-error-handling 
+  (with-error-handling
       (:hstmt hstmt)
-      (SQLFreeStmt 
-       hstmt 
+      (SQLFreeStmt
+       hstmt
        (ecase option
          (:drop $SQL_DROP)
          (:close $SQL_CLOSE)
 
 (defun %sql-connect (hdbc server uid pwd)
   (with-cstrings ((server-ptr server)
-                 (uid-ptr uid)
-                 (pwd-ptr pwd))
-    (with-error-handling 
-       (:hdbc hdbc)
-      (SQLConnect hdbc server-ptr $SQL_NTS uid-ptr 
-                 $SQL_NTS pwd-ptr $SQL_NTS))))
-
-;;; SQLDriverConnect
-;;; [991115 CStacy@Pilgrim.COM]
-;;;
-;;; The CONNX ODBC driver can bring up a nice GUI prompt for the User-ID
-;;; and password, so that applications don't have to supply their own.
-;;;
-;;; That is not desirable for non-interactive applications, such as
-;;; web servers, so they should always supply complete login info
-;;; to SQLConnect.   But the driver won't bring up a GUI anyway
-;;; unless the SQL_QUIET_MODE is set to an HWND (nonzero).
-;;; (CONNX version 6 did not have the GUI "Integrated Login" feature,
-;;; and in version 7, it was broken such that the GUI always came up.)
-;;;
-;;; Connx version 8 respects to that connection option, so the first
-;;; thing I tried was just setting it.  I hacked the DB-CONNECT ODBC
-;;; method with this:
-;;;        (without-error-handling
-;;;         (SQLSetConnectOption hdbc $SQL_QUIET_MODE hwnd))
-;;; but that didn't work -- no GUI ever comes up from SQLConnect.
-;;; That may be a bug in the CONNX driver.
-;;;
-;;; In the end, the luser tech support person at CONNX Integrated Solutions
-;;; gave me the hint that if I were using VB, I should give it a string
-;;; like "DSN=CONNX8SAMPLES32, prompt=2".  There's no ODBC API that wants
-;;; a string like that, but SQLDriverConnect does take an attribute-value-list
-;;; connection string (including driver-defined attributes).  Reading the SDK
-;;; header files, I find that it also takes an argument that is 2 if you want
-;;; the driver to use a GUI and prompt the user.  Eureka!
-;;;
-;;; If the user specified a DSN, we use SQL_DRIVER_COMPLETE and let the
-;;; Driver Manager find the appropriate driver.  (Otherwise, aside from
-;;; the gratuitous prompt about the driver, the CONNX driver would also
-;;; prompting for the DSN and the Data Dictionary (CDD file).
-
-;; cstacy
-(defun odbc-connection-string (connection-string db-name user-id password)
-  ;; Merge the specified attributes into a usable connection-string.
-  (multiple-value-bind (dsn uid pwd other-attr-vals)
-      (odbc-parse-connection-string connection-string)
-    (setq db-name (or db-name dsn)
-          user-id (or user-id uid)
-          password (or password pwd)
-          connection-string
-          (format nil "DSN=~A~:[~;~:*;UID=~A~]~:[~;~:*;PWD=~A~]~:[~;~:*;~A~]"
-                  db-name user-id password other-attr-vals))
-    (values
-     connection-string
-     db-name
-     user-id
-     password)))
-
-;; cstacy
-(defun odbc-parse-connection-string (connection-string)
-  (flet ((parse (key)
-           (let ((beg (search key connection-string :test #'equal)))
-             (when beg
-               (subseq connection-string 
-                       (+ beg (length key)) 
-                       (position #\; connection-string :start beg))))))
-    (let ((db-name (parse "DSN="))
-          (user-id (parse "UID="))
-          (password (parse "PWD=")))
-      (values db-name user-id password nil))))
-
-(defun %sql-driver-connect (henv hdbc hwnd connection-string completion-option)
-  (let ((completion-option
-         (ecase completion-option
-           (:complete $SQL_DRIVER_COMPLETE)
-           (:required $SQL_DRIVER_COMPLETE_REQUIRED)
-           (:prompt $SQL_DRIVER_PROMPT)
-           (:noprompt $SQL_DRIVER_NOPROMPT))))
-    (with-cstring (connection-str-ptr connection-string)
-      (with-foreign-objects
-        ((complete-connection-str-ptr '(:array :unsigned-char 1024))
-         (length-ptr :short))
-        (with-error-handling 
-          (:henv henv :hdbc hdbc)
-          (SQLDriverConnect hdbc hwnd ; (%null-ptr) ; no window
-                            connection-str-ptr $SQL_NTS
-                            complete-connection-str-ptr 1024
-                            length-ptr completion-option))
-        (print (convert-from-foreign-string complete-connection-str-ptr))))))
+                  (uid-ptr uid)
+                  (pwd-ptr pwd))
+    (with-error-handling
+        (:hdbc hdbc)
+      (SQLConnect hdbc server-ptr $SQL_NTS uid-ptr
+                  $SQL_NTS pwd-ptr $SQL_NTS))))
+
+(defun %sql-driver-connect (hdbc connection-string completion window-handle)
+  (with-cstring (connection-ptr connection-string)
+    (with-allocate-foreign-string (completed-connection-string-ptr $SQL_MAX_CONN_OUT)
+      (with-foreign-object (completed-connection-length :short)
+       (with-error-handling
+           (:hdbc hdbc)
+           (SQLDriverConnect hdbc
+                             (or window-handle
+                                 +null-handle-ptr+)
+                             connection-ptr $SQL_NTS
+                             completed-connection-string-ptr $SQL_MAX_CONN_OUT
+                             completed-connection-length
+                             completion))))))
 
 (defun %disconnect (hdbc)
-  (with-error-handling 
+  (with-error-handling
     (:hdbc hdbc)
-    (SQLDisconnect hdbc)))
+    (SQLDisconnect hdbc)
+    (with-error-handling
+        (:hdbc hdbc)
+        (SQLFreeHandle $SQL_HANDLE_DBC hdbc))))
 
 (defun %commit (henv hdbc)
-  (with-error-handling 
+  (with-error-handling
     (:henv henv :hdbc hdbc)
-    (SQLTransact 
+    (SQLTransact
      henv hdbc $SQL_COMMIT)))
 
 (defun %rollback (henv hdbc)
-  (with-error-handling 
+  (with-error-handling
     (:henv henv :hdbc hdbc)
-    (SQLTransact 
+    (SQLTransact
      henv hdbc $SQL_ROLLBACK)))
 
-; col-nr is zero-based in Lisp
+; col-nr is zero-based in Lisp but 1 based in sql
 ; col-nr = :bookmark retrieves a bookmark.
 (defun %bind-column (hstmt column-nr c-type data-ptr precision out-len-ptr)
   (with-error-handling
   (with-error-handling
     (:hstmt hstmt)
     (SQLBindParameter hstmt (1+ parameter-nr)
-                      parameter-type ;$SQL_PARAM_INPUT 
+                      parameter-type ;$SQL_PARAM_INPUT
                       c-type ;$SQL_C_CHAR
                       sql-type ;$SQL_VARCHAR
                       precision ;(1- (length str))
                       scale ;0
                       data-ptr
                       max-value
-                      out-len-ptr ;#.(%null-ptr)
+                      out-len-ptr ;#.+null-ptr+
                       )))
 
 (defun %sql-fetch (hstmt)
-  (with-error-handling 
+  (with-error-handling
       (:hstmt hstmt)
       (SQLFetch hstmt)))
 
 (defun %new-statement-handle (hdbc)
-  (with-foreign-object (hstmt-ptr 'sql-handle-ptr)
-    (with-error-handling 
-      (:hdbc hdbc)
-      (SQLAllocStmt hdbc hstmt-ptr) 
-      (deref-pointer hstmt-ptr 'sql-handle-ptr))))
+  (let ((statement-handle
+         (with-foreign-object (phstmt 'sql-handle)
+           (with-error-handling
+               (:hdbc hdbc)
+             (SQLAllocHandle $SQL_HANDLE_STMT hdbc phstmt)
+             (deref-pointer phstmt 'sql-handle)))))
+    (if (uffi:null-pointer-p statement-handle)
+        (error 'clsql:sql-database-error :message "Received null statement handle.")
+        statement-handle)))
 
 (defun %sql-get-info (hdbc info-type)
   (ecase info-type
       #.$SQL_SPECIAL_CHARACTERS
       #.$SQL_TABLE_TERM
       #.$SQL_USER_NAME)
-     (with-foreign-objects ((info-ptr '(:array :unsigned-char 1024))
-                           (info-length-ptr :short))
-       (with-error-handling 
-         (:hdbc hdbc)
-        #-pcl
-         (SQLGetInfo hdbc info-type info-ptr 1023 info-length-ptr)
-        #+pcl
-         (SQLGetInfo-Str hdbc info-type info-ptr 1023 info-length-ptr)
-         (convert-from-foreign-string info-ptr))))
+     (with-allocate-foreign-string (info-ptr 1024)
+       (with-foreign-object (info-length-ptr :short)
+        (with-error-handling
+            (:hdbc hdbc)
+            (SQLGetInfo hdbc info-type info-ptr 1023 info-length-ptr)
+          (convert-from-foreign-string info-ptr)))))
     ;; those returning a word
     ((#.$SQL_ACTIVE_CONNECTIONS
       #.$SQL_ACTIVE_STATEMENTS
       #.$SQL_QUOTED_IDENTIFIER_CASE
       #.$SQL_TXN_CAPABLE)
      (with-foreign-objects ((info-ptr :short)
-                           (info-length-ptr :short))
-       (with-error-handling 
-       (:hdbc hdbc)
+                            (info-length-ptr :short))
+       (with-error-handling
+        (:hdbc hdbc)
          (SQLGetInfo hdbc
-                    info-type
-                    info-ptr
-                    255
-                    info-length-ptr)
+                     info-type
+                     info-ptr
+                     255
+                     info-length-ptr)
          (deref-pointer info-ptr :short)))
      )
     ;; those returning a long bitmask
-    ((#.$SQL_ALTER_TABLE 
+    ((#.$SQL_ALTER_TABLE
       #.$SQL_BOOKMARK_PERSISTENCE
       #.$SQL_CONVERT_BIGINT
       #.$SQL_CONVERT_BINARY
       #.$SQL_TIMEDATE_FUNCTIONS
       #.$SQL_TXN_ISOLATION_OPTION
       #.$SQL_UNION)
-     (with-foreign-objects ((info-ptr :long)
-                           (info-length-ptr :short))
-       (with-error-handling 
+     (with-foreign-objects ((info-ptr #.$ODBC-LONG-TYPE)
+                            (info-length-ptr :short))
+       (with-error-handling
          (:hdbc hdbc)
          (SQLGetInfo hdbc
-                    info-type
-                    info-ptr
-                    255
-                    info-length-ptr)
-         (deref-pointer info-ptr :long)))
+                     info-type
+                     info-ptr
+                     255
+                     info-length-ptr)
+         (deref-pointer info-ptr #.$ODBC-LONG-TYPE)))
      )
     ;; those returning a long integer
     ((#.$SQL_DEFAULT_TXN_ISOLATION
       #.$SQL_MAX_CHAR_LITERAL_LEN
       #.$SQL_ACTIVE_ENVIRONMENTS
       )
-     (with-foreign-objects ((info-ptr :long)
-                           (info-length-ptr :short))
-       (with-error-handling 
+     (with-foreign-objects ((info-ptr #.$ODBC-LONG-TYPE)
+                            (info-length-ptr :short))
+       (with-error-handling
          (:hdbc hdbc)
          (SQLGetInfo hdbc info-type info-ptr 255 info-length-ptr)
-         (deref-pointer info-ptr :long))))))
-     
+         (deref-pointer info-ptr #.$ODBC-LONG-TYPE))))))
+
 (defun %sql-exec-direct (sql hstmt henv hdbc)
   (with-cstring (sql-ptr sql)
     (with-error-handling
       (deref-pointer columns-nr-ptr :short))))
 
 (defun result-rows-count (hstmt)
-  (with-foreign-objects ((row-count-ptr :long))
+  (with-foreign-objects ((row-count-ptr #.$ODBC-LONG-TYPE))
     (with-error-handling (:hstmt hstmt)
                          (SQLRowCount hstmt row-count-ptr)
-      (deref-pointer row-count-ptr :long))))
+      (deref-pointer row-count-ptr #.$ODBC-LONG-TYPE))))
 
 ;; column counting is 1-based
 (defun %describe-column (hstmt column-nr)
-  (with-foreign-objects ((column-name-ptr '(:array :unsigned-char 256))
-                        (column-name-length-ptr :short)
-                        (column-sql-type-ptr :short)
-                        (column-precision-ptr :long)
-                        (column-scale-ptr :short)
-                        (column-nullable-p-ptr :short))
-    (with-error-handling (:hstmt hstmt)
-                         (SQLDescribeCol hstmt column-nr column-name-ptr 256
-                                         column-name-length-ptr
-                                        column-sql-type-ptr
-                                         column-precision-ptr
-                                        column-scale-ptr
-                                         column-nullable-p-ptr)
-      (values
-       (convert-from-foreign-string column-name-ptr)
-       (deref-pointer column-sql-type-ptr :short)
-       (deref-pointer column-precision-ptr :long)
-       (deref-pointer column-scale-ptr :short)
-       (deref-pointer column-nullable-p-ptr :short)))))
+  (with-allocate-foreign-string (column-name-ptr 256)
+    (with-foreign-objects ((column-name-length-ptr :short)
+                           (column-sql-type-ptr :short)
+                           (column-precision-ptr #.$ODBC-ULONG-TYPE)
+                           (column-scale-ptr :short)
+                           (column-nullable-p-ptr :short))
+     (with-error-handling (:hstmt hstmt)
+         (SQLDescribeCol hstmt column-nr column-name-ptr 256
+                         column-name-length-ptr
+                         column-sql-type-ptr
+                         column-precision-ptr
+                         column-scale-ptr
+                         column-nullable-p-ptr)
+       (values
+        (convert-from-foreign-string column-name-ptr)
+        (deref-pointer column-sql-type-ptr :short)
+        (deref-pointer column-precision-ptr #.$ODBC-ULONG-TYPE)
+        (deref-pointer column-scale-ptr :short)
+        (deref-pointer column-nullable-p-ptr :short))))))
 
 ;; parameter counting is 1-based
+;; this function isn't used, which is good because FreeTDS dosn't support it.
 (defun %describe-parameter (hstmt parameter-nr)
   (with-foreign-objects ((column-sql-type-ptr :short)
-                        (column-precision-ptr :long)
-                        (column-scale-ptr :short)
-                        (column-nullable-p-ptr :short))
-    (with-error-handling 
+                         (column-precision-ptr #.$ODBC-ULONG-TYPE)
+                         (column-scale-ptr :short)
+                         (column-nullable-p-ptr :short))
+    (with-error-handling
       (:hstmt hstmt)
       (SQLDescribeParam hstmt parameter-nr
-                       column-sql-type-ptr
+                        column-sql-type-ptr
                         column-precision-ptr
-                       column-scale-ptr
+                        column-scale-ptr
                         column-nullable-p-ptr)
       (values
        (deref-pointer column-sql-type-ptr :short)
-       (deref-pointer column-precision-ptr :long)
+       (deref-pointer column-precision-ptr #.$ODBC-ULONG-TYPE)
        (deref-pointer column-scale-ptr :short)
        (deref-pointer column-nullable-p-ptr :short)))))
 
 (defun %column-attributes (hstmt column-nr descriptor-type)
-  (with-foreign-objects ((descriptor-info-ptr '(:array :unsigned-char 256))
-                        (descriptor-length-ptr :short)
-                        (numeric-descriptor-ptr :long))
-    (with-error-handling
-      (:hstmt hstmt) 
-      (SQLColAttributes hstmt column-nr descriptor-type descriptor-info-ptr 256
-                        descriptor-length-ptr
-                       numeric-descriptor-ptr)
-      (values
-       (convert-from-foreign-string descriptor-info-ptr)
-       (deref-pointer numeric-descriptor-ptr :long)))))
-
-(defun %prepare-describe-columns (hstmt table-qualifier table-owner 
+  (with-allocate-foreign-string (descriptor-info-ptr 256)
+    (with-foreign-objects ((descriptor-length-ptr :short)
+                           (numeric-descriptor-ptr #.$ODBC-LONG-TYPE))
+     (with-error-handling
+         (:hstmt hstmt)
+         (SQLColAttributes hstmt column-nr descriptor-type descriptor-info-ptr
+                           256 descriptor-length-ptr
+                           numeric-descriptor-ptr)
+       (values
+        (convert-from-foreign-string descriptor-info-ptr)
+        (deref-pointer numeric-descriptor-ptr #.$ODBC-LONG-TYPE))))))
+
+(defun %prepare-describe-columns (hstmt table-qualifier table-owner
                                    table-name column-name)
   (with-cstrings ((table-qualifier-ptr table-qualifier)
-                 (table-owner-ptr table-owner) 
-                 (table-name-ptr table-name)
-                 (column-name-ptr column-name))
+                  (table-owner-ptr table-owner)
+                  (table-name-ptr table-name)
+                  (column-name-ptr column-name))
     (with-error-handling
-       (:hstmt hstmt) 
+        (:hstmt hstmt)
       (SQLColumns hstmt
-                 table-qualifier-ptr (length table-qualifier)
-                 table-owner-ptr (length table-owner)
-                 table-name-ptr (length table-name)
-                 column-name-ptr (length column-name)))))
+                  table-qualifier-ptr (length table-qualifier)
+                  table-owner-ptr (length table-owner)
+                  table-name-ptr (length table-name)
+                  column-name-ptr (length column-name)))))
 
-(defun %describe-columns (hdbc table-qualifier table-owner 
-                         table-name column-name)
+(defun %describe-columns (hdbc table-qualifier table-owner
+                          table-name column-name)
   (with-statement-handle (hstmt hdbc)
-    (%prepare-describe-columns hstmt table-qualifier table-owner 
+    (%prepare-describe-columns hstmt table-qualifier table-owner
                                table-name column-name)
     (fetch-all-rows hstmt)))
 
 (defun %sql-data-sources (henv &key (direction :first))
-  (with-foreign-objects 
-   ((name-ptr '(:array :unsigned-char #.(1+ $SQL_MAX_DSN_LENGTH)))
-    (name-length-ptr :short)
-    (description-ptr '(:array :unsigned-char 1024))
-    (description-length-ptr :short))
+  (with-allocate-foreign-strings ((name-ptr (1+ $SQL_MAX_DSN_LENGTH))
+                                  (description-ptr 1024))
+   (with-foreign-objects ((name-length-ptr :short)
+                          (description-length-ptr :short))
     (let ((res (with-error-handling
-                 (:henv henv)
-                 (SQLDataSources henv
-                                 (ecase direction
-                                  (:first $SQL_FETCH_FIRST)
-                                  (:next $SQL_FETCH_NEXT))
-                                 name-ptr
-                                 (1+ $SQL_MAX_DSN_LENGTH)
-                                 name-length-ptr
-                                 description-ptr
-                                 1024
-                                 description-length-ptr))))
-      (unless (= res $SQL_NO_DATA_FOUND)
-        (values (convert-from-foreign-string name-ptr)
-                (convert-from-foreign-string description-ptr))))))
+                   (:henv henv)
+                   (SQLDataSources henv
+                                   (ecase direction
+                                     (:first $SQL_FETCH_FIRST)
+                                     (:next $SQL_FETCH_NEXT))
+                                   name-ptr
+                                   (1+ $SQL_MAX_DSN_LENGTH)
+                                   name-length-ptr
+                                   description-ptr
+                                   1024
+                                   description-length-ptr))))
+      (when (= res $SQL_NO_DATA_FOUND)
+        (values
+          (convert-from-foreign-string name-ptr)
+          (convert-from-foreign-string description-ptr)))))))
+
+
 
 (defun sql-to-c-type (sql-type)
   (ecase sql-type
-    ((#.$SQL_CHAR #.$SQL_VARCHAR #.$SQL_LONGVARCHAR 
-      #.$SQL_NUMERIC #.$SQL_DECIMAL #.$SQL_BIGINT -8 -9) $SQL_C_CHAR)
+    ;; Added -10 for MSSQL ntext type and -11 for nvarchar
+    ((#.$SQL_CHAR #.$SQL_VARCHAR #.$SQL_LONGVARCHAR
+      #.$SQL_NUMERIC #.$sql_decimal -8 -9 -10 -11) $SQL_C_CHAR)
     (#.$SQL_INTEGER $SQL_C_SLONG)
+    (#.$SQL_BIGINT $SQL_C_SBIGINT)
     (#.$SQL_SMALLINT $SQL_C_SSHORT)
-    ((#.$SQL_FLOAT #.$SQL_DOUBLE) $SQL_C_DOUBLE)
+    (#.$SQL_DOUBLE $SQL_C_DOUBLE)
+    (#.$SQL_FLOAT $SQL_C_DOUBLE)
     (#.$SQL_REAL $SQL_C_FLOAT)
     (#.$SQL_DATE $SQL_C_DATE)
     (#.$SQL_TIME $SQL_C_TIME)
     (#.$SQL_TIMESTAMP $SQL_C_TIMESTAMP)
+    (#.$SQL_TYPE_DATE $SQL_C_TYPE_DATE)
+    (#.$SQL_TYPE_TIME $SQL_C_TYPE_TIME)
+    (#.$SQL_TYPE_TIMESTAMP $SQL_C_TYPE_TIMESTAMP)
     ((#.$SQL_BINARY #.$SQL_VARBINARY #.$SQL_LONGVARBINARY) $SQL_C_BINARY)
     (#.$SQL_TINYINT $SQL_C_STINYINT)
     (#.$SQL_BIT $SQL_C_BIT)))
 
+(def-type byte-pointer-type (* :byte))
+(def-type short-pointer-type (* :short))
+(def-type int-pointer-type (* :int))
+(def-type long-pointer-type (* #.$ODBC-LONG-TYPE))
+(def-type big-pointer-type (* #.$ODBC-BIG-TYPE))
+(def-type float-pointer-type (* :float))
+(def-type double-pointer-type (* :double))
+(def-type string-pointer-type (* :unsigned-char))
+
 (defun get-cast-byte (ptr)
-  (declare (type long-ptr-type out-len-ptr))
-  (with-cast-pointer (casted ptr '(* :byte))
-    (deref-pointer casted :byte)))
+  (locally (declare (type byte-pointer-type ptr))
+    (deref-pointer ptr :byte)))
 
 (defun get-cast-short (ptr)
-  (declare (type long-ptr-type out-len-ptr))
-  (with-cast-pointer (casted ptr '(* :short))
-    (deref-pointer casted :short)))
+  (locally (declare (type short-pointer-type ptr))
+    (deref-pointer ptr :short)))
 
 (defun get-cast-int (ptr)
-  (declare (type long-ptr-type out-len-ptr))
-  (with-cast-pointer (casted ptr '(* :int))
-    (deref-pointer casted :int)))
+  (locally (declare (type int-pointer-type ptr))
+    (deref-pointer ptr :int)))
 
 (defun get-cast-long (ptr)
-  (declare (type long-ptr-type out-len-ptr))
-  (with-cast-pointer (casted ptr '(* :long))
-    (deref-pointer casted :long)))
+  (locally (declare (type long-pointer-type ptr))
+    (deref-pointer ptr #.$ODBC-LONG-TYPE)))
+
+(defun get-cast-big (ptr)
+  (locally (declare (type big-pointer-type ptr))
+    (deref-pointer ptr #.$ODBC-BIG-TYPE)))
 
 (defun get-cast-single-float (ptr)
-  (declare (type long-ptr-type out-len-ptr))
-  (with-cast-pointer (casted ptr '(* :float))
-    (deref-pointer casted :float)))
+  (locally (declare (type float-pointer-type ptr))
+    (deref-pointer ptr :float)))
 
 (defun get-cast-double-float (ptr)
-  (declare (type long-ptr-type out-len-ptr))
-  (with-cast-pointer (casted ptr '(* :double))
-    (deref-pointer casted :double)))
+  (locally (declare (type double-pointer-type ptr))
+    (deref-pointer ptr :double)))
 
 (defun get-cast-foreign-string (ptr)
-  (declare (type long-ptr-type out-len-ptr))
-  (with-cast-pointer (casted ptr '(* :unsigned-char))
-    (convert-from-foreign-string casted)))
+  (locally (declare (type string-pointer-type ptr))
+    (convert-from-foreign-string ptr)))
 
 (defun get-cast-binary (ptr len format)
   "FORMAT is one of :unsigned-byte-vector, :bit-vector (:string, :hex-string)"
-  (with-cast-pointer (casted ptr '(* :byte))
+  (with-cast-pointer (casted ptr :unsigned-byte)
     (ecase format
       (:unsigned-byte-vector
        (let ((vector (make-array len :element-type '(unsigned-byte 8))))
-        (dotimes (i len)
-          (setf (aref vector i)
-                (deref-array casted '(:array :byte) i)))
-        vector))
+         (dotimes (i len)
+           (setf (aref vector i)
+                 (deref-array casted '(:array :unsigned-byte) i)))
+         vector))
       (:bit-vector
        (let ((vector (make-array (ash len 3) :element-type 'bit)))
-        (dotimes (i len)
-          (let ((byte (deref-array casted '(:array :byte) i)))
-            (dotimes (j 8)
-              (setf (bit vector (+ (ash i 3) j)) (logand (ash byte (- j 7)) 1)))))
-        vector)))))
+         (dotimes (i len)
+           (let ((byte (deref-array casted '(:array :byte) i)))
+             (dotimes (j 8)
+               (setf (bit vector (+ (ash i 3) j))
+                     (logand (ash byte (- j 7)) 1)))))
+         vector)))))
 
 
-(defun read-data (data-ptr c-type sql-type out-len-ptr convert-to-string-p)
+(defun read-data (data-ptr c-type sql-type out-len-ptr result-type)
   (declare (type long-ptr-type out-len-ptr))
-  (let ((out-len (deref-pointer out-len-ptr :long)))
-    (cond ((= out-len $SQL_NULL_DATA)
-           *null*)
-          ;; obsolete?
-          (convert-to-string-p
-           (convert-from-foreign-string data-ptr))
-          (t
-           (case sql-type
-             ;; SQL extended datatypes
-             (#.$SQL_TINYINT  (get-cast-short data-ptr))
-             (#.$SQL_C_STINYINT (get-cast-short data-ptr)) ;; ?
-             (#.$SQL_C_SSHORT (get-cast-short data-ptr)) ;; ?
-             (#.$SQL_SMALLINT (deref-pointer data-ptr :short)) ; ??
-             (#.$SQL_INTEGER (deref-pointer data-ptr :long))
-             (#.$SQL_DECIMAL 
-              (let ((*read-base* 10))
-                (read-from-string (get-cast-foreign-string data-ptr))))
-             (t 
-              (case c-type
-                (#.$SQL_C_DATE
-                 (funcall *time-conversion-function* (date-to-universal-time data-ptr)))
-                (#.$SQL_C_TIME
-                 (multiple-value-bind (universal-time frac) (time-to-universal-time data-ptr)
-                   (funcall *time-conversion-function* universal-time frac)))
-                (#.$SQL_C_TIMESTAMP
-                 (multiple-value-bind (universal-time frac) (timestamp-to-universal-time data-ptr)
-                   (funcall *time-conversion-function* universal-time frac)))
-                (#.$SQL_INTEGER
-                 (get-cast-int data-ptr))
-                (#.$SQL_C_FLOAT
-                 (get-cast-single-float data-ptr))
-                (#.$SQL_C_DOUBLE
-                 (get-cast-double-float data-ptr))
-                (#.$SQL_C_SLONG
-                 (get-cast-long data-ptr))
-                #+lispworks
-                (#.$SQL_C_BIT ; encountered only in Access
-                 (get-cast-byte data-ptr))
-                (#.$SQL_C_BINARY
-                 (get-cast-binary data-ptr out-len *binary-format*))
-                ((#.$SQL_C_SSHORT #.$SQL_C_STINYINT) ; LMH short ints
-                 (get-cast-short data-ptr))    ; LMH
-                #+ignore
-                (#.$SQL_C_CHAR
-                 (code-char (get-cast-short data-ptr)))
+  (let* ((out-len (get-cast-long out-len-ptr))
+         (value
+          (cond ((= out-len $SQL_NULL_DATA) *null*)
                 (t
-                 (convert-from-foreign-string data-ptr)))))))))
+                 (case sql-type
+                   ;; SQL extended datatypes
+                   (#.$SQL_TINYINT  (get-cast-byte data-ptr))
+                   (#.$SQL_C_STINYINT (get-cast-byte data-ptr)) ;; ?
+                   (#.$SQL_C_SSHORT (get-cast-short data-ptr)) ;; ?
+                   (#.$SQL_SMALLINT (get-cast-short data-ptr)) ;; ??
+                   (#.$SQL_INTEGER (get-cast-int data-ptr))
+                   (#.$SQL_BIGINT (get-cast-big data-ptr))
+                   ;; TODO: Change this to read in rationals instead of doubles
+                   ((#.$SQL_DECIMAL #.$SQL_NUMERIC)
+                     (let* ((*read-base* 10)
+                            (*read-default-float-format* 'double-float)
+                            (str (get-cast-foreign-string data-ptr)))
+                       (read-from-string str)))
+                   (#.$SQL_BIT (get-cast-byte data-ptr))
+                   (t
+                    (case c-type
+                      ((#.$SQL_C_DATE #.$SQL_C_TYPE_DATE)
+                       (funcall *time-format* (date-to-clsql-time data-ptr)))
+                      ((#.$SQL_C_TIME #.$SQL_C_TYPE_TIME)
+                      (funcall *time-format* (time-to-clsql-time data-ptr)))
+                      ((#.$SQL_C_TIMESTAMP #.$SQL_C_TYPE_TIMESTAMP)
+                      (funcall *time-format* (timestamp-to-clsql-time data-ptr)))
+                      (#.$SQL_INTEGER
+                       (get-cast-int data-ptr))
+                      (#.$SQL_C_FLOAT
+                       (get-cast-single-float data-ptr))
+                      (#.$SQL_C_DOUBLE
+                       (get-cast-double-float data-ptr))
+                      (#.$SQL_C_SLONG
+                       (get-cast-long data-ptr))
+                      #+lispworks
+                      (#.$SQL_C_BIT     ; encountered only in Access
+                       (get-cast-byte data-ptr))
+                      (#.$SQL_C_BINARY
+                       (get-cast-binary data-ptr out-len *binary-format*))
+                      ((#.$SQL_C_SSHORT #.$SQL_C_STINYINT) ; LMH short ints
+                       (get-cast-short data-ptr)) ; LMH
+                      (#.$SQL_C_SBIGINT (get-cast-big data-ptr))
+                      #+ignore
+                      (#.$SQL_C_CHAR
+                       (code-char (get-cast-short data-ptr)))
+                      (t
+                       (get-cast-foreign-string data-ptr)))))))))
+
+    ;; FIXME: this could be better optimized for types which use READ-FROM-STRING above
+
+    (if (and (or (eq result-type t) (eq result-type :string))
+             value
+             (not (stringp value)))
+        (write-to-string value)
+      value)))
 
 ;; which value is appropriate?
-(defparameter +max-precision+ 
-  #+mcl 512
-  #-mcl 4001)
+(defparameter +max-precision+  4001)
 
 (defvar *break-on-unknown-data-type* t)
 
          (long-p (= size +max-precision+))
          (data-ptr
           (case c-type ;; add more?
-            (#.$SQL_C_SLONG (uffi:allocate-foreign-object :long))
+            (#.$SQL_C_SLONG (uffi:allocate-foreign-object #.$ODBC-LONG-TYPE))
+            ((#.$SQL_C_DATE #.$SQL_C_TYPE_DATE) (allocate-foreign-object 'sql-c-date))
+            ((#.$SQL_C_TIME #.$SQL_C_TYPE_TIME) (allocate-foreign-object 'sql-c-time))
+            ((#.$SQL_C_TIMESTAMP #.$SQL_C_TYPE_TIMESTAMP) (allocate-foreign-object 'sql-c-timestamp))
+            (#.$SQL_C_FLOAT (uffi:allocate-foreign-object :float))
             (#.$SQL_C_DOUBLE (uffi:allocate-foreign-object :double))
-            (#.$SQL_C_DATE (allocate-foreign-object 'sql-c-date))
-            (#.$SQL_C_TIME (allocate-foreign-object 'sql-c-time))
-            (#.$SQL_C_TIMESTAMP (allocate-foreign-object 'sql-c-timestamp))
-            #+lispworks(#.$SQL_C_FLOAT (uffi:allocate-foreign-object :float))
-            (#.$SQL_C_BIT (uffi:allocate-foreign-object :boolean))
+            (#.$SQL_C_BIT (uffi:allocate-foreign-object :byte))
             (#.$SQL_C_STINYINT (uffi:allocate-foreign-object :byte))
+            (#.$SQL_C_SBIGINT (uffi:allocate-foreign-object #.$ODBC-BIG-TYPE))
             (#.$SQL_C_SSHORT (uffi:allocate-foreign-object :short))
             (#.$SQL_C_CHAR (uffi:allocate-foreign-string (1+ size)))
             (#.$SQL_C_BINARY (uffi:allocate-foreign-string (1+ (* 2 size))))
-            (t 
+            (t
                 ;; Maybe should signal a restartable condition for this?
                 (when *break-on-unknown-data-type*
-                  (break "SQL type is ~A, precision ~D, size ~D, C type is ~A" 
+                  (break "SQL type is ~A, precision ~D, size ~D, C type is ~A"
                          sql-type precision size c-type))
-                (uffi:allocate-foreign-object :ptr (1+ size)))))
-         (out-len-ptr (uffi:allocate-foreign-object :long)))
+                (uffi:allocate-foreign-object :byte (1+ size)))))
+         (out-len-ptr (uffi:allocate-foreign-object #.$ODBC-LONG-TYPE)))
     (values c-type data-ptr out-len-ptr size long-p)))
 
 (defun fetch-all-rows (hstmt &key free-option flatp)
   (let ((column-count (result-columns-count hstmt)))
     (unless (zerop column-count)
-      (let ((names (make-array column-count :element-type 'string))
+      (let ((names (make-array column-count))
             (sql-types (make-array column-count :element-type 'fixnum))
             (c-types (make-array column-count :element-type 'fixnum))
             (precisions (make-array column-count :element-type 'fixnum))
                    (setf (svref names col-nr) name
                          (aref sql-types col-nr) sql-type
                          (aref c-types col-nr) (sql-to-c-type sql-type)
-                         (aref precisions col-nr) (if (zerop precision) nil precision)
+                         (aref precisions col-nr) (if (zerop precision) 0 precision)
                          (aref scales col-nr) scale
                          (aref nullables-p col-nr) nullable-p
                          (aref data-ptrs col-nr) data-ptr
                          (aref out-len-ptrs col-nr) out-len-ptr))))
              ;; the main loop
              (prog1
-               (cond (flatp 
+               (cond (flatp
                       (when (> column-count 1)
-                        (error "If more than one column is to be fetched, flatp has to be nil."))
+                        (error 'clsql:sql-database-error
+                               :message "If more than one column is to be fetched, flatp has to be nil."))
                       (loop until (= (%sql-fetch hstmt) $SQL_NO_DATA_FOUND)
                             collect
-                            (read-data (aref data-ptrs 0) 
+                            (read-data (aref data-ptrs 0)
                                        (aref c-types 0)
                                        (aref sql-types 0)
                                        (aref out-len-ptrs 0)
-                                       nil)))
+                                       t)))
                      (t
                       (loop until (= (%sql-fetch hstmt) $SQL_NO_DATA_FOUND)
                             collect
                             (loop for col-nr from 0 to (1- column-count)
                                   collect
-                                  (read-data (aref data-ptrs col-nr) 
+                                  (read-data (aref data-ptrs col-nr)
                                              (aref c-types col-nr)
                                              (aref sql-types col-nr)
                                              (aref out-len-ptrs col-nr)
-                                             nil)))))))
+                                             t)))))))
            names)
           ;; dispose of memory etc
           (when free-option (%free-statement hstmt free-option))
 
 ;; depending on option, we return a long int or a string; string not implemented
 (defun get-connection-option (hdbc option)
-  (with-foreign-objects ((param-ptr :long #+ignore #.(1+ $SQL_MAX_OPTION_STRING_LENGTH)))
+  (with-foreign-object (param-ptr #.$ODBC-LONG-TYPE)
     (with-error-handling (:hdbc hdbc)
                          (SQLGetConnectOption hdbc option param-ptr)
-      (deref-pointer param-ptr :long))))
+      (deref-pointer param-ptr #.$ODBC-LONG-TYPE))))
 
 (defun set-connection-option (hdbc option param)
   (with-error-handling (:hdbc hdbc)
   (set-connection-option hdbc $SQL_AUTOCOMMIT $SQL_AUTOCOMMIT_ON))
 
 (defun %sql-set-pos (hstmt row option lock)
-  (with-error-handling 
+  (with-error-handling
     (:hstmt hstmt)
     (SQLSetPos hstmt row option lock)))
 
 (defun %sql-extended-fetch (hstmt fetch-type row)
-  (with-foreign-objects ((row-count-ptr :unsigned-long)
-                        (row-status-ptr :short))
+  (with-foreign-objects ((row-count-ptr #.$ODBC-ULONG-TYPE)
+                         (row-status-ptr :short))
     (with-error-handling (:hstmt hstmt)
       (SQLExtendedFetch hstmt fetch-type row row-count-ptr
-                       row-status-ptr)
-      (values (deref-pointer row-count-ptr :unsigned-long)
+                        row-status-ptr)
+      (values (deref-pointer row-count-ptr #.$ODBC-ULONG-TYPE)
               (deref-pointer row-status-ptr :short)))))
 
 ; column-nr is zero-based
 
 (defconstant $sql-data-truncated (intern "01004" :keyword))
 
-(defun read-data-in-chunks (hstmt column-nr data-ptr c-type sql-type 
-                                      out-len-ptr convert-to-string-p)
-  (declare (ignore convert-to-string-p) ; prelimianary
-          (type long-ptr-type out-len-ptr))
-  (let* ((res (%sql-get-data hstmt column-nr c-type data-ptr 
+
+(defun read-data-in-chunks (hstmt column-nr data-ptr c-type sql-type
+                            out-len-ptr result-type)
+  (declare (type long-ptr-type out-len-ptr)
+           (ignore result-type))
+
+  (let* ((res (%sql-get-data hstmt column-nr c-type data-ptr
                              +max-precision+ out-len-ptr))
-         (out-len (deref-pointer out-len-ptr :long))
-         (offset 0))
-    (case out-len
-      (#.$SQL_NULL_DATA
-       (return-from read-data-in-chunks *null*))
-      (#.$SQL_NO_TOTAL ;; don't know how long it is going to be
-       (let ((str (make-array 0 :element-type 'character :adjustable t)))
-         (loop do (if (= c-type #.$SQL_CHAR)
-                      (let ((data-length (foreign-string-length data-ptr)))
-                        (adjust-array str (+ offset data-length)
-                                      :initial-element #\?)
-                        (setf offset (%cstring-into-vector
-                                      data-ptr str 
-                                      offset 
-                                      data-length)))
-                    (error "wrong type. preliminary."))
-               while (and (= res $SQL_SUCCESS_WITH_INFO)
-                          (equal (sql-state (%null-ptr) (%null-ptr) hstmt)
-                                 "01004"))
-               do (setf res (%sql-get-data hstmt column-nr c-type data-ptr 
-                                           +max-precision+ out-len-ptr)))
-         (setf str (coerce str 'string))
-         (if (= sql-type $SQL_DECIMAL)
-             (let ((*read-base* 10))
-               (read-from-string str))
-           str)))
-      (otherwise
-       (let ((str (make-string out-len)))
-         (loop do (if (= c-type #.$SQL_CHAR)
-                      (setf offset (%cstring-into-vector ;string
-                                    data-ptr str 
-                                    offset 
-                                    (min out-len (1- +max-precision+))))
-                    (error "wrong type. preliminary."))
-               while 
-               (and (= res $SQL_SUCCESS_WITH_INFO)
-                    #+ingore(eq (sql-state (%null-ptr) (%null-ptr) hstmt)
-                                $sql-data-truncated)
-                    (equal (sql-state (%null-ptr) (%null-ptr) hstmt)
-                           "01004"))
-               do (setf res (%sql-get-data hstmt column-nr c-type data-ptr 
-                                           +max-precision+ out-len-ptr)
-                        out-len (deref-pointer out-len-ptr :long)))
-         (if (= sql-type $SQL_DECIMAL)
-             (let ((*read-base* 10))
-               (read-from-string str))
-           str))))))
-
-(defun timestamp-to-universal-time (ptr)
-  (values
-   (encode-universal-time 
-    (get-slot-value ptr 'sql-c-timestamp 'second)
-    (get-slot-value ptr 'sql-c-timestamp 'minute)
-    (get-slot-value ptr 'sql-c-timestamp 'hour)
-    (get-slot-value ptr 'sql-c-timestamp 'day)
-    (get-slot-value ptr 'sql-c-timestamp 'month)
-    (get-slot-value ptr 'sql-c-timestamp 'year))
-   (get-slot-value ptr 'sql-c-timestamp 'fraction)))
+         (out-len (get-cast-long out-len-ptr))
+         (result (if (equal out-len #.$SQL_NULL_DATA)
+                     (return-from read-data-in-chunks *null*)
+                     
+                     ;;this isn't the most efficient way of doing it:
+                     ;;the foreign string gets copied to lisp, then
+                     ;;that is copied into the final string. However,
+                     ;;the previous impl that tried to copy one
+                     ;;character over at a time failed miserably on
+                     ;;multibyte characters.
+                     ;;
+                     ;;In the face of multibyte characters, the out-len
+                     ;;tells us the length in bytes but that doesn't
+                     ;;particularly help us here in allocating a lisp
+                     ;;array. So our best strategy is to just let the
+                     ;;foreign library that's already dealing with
+                     ;;encodings do its thing.
+                   
+                     (with-output-to-string (str)
+                       (loop do (if (= c-type #.$SQL_CHAR)
+                                    (write-sequence (get-cast-foreign-string data-ptr) str)
+                                    (error 'clsql:sql-database-error
+                                           :message "wrong type. preliminary."))
+                             while (and (= res $SQL_SUCCESS_WITH_INFO)
+                                        (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)))))))
+
+    ;; reset the out length for the next row
+    (setf (deref-pointer out-len-ptr #.$ODBC-LONG-TYPE) #.$SQL_NO_TOTAL)
+    (if (= sql-type $SQL_DECIMAL)
+        (let ((*read-base* 10))
+          (read-from-string result))
+        result)))
+
+
+(def-type c-timestamp-ptr-type (* (:struct sql-c-timestamp)))
+(def-type c-time-ptr-type (* (:struct sql-c-time)))
+(def-type c-date-ptr-type (* (:struct sql-c-date)))
+
+(defun timestamp-to-clsql-time (ptr)
+  (declare (type c-timestamp-ptr-type ptr))
+  (clsql-sys:make-time
+   :second (get-slot-value ptr 'sql-c-timestamp 'second)
+   :minute (get-slot-value ptr 'sql-c-timestamp 'minute)
+   :hour (get-slot-value ptr 'sql-c-timestamp 'hour)
+   :day (get-slot-value ptr 'sql-c-timestamp 'day)
+   :month (get-slot-value ptr 'sql-c-timestamp 'month)
+   :year (get-slot-value ptr 'sql-c-timestamp 'year)
+   :usec (let ((frac (get-slot-value ptr 'sql-c-timestamp 'fraction)))
+          (if frac (/ frac 1000) 0))))
 
 (defun universal-time-to-timestamp (time &optional (fraction 0))
+  "TODO: Dead function?"
   (multiple-value-bind (sec min hour day month year)
       (decode-universal-time time)
-    (with-foreign-object (ptr 'sql-c-timestamp)
+    (let ((ptr (allocate-foreign-object 'sql-c-timestamp)))
       (setf (get-slot-value ptr 'sql-c-timestamp 'second) sec
             (get-slot-value ptr 'sql-c-timestamp 'minute) min
             (get-slot-value ptr 'sql-c-timestamp 'hour) hour
       ptr)))
 
 (defun %put-timestamp (ptr time &optional (fraction 0))
+  "TODO: Dead function?"
+  (declare (type c-timestamp-ptr-type ptr))
   (multiple-value-bind (sec min hour day month year)
       (decode-universal-time time)
     (setf (get-slot-value ptr 'sql-c-timestamp 'second) sec
           (get-slot-value ptr 'sql-c-timestamp 'fraction) fraction)
       ptr))
 
-(defun date-to-universal-time (ptr)
-  (encode-universal-time
-   0 0 0
-   (get-slot-value ptr 'sql-c-timestamp 'day)
-   (get-slot-value ptr 'sql-c-timestamp 'month)
-   (get-slot-value ptr 'sql-c-timestamp 'year)))
-
-(defun time-to-universal-time (ptr)
-  (encode-universal-time 
-   (get-slot-value ptr 'sql-c-timestamp 'second)
-   (get-slot-value ptr 'sql-c-timestamp 'minute)
-   (get-slot-value ptr 'sql-c-timestamp 'hour)
-   0 0 0))
+(defun date-to-clsql-time (ptr)
+  (declare (type c-date-ptr-type ptr))
+  (clsql-sys:make-time
+   :second 0 :minute 0 :hour 0
+   :day (get-slot-value ptr 'sql-c-timestamp 'day)
+   :month (get-slot-value ptr 'sql-c-timestamp 'month)
+   :year (get-slot-value ptr 'sql-c-timestamp 'year)))
+
+(defun time-to-clsql-time (ptr)
+  (declare (type c-time-ptr-type ptr))
+  (clsql-sys:make-time
+   :second (get-slot-value ptr 'sql-c-timestamp 'second)
+   :minute (get-slot-value ptr 'sql-c-timestamp 'minute)
+   :hour (get-slot-value ptr 'sql-c-timestamp 'hour)))
+
+
+;;; Added by KMR
+
+(defun %set-attr-odbc-version (henv version)
+  (with-error-handling (:henv henv)
+      ;;note that we are passing version as an integer that happens to be
+      ;;stuffed into a pointer.
+      ;;http://msdn.microsoft.com/en-us/library/ms709285%28v=VS.85%29.aspx
+      (SQLSetEnvAttr henv $SQL_ATTR_ODBC_VERSION
+                     (make-pointer version :void) 0)))
+
+(defun %list-tables (hstmt)
+  (with-error-handling (:hstmt hstmt)
+    (SQLTables hstmt +null-ptr+ 0 +null-ptr+ 0 +null-ptr+ 0 +null-ptr+ 0)))
+
+(defun %table-statistics (table hstmt &key unique (ensure t)
+                           &aux (table (princ-to-string
+                                        (clsql-sys::unescaped-database-identifier table))))
+  (with-cstrings ((table-cs table))
+   (with-error-handling (:hstmt hstmt)
+       (SQLStatistics
+        hstmt
+        +null-ptr+ 0
+        +null-ptr+ 0
+        table-cs $SQL_NTS
+        (if unique $SQL_INDEX_UNIQUE $SQL_INDEX_ALL)
+        (if ensure $SQL_ENSURE $SQL_QUICK)))))
+
+(defun %list-data-sources (henv)
+  (let ((results nil))
+    (with-foreign-strings ((dsn-ptr (1+ $SQL_MAX_DSN_LENGTH))
+                           (desc-ptr 256))
+      (with-foreign-objects ((dsn-len :short)
+                             (desc-len :short))
+       (let ((res (with-error-handling (:henv henv)
+                      (SQLDataSources henv $SQL_FETCH_FIRST dsn-ptr
+                                      (1+ $SQL_MAX_DSN_LENGTH)
+                                      dsn-len desc-ptr 256 desc-len))))
+         (when (or (eql res $SQL_SUCCESS)
+                   (eql res $SQL_SUCCESS_WITH_INFO))
+           (push (convert-from-foreign-string dsn-ptr) results))
+
+         (do ((res (with-error-handling (:henv henv)
+                       (SQLDataSources henv $SQL_FETCH_NEXT dsn-ptr
+                                       (1+ $SQL_MAX_DSN_LENGTH)
+                                       dsn-len desc-ptr 256 desc-len))
+                   (with-error-handling (:henv henv)
+                       (SQLDataSources henv $SQL_FETCH_NEXT dsn-ptr
+                                       (1+ $SQL_MAX_DSN_LENGTH)
+                                       dsn-len desc-ptr 256 desc-len))))
+             ((not (or (eql res $SQL_SUCCESS)
+                       (eql res $SQL_SUCCESS_WITH_INFO))))
+           (push (convert-from-foreign-string dsn-ptr) results)))))
+    (nreverse results)))