X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-aodbc%2Faodbc-sql.lisp;h=7d49c7d22ad5e12b60a90754e6528c4220e0ab43;hb=23b76563b25a517ad20f29d6dc5a65c8b958a042;hp=4cd8a6e28cc9bffe07607b3861a68e1d65538a41;hpb=f68abc76e0e01f4633141a0c17a4d8f1976229b8;p=clsql.git

diff --git a/db-aodbc/aodbc-sql.lisp b/db-aodbc/aodbc-sql.lisp
index 4cd8a6e..7d49c7d 100644
--- a/db-aodbc/aodbc-sql.lisp
+++ b/db-aodbc/aodbc-sql.lisp
@@ -53,10 +53,13 @@
     (handler-case
 	(make-instance 'aodbc-database
 	  :name (database-name-from-spec connection-spec :aodbc)
+	  :database-type :aodbc
 	  :aodbc-conn
 	  (dbi:connect :user user
 		       :password password
 		       :data-source-name dsn))
+      (clsql-error (e)
+	(error e))
       (error () 	;; Init or Connect failed
 	(error 'clsql-connect-error
 	       :database-type database-type
@@ -75,6 +78,8 @@
   (handler-case
       (dbi:sql query-expression :db (database-aodbc-conn database)
 	       :types result-types)
+      (clsql-error (e)
+	(error e))
     (error ()
       (error 'clsql-sql-error
 	     :database database
@@ -87,6 +92,8 @@
   #+aodbc-v2
   (handler-case
       (dbi:sql sql-expression :db (database-aodbc-conn database))
+      (clsql-error (e)
+	(error e))
     (error ()
       (error 'clsql-sql-error
 	     :database database
@@ -118,6 +125,8 @@
 	 (length column-names)
 	 nil ;; not able to return number of rows with aodbc
 	 ))
+      (clsql-error (e)
+	(error e))
     (error ()
       (error 'clsql-sql-error
 	     :database database
@@ -179,11 +188,47 @@
           (database-query "SHOW TABLES LIKE '%clsql_seq%'" 
                           database nil)))
 
+(defmethod database-list-tables ((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 "TABLE" (nth 3 row)))
+	  collect (nth 2 row))))
+
+(defmethod database-list-attributes ((table string) (database aodbc-database)
+                                     &key (owner nil))
+  (declare (ignore owner))
+  #+aodbc-v2
+  (multiple-value-bind (rows col-names)
+      (dbi:list-all-table-columns table :db (database-aodbc-conn database))
+    (let ((pos (position "COLUMN_NAME" col-names :test #'string-equal)))
+      (when pos
+	(loop for row in rows
+	    collect (nth pos row))))))
+
+(defmethod database-attribute-type ((attribute string) (table string) (database aodbc-database)
+                                     &key (owner nil))
+  (declare (ignore owner))
+  #+aodbc-v2
+  (multiple-value-bind (rows col-names)
+      (dbi:list-all-table-columns table :db (database-aodbc-conn database))
+    (let ((pos (position "TYPE_NAME" col-names :test #'string-equal)))
+      (when pos
+	(loop for row in rows
+	    collect (nth pos row))))))
+
 (defmethod database-set-sequence-position (sequence-name
                                            (position integer)
                                            (database aodbc-database))
   (database-execute-command
-   (format nil "UPDATE ~A SET last-value=~A" 
+   (format nil "UPDATE ~A SET last_value=~A,is_called='t'" 
 	   (%sequence-name-to-table sequence-name)
            position)
    database)
@@ -228,6 +273,11 @@
 (defmethod database-probe (connection-spec (type (eql :aodbc)))
   (warn "Not implemented."))
 
+;;; Backend capabilities
+
+(defmethod db-backend-has-create/destroy-db? ((db-type (eql :aodbc)))
+  nil)
+
 #+ignore		       
 (when (clsql-base-sys:database-type-library-loaded :aodbc)
   (clsql-base-sys:initialize-database-type :database-type :aodbc))