X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-aodbc%2Faodbc-sql.lisp;h=a43fb188dab9eac61c5271c95ad075ba9defdde8;hb=bb2818fb8a6714a55b360dec0bb043c5edccb3f4;hp=067532429fdf50a2ae423fd232806b345e7e1bd6;hpb=cc92d162f24648d65ad872098353305a5baf91d7;p=clsql.git diff --git a/db-aodbc/aodbc-sql.lisp b/db-aodbc/aodbc-sql.lisp index 0675324..a43fb18 100644 --- a/db-aodbc/aodbc-sql.lisp +++ b/db-aodbc/aodbc-sql.lisp @@ -19,24 +19,21 @@ (in-package #:clsql-aodbc) ;; interface foreign library loading routines -(defmethod clsql-base-sys:database-type-library-loaded ((database-type (eql :aodbc))) +(defmethod clsql-sys:database-type-library-loaded ((database-type (eql :aodbc))) "T if foreign library was able to be loaded successfully. " (when (find-package :dbi) ;; finds Allegro's DBI (AODBC) package t)) -(defmethod clsql-base-sys:database-type-load-foreign ((databae-type (eql :aodbc))) +(defmethod clsql-sys:database-type-load-foreign ((databae-type (eql :aodbc))) t) (when (find-package :dbi) - (clsql-base-sys:database-type-load-foreign :aodbc)) - -(defmethod database-initialize-database-type ((database-type (eql :aodbc))) - t) + (clsql-sys:database-type-load-foreign :aodbc)) ;; 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))) @@ -55,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 @@ -62,97 +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"))))) - -(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) - #+aodbc-v2 - (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 - :expression query-expression - :errno nil - :error "Query failed")))) + :message "Connection 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 @@ -161,7 +74,7 @@ (defun %table-name-to-sequence-name (table-name) (and (>= (length table-name) 11) - (string= (subseq table-name 0 11) "_CLSQL_SEQ_") + (string-equal (subseq table-name 0 11) "_CLSQL_SEQ_") (subseq table-name 11))) (defmethod database-create-sequence (sequence-name @@ -188,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)) @@ -260,8 +124,7 @@ (car (database-query (concatenate 'string "SELECT last_value,is_called FROM " table-name) - database - :auto)))) + database :auto nil)))) (cond ((char-equal (schar (second tuple) 0) #\f) (database-execute-command @@ -280,8 +143,7 @@ (caar (database-query (concatenate 'string "SELECT last_value FROM " (%sequence-name-to-table sequence-name)) - database - :auto)))) + database :auto nil)))) (defmethod database-create (connection-spec (type (eql :aodbc))) (warn "Not implemented.")) @@ -300,6 +162,8 @@ (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)) +(defmethod database-initialize-database-type ((database-type (eql :aodbc))) + t) + +(when (clsql-sys:database-type-library-loaded :aodbc) + (clsql-sys:initialize-database-type :database-type :aodbc))