X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-aodbc%2Faodbc-sql.lisp;h=bbe655e7c83988fbd58a63b2804ddcccbd11bb0a;hb=db9892632e6eb7869aea7a94c16b523a82de1501;hp=181c3edeee490678d82963ce2ef9a9f33c7f11cf;hpb=8fb55434ea4d6e0a0775b0012c83a2b27061bb59;p=clsql.git

diff --git a/db-aodbc/aodbc-sql.lisp b/db-aodbc/aodbc-sql.lisp
index 181c3ed..bbe655e 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
@@ -159,11 +168,11 @@
   (let ((table-name (%sequence-name-to-table sequence-name)))
     (database-execute-command
      (concatenate 'string "CREATE TABLE " table-name
-		  " (id int NOT NULL PRIMARY KEY AUTO_INCREMENT)")
+		  " (last_value int NOT NULL PRIMARY KEY, increment_by int, min_value int, is_called char(1))")
      database)
     (database-execute-command 
      (concatenate 'string "INSERT INTO " table-name
-		  " VALUES (0)")
+		  " VALUES (1,1,1,'f')")
      database)))
 
 (defmethod database-drop-sequence (sequence-name
@@ -179,20 +188,81 @@
           (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 id=~A" (%sequence-name-to-table sequence-name)
+   (format nil "UPDATE ~A SET last_value=~A,is_called='t'" 
+	   (%sequence-name-to-table sequence-name)
            position)
    database)
   position)
 
 (defmethod database-sequence-next (sequence-name (database aodbc-database))
-  (warn "Not implemented."))
-
+  (without-interrupts
+   (let* ((table-name (%sequence-name-to-table sequence-name))
+	  (tuple
+	   (car (database-query 
+		 (concatenate 'string "SELECT last_value,is_called FROM " 
+			      table-name)
+		 database
+		 :auto))))
+     (cond
+       ((char-equal (schar (second tuple) 0) #\f)
+	(database-execute-command
+	 (format nil "UPDATE ~A SET is_called='t'" table-name)
+	 database)
+	(car tuple))
+       (t
+	(let ((new-pos (1+ (car tuple))))
+	 (database-execute-command
+	  (format nil "UPDATE ~A SET last_value=~D" table-name new-pos)
+	  database)
+	 new-pos))))))
+	     
 (defmethod database-sequence-last (sequence-name (database aodbc-database))
-  (declare (ignore sequence-name)))
+  (without-interrupts
+   (caar (database-query 
+	  (concatenate 'string "SELECT last_value FROM " 
+		       (%sequence-name-to-table sequence-name))
+	  database
+	  :auto))))
 
 (defmethod database-create (connection-spec (type (eql :aodbc)))
   (warn "Not implemented."))