X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-odbc%2Fodbc-api.lisp;h=4095f6cfeef3d4872add1725fd31daa8cd58f587;hb=570798eb781157ad988bd527232bb88d51b103d7;hp=b17af024651a85554ea5d8ce8754fb7d83d7e4c0;hpb=5148be446aee32ec705beac3fbba35f499df4fd4;p=clsql.git

diff --git a/db-odbc/odbc-api.lisp b/db-odbc/odbc-api.lisp
index b17af02..4095f6c 100644
--- a/db-odbc/odbc-api.lisp
+++ b/db-odbc/odbc-api.lisp
@@ -151,9 +151,9 @@ 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_ODBC2)
+    (%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)
@@ -568,6 +569,9 @@ 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)))
@@ -650,12 +654,12 @@ as possible second argument) to the desired representation of date/time/timestam
 		      (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 +709,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))