X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-aodbc%2Faodbc-sql.lisp;h=a43fb188dab9eac61c5271c95ad075ba9defdde8;hb=bb2818fb8a6714a55b360dec0bb043c5edccb3f4;hp=f357e59b7923fce2bfab986876c2751244118a67;hpb=62dbd27811c4141f0a0c357f11e5b5968e10aaa6;p=clsql.git

diff --git a/db-aodbc/aodbc-sql.lisp b/db-aodbc/aodbc-sql.lisp
index f357e59..a43fb18 100644
--- a/db-aodbc/aodbc-sql.lisp
+++ b/db-aodbc/aodbc-sql.lisp
@@ -33,7 +33,7 @@
 
 ;; AODBC interface
 
-(defclass aodbc-database (database)
+(defclass aodbc-database (generic-odbc-database)
   ((aodbc-conn :accessor database-aodbc-conn :initarg :aodbc-conn)
    (aodbc-db-type :accessor database-aodbc-db-type :initform :unknown)))
 
@@ -52,6 +52,7 @@
 	(make-instance 'aodbc-database
 	  :name (database-name-from-spec connection-spec :aodbc)
 	  :database-type :aodbc
+	  :dbi-package (find-package '#:dbi)
 	  :aodbc-conn
 	  (dbi:connect :user user
 		       :password password
@@ -59,98 +60,12 @@
       (clsql-error (e)
 	(error e))
       (error () 	;; Init or Connect failed
-	(error 'clsql-connect-error
+	(error 'sql-connection-error
 	       :database-type database-type
 	       :connection-spec connection-spec
-	       :errno nil
-	       :error "Connection failed")))))
+	       :message "Connection failed")))))
 
-(defmethod database-disconnect ((database aodbc-database))
-  #+aodbc-v2
-  (dbi:disconnect (database-aodbc-conn database))
-  (setf (database-aodbc-conn database) nil)
-  t)
 
-(defmethod database-query (query-expression (database aodbc-database) result-types field-names) 
-  #+aodbc-v2
-  (handler-case
-      (dbi:sql query-expression :db (database-aodbc-conn database)
-	       :types result-types
-               :column-names field-names)
-      (clsql-error (e)
-	(error e))
-    (error ()
-      (error 'clsql-sql-error
-	     :database database
-	     :expression query-expression
-	     :errno nil
-	     :error "Query failed"))))
-
-(defmethod database-execute-command (sql-expression 
-				     (database aodbc-database))
-  #+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
-	     :expression sql-expression
-	     :errno nil
-	     :error "Execute command failed"))))
-
-(defstruct aodbc-result-set
-  (query nil)
-  (types nil :type cons)
-  (full-set nil :type boolean))
-
-(defmethod database-query-result-set ((query-expression string)
-				      (database aodbc-database) 
-				      &key full-set result-types)
-  #+aodbc-v2
-  (handler-case 
-      (multiple-value-bind (query column-names)
-	  (dbi:sql query-expression 
-		   :db (database-aodbc-conn database) 
-		   :row-count nil
-		   :column-names t
-		   :query t
-		   :types result-types
-		   )
-	(values
-	 (make-aodbc-result-set :query query :full-set full-set 
-				:types result-types)
-	 (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
-	     :expression query-expression
-	     :errno nil
-	     :error "Query result set failed"))))
-
-(defmethod database-dump-result-set (result-set (database aodbc-database))
-  #+aodbc-v2
-  (dbi:close-query (aodbc-result-set-query result-set))
-  t)
-
-(defmethod database-store-next-row (result-set
-				    (database aodbc-database)
-				    list)
-  #+aodbc-v2
-  (let ((row (dbi:fetch-row (aodbc-result-set-query result-set) nil 'eof)))
-    (if (eq row 'eof)
-	nil
-      (progn
-	(loop for elem in row
-	    for rest on list
-	    do
-	      (setf (car rest) elem))
-	list))))
 
 ;;; Sequence functions
 
@@ -186,55 +101,6 @@
   (warn "database-list-sequences not implemented for AODBC.")
   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-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))
-  #+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-list-indexes ((database aodbc-database)
 				 &key (owner nil))