r9123: test & capability updates

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

diff --git a/db-aodbc/aodbc-sql.lisp b/db-aodbc/aodbc-sql.lisp
index 7d49c7d22ad5e12b60a90754e6528c4220e0ab43..22aa329b4b1c4fc706790e91bb1f6850c8377641 100644 (file)
--- a/db-aodbc/aodbc-sql.lisp
+++ b/db-aodbc/aodbc-sql.lisp
@@ -37,7 +37,8 @@
 ;; AODBC interface
 
 (defclass aodbc-database (database)
-  ((aodbc-conn :accessor database-aodbc-conn :initarg :aodbc-conn)))
+  ((aodbc-conn :accessor database-aodbc-conn :initarg :aodbc-conn)
+   (aodbc-db-type :accessor database-aodbc-db-type :initform :unknown)))
 
 (defmethod database-name-from-spec (connection-spec
                                    (database-type (eql :aodbc)))
@@ -202,6 +203,20 @@
                    (string-equal "TABLE" (nth 3 row)))
          collect (nth 2 row))))
 
+(defmethod database-list-views ((database aodbc-database)
+                                &key (owner nil))
+  (declare (ignore owner))
+  #+aodbc-v2
+  (multiple-value-bind (rows col-names)
+      (dbi:list-all-database-tables :db (database-aodbc-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 "VIEW" (nth 3 row)))
+       collect (nth 2 row))))
+
 (defmethod database-list-attributes ((table string) (database aodbc-database)
                                      &key (owner nil))
   (declare (ignore owner))
@@ -224,6 +239,11 @@
        (loop for row in rows
            collect (nth pos row))))))
 
+(defmethod database-list-indexes ((database aodbc-database)
+                                &key (owner nil))
+  (warn "database-list-indexes not implemented for AODBC.")
+  nil)
+
 (defmethod database-set-sequence-position (sequence-name
                                            (position integer)
                                            (database aodbc-database))
@@ -275,6 +295,9 @@
 
 ;;; Backend capabilities
 
+(defmethod database-underlying-type ((database aodbc-database))
+  (database-aodbc-db-type database))
+
 (defmethod db-backend-has-create/destroy-db? ((db-type (eql :aodbc)))
   nil)