X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-odbc%2Fodbc-api.lisp;h=eb68f205b42c32ce248b6f1a217c389a992f75ad;hp=ab2f6ee54a1e318dda8bb0c78daf0f4a03bf105b;hb=d9f41af62750c622945bb17b622a39689ee5b840;hpb=44cd3f817f6f59ffe495db4cf2b9ea4637a57f75

diff --git a/db-odbc/odbc-api.lisp b/db-odbc/odbc-api.lisp
index ab2f6ee..eb68f20 100644
--- a/db-odbc/odbc-api.lisp
+++ b/db-odbc/odbc-api.lisp
@@ -151,7 +151,7 @@ as possible second argument) to the desired representation of date/time/timestam
 	 (with-foreign-object (phenv 'sql-handle)
 	   (with-error-handling
 	       ()
-	     (SQLAllocEnv phenv)
+	     (SQLAllocHandle $SQL_HANDLE_ENV +null-handle-ptr+ phenv)
 	     (deref-pointer phenv 'sql-handle)))))
     (%set-attr-odbc-version henv $SQL_OV_ODBC3)
     henv))
@@ -164,9 +164,10 @@ as possible second argument) to the desired representation of date/time/timestam
 
 (defun %new-db-connection-handle (henv)
   (with-foreign-object (phdbc 'sql-handle)
+    (setf (deref-pointer phdbc sql-handle) +null-handle-ptr+)
     (with-error-handling
       (:henv henv)
-      (SQLAllocConnect henv phdbc)
+      (SQLAllocHandle $SQL_HANDLE_DBC henv phdbc)
       (deref-pointer phdbc 'sql-handle))))
 
 (defun %free-statement (hstmt option)
@@ -248,11 +249,11 @@ as possible second argument) to the desired representation of date/time/timestam
 
 (defun %new-statement-handle (hdbc)
   (let ((statement-handle
-	 (with-foreign-object (hstmt-ptr 'sql-handle)
+	 (with-foreign-object (phstmt 'sql-handle)
 	   (with-error-handling 
 	       (:hdbc hdbc)
-	     (SQLAllocStmt hdbc hstmt-ptr) 
-	     (deref-pointer hstmt-ptr 'sql-handle)))))
+	     (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)))
@@ -568,17 +569,20 @@ as possible second argument) to the desired representation of date/time/timestam
     (#.$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 float-pointer-type '(* :float))
-(def-type double-pointer-type '(* :double))
-(def-type string-pointer-type '(* :unsigned-char))
+(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 float-pointer-type (* :float))
+(def-type double-pointer-type (* :double))
+(def-type string-pointer-type (* :unsigned-char))
 
 (defun get-cast-byte (ptr)
   (locally (declare (type byte-pointer-type ptr))
@@ -644,18 +648,17 @@ as possible second argument) to the desired representation of date/time/timestam
 		   (#.$SQL_INTEGER (get-cast-int data-ptr))
 		   (#.$SQL_BIGINT (read-from-string
 				   (get-cast-foreign-string data-ptr)))
-		   (#.$SQL_TINYINT (get-cast-byte data-ptr))
 		   (#.$SQL_DECIMAL 
 		    (let ((*read-base* 10))
 		      (read-from-string (get-cast-foreign-string data-ptr))))
 		   (t 
 		    (case c-type
-		      (#.$SQL_C_DATE
+		      ((#.$SQL_C_DATE #.$SQL_C_TYPE_DATE)
 		       (funcall *time-conversion-function* (date-to-universal-time data-ptr)))
-		      (#.$SQL_C_TIME
+		      ((#.$SQL_C_TIME #.$SQL_C_TYPE_TIME)
 		       (multiple-value-bind (universal-time frac) (time-to-universal-time data-ptr)
 			 (funcall *time-conversion-function* universal-time frac)))
-		      (#.$SQL_C_TIMESTAMP
+		      ((#.$SQL_C_TIMESTAMP #.$SQL_C_TYPE_TIMESTAMP)
 		       (multiple-value-bind (universal-time frac) (timestamp-to-universal-time data-ptr)
 			 (funcall *time-conversion-function* universal-time frac)))
 		      (#.$SQL_INTEGER
@@ -705,9 +708,9 @@ as possible second argument) to the desired representation of date/time/timestam
          (data-ptr
           (case c-type ;; add more?
             (#.$SQL_C_SLONG (uffi:allocate-foreign-object #.$ODBC-LONG-TYPE))
-            (#.$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))
+            ((#.$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_BIT (uffi:allocate-foreign-object :byte))
@@ -896,9 +899,9 @@ as possible second argument) to the desired representation of date/time/timestam
                (read-from-string str))
            str))))))
 
-(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)))
+(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-universal-time (ptr)
   (declare (type c-timestamp-ptr-type ptr))