X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-odbc%2Fodbc-dbi.lisp;h=f9e8493f55a7a78ad762344aa543628b93ac220a;hb=db5e98459718c42c3ba6aba2b45b61c26837c991;hp=9ebbaad5bb1499bb03ebbc0c89cff882734c1405;hpb=af6f86714c42fb34e4d914136cf18f336fc2460e;p=clsql.git

diff --git a/db-odbc/odbc-dbi.lisp b/db-odbc/odbc-dbi.lisp
index 9ebbaad..f9e8493 100644
--- a/db-odbc/odbc-dbi.lisp
+++ b/db-odbc/odbc-dbi.lisp
@@ -30,8 +30,10 @@
    #:disconnect
    #:end-transaction
    #:fetch-row
+   #:list-all-data-sources
    #:list-all-database-tables
    #:list-all-table-columns
+   #:list-table-indexes
    #:loop-over-results
    #:prepare-sql
    #:rr-sql
@@ -179,10 +181,30 @@ the query against." ))
 	     (coerce (column-names query) 'list))))
       (db-close-query query))))
 
+(defun list-table-indexes (table &key db unique hstmt)
+  (declare (ignore hstmt))
+  (let ((query (get-free-query db)))
+    (unwind-protect
+	(progn
+	  (with-slots (hstmt) query
+	    (unless hstmt (setf hstmt (%new-statement-handle (hdbc db))))
+	    (%table-statistics table hstmt :unique unique)
+	    (%initialize-query query nil nil)
+	    (values
+	     (db-fetch-query-results query)
+	     (coerce (column-names query) 'list))))
+      (db-close-query query))))
+
 (defun list-all-table-columns (table &key db hstmt)
   (declare (ignore hstmt))
   (db-describe-columns db "" "" table ""))
 
+(defun list-all-data-sources ()
+  (let ((db (make-instance 'odbc-db)))
+    (unless (henv db) ;; has class allocation!
+      (setf (henv db) (%new-environment-handle)))
+    (%list-data-sources (henv db))))
+
 (defun rr-sql (hstmt sql-statement &key db)
   (declare (ignore hstmt sql-statement db))
   (warn "rr-sql not implemented."))
@@ -428,7 +450,7 @@ This makes the functions db-execute-command and db-query thread safe."
         (dotimes (col-nr count)
           (let ((data-ptr (aref column-data-ptrs col-nr))
                 (out-len-ptr (aref column-out-len-ptrs col-nr)))
-	    ;; free-statment unbind frees theses
+	    ;; free-statment :unbind frees these
 	    #+ignore (when data-ptr (uffi:free-foreign-object data-ptr))
 	    #+ignore (when out-len-ptr (uffi:free-foreign-object out-len-ptr)))))
       (cond ((null hstmt)