X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-odbc%2Fodbc-api.lisp;h=03860af9333a698f13aa75b5eb438a1492ae5f54;hb=a4097e19c5157e87b9991549bc44f3ef598aeb90;hp=38877a7c112ffadd254ea91d09f10b6c8fcbaf3e;hpb=a3974aaf6e6e53354b712bfe5db3b5b5db49c010;p=clsql.git

diff --git a/db-odbc/odbc-api.lisp b/db-odbc/odbc-api.lisp
index 38877a7..03860af 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.")
 
@@ -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)))
-	
 	(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)
-		(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
@@ -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)
-	      (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
@@ -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)
-                          (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)))
@@ -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)
-                    #+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)
@@ -939,3 +939,46 @@ as possible second argument) to the desired representation of date/time/timestam
 (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))
+  (with-cstrings ((table-cs table))
+    (with-error-handling (:hstmt hstmt)
+      (SQLStatistics 
+       hstmt
+       +null-ptr+ 0
+       +null-ptr+ 0
+       table-cs (length table) ;;$SQL_NTS
+       (if unique $SQL_INDEX_UNIQUE $SQL_INDEX_ALL)
+       (if ensure $SQL_ENSURE $SQL_QUICK)))))
+
+(defun %list-data-sources (henv)
+  (let ((dsn (allocate-foreign-string (1+ $SQL_MAX_DSN_LENGTH)))
+	(desc (allocate-foreign-string 256))
+	(results nil))
+    (unwind-protect
+	 (with-foreign-objects ((dsn-len :short)
+				(desc-len :short))
+	   (let ((res (with-error-handling (:henv henv)
+			(SQLDataSources henv $SQL_FETCH_FIRST dsn
+					(1+ $SQL_MAX_DSN_LENGTH)
+					dsn-len desc 256 desc-len))))
+	     (when (or (eql res $SQL_SUCCESS)
+		       (eql res $SQL_SUCCESS_WITH_INFO))
+	       (push (convert-from-foreign-string dsn) results))
+	     
+	     (do ((res (with-error-handling (:henv henv)
+			 (SQLDataSources henv $SQL_FETCH_NEXT dsn
+					 (1+ $SQL_MAX_DSN_LENGTH)
+					 dsn-len desc 256 desc-len))
+		       (with-error-handling (:henv henv)
+			 (SQLDataSources henv $SQL_FETCH_NEXT dsn
+					 (1+ $SQL_MAX_DSN_LENGTH)
+					 dsn-len desc 256 desc-len))))
+		 ((not (or (eql res $SQL_SUCCESS)
+			   (eql res $SQL_SUCCESS_WITH_INFO))))
+	       (push (convert-from-foreign-string dsn) results))))
+      (progn
+	(free-foreign-object dsn)
+	(free-foreign-object desc)))
+    (nreverse results)))
+