r9114: fixes for list-indexes

[clsql.git] / db-odbc / odbc-sql.lisp

diff --git a/db-odbc/odbc-sql.lisp b/db-odbc/odbc-sql.lisp
index 1d392729efc490c2c5f7482a60de765cc5c8e87b..0da1a04d4dd0c9143055ce613f116b87be05b3a4 100644 (file)
--- a/db-odbc/odbc-sql.lisp
+++ b/db-odbc/odbc-sql.lisp
@@ -52,6 +52,7 @@
          db)
     (clsql-error (e)
       (error e))
+    #+ignore
     (error ()  ;; Init or Connect failed
       (error 'clsql-connect-error
             :database-type database-type
@@ -103,6 +104,7 @@
       (odbc-dbi:sql sql-expression :db (database-odbc-conn database))
     (clsql-error (e)
       (error e))
+    #+ignore
     (error ()
       (error 'clsql-sql-error
             :database database
@@ -132,6 +134,7 @@
         (length column-names)
         nil ;; not able to return number of rows with odbc
         ))
+    #+ignore
     (error ()
       (error 'clsql-sql-error
             :database database
@@ -195,11 +198,14 @@
                                 &key (owner nil))
   (declare (ignore owner))
     (multiple-value-bind (rows col-names)
-      (odbc-dbi:list-all-database-tables :db (database-odbc-conn database))
-    (let ((pos (position "TABLE_NAME" col-names :test #'string-equal)))
-      (when pos
-       (loop for row in rows
-           collect (nth pos row))))))
+       (odbc-dbi:list-all-database-tables :db (database-odbc-conn database))
+      (declare (ignore col-names))
+      ;; TABLE_SCHEM is hard-coded in second column by ODBC Driver Manager
+      ;; TABLE_NAME in third column, TABLE_TYPE in fourth column
+      (loop for row in rows
+         when (and (not (string-equal "information_schema" (nth 1 row)))
+                   (string-equal "TABLE" (nth 3 row)))
+         collect (nth 2 row))))
 
 (defmethod database-list-attributes ((table string) (database odbc-database)
                                      &key (owner nil))
@@ -268,8 +274,45 @@
   (warn "Not implemented."))
 
 (defmethod database-probe (connection-spec (type (eql :odbc)))
-  (warn "Not implemented."))
+  (when (find (car connection-spec) (database-list connection-spec type)
+             :test #'string-equal)
+    t))
+
+(defmethod database-list (connection-spec (type (eql :odbc)))
+  (declare (ignore connection-spec))
+  (odbc-dbi:list-all-data-sources))
+
+(defmethod database-list-indexes ((database odbc-database)
+                                  &key (owner nil))
+  (let ((result '()))
+    (dolist (table (database-list-tables database :owner owner) result)
+      (setq result
+       (append (database-list-table-indexes table database :owner owner)
+               result)))))
+
+(defmethod database-list-table-indexes (table (database odbc-database)
+                                       &key (owner nil))
+  (declare (ignore owner))
+  (multiple-value-bind (rows col-names)
+      (odbc-dbi:list-table-indexes 
+       (string-downcase table)
+       :db (database-odbc-conn database))
+    (declare (ignore col-names))
+    ;; INDEX_NAME is hard-coded in sixth position by ODBC driver
+    ;; FIXME: ??? is hard-coded in the fourth position
+    (do ((results nil)
+        (loop-rows rows (cdr loop-rows)))
+       ((null loop-rows) (nreverse results))
+      (let* ((row (car loop-rows))
+            (col (nth 5 row))
+            (type (nth 3 row)))
+       (unless (or (find col results :test #'string-equal)
+                   #+ignore (equal "0" type))
+         (push col results))))))
+
+(defmethod database-initialize-database-type ((database-type (eql :odbc)))
+  ;; nothing to do
+  t)
 
-#+ignore                      
 (when (clsql-base-sys:database-type-library-loaded :odbc)
   (clsql-base-sys:initialize-database-type :database-type :odbc))