X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-aodbc%2Faodbc-sql.lisp;h=e83b3fe0aa1bfb0869e3fb36c777fc8959795643;hp=8cd30769a8329db74f48d0ca5e3112664218209d;hb=e567409d9fff3f7231c2a0bb69b345e19de2b246;hpb=215ec41559dda52d46539d48a0aa390811c2423c diff --git a/db-aodbc/aodbc-sql.lisp b/db-aodbc/aodbc-sql.lisp index 8cd3076..e83b3fe 100644 --- a/db-aodbc/aodbc-sql.lisp +++ b/db-aodbc/aodbc-sql.lisp @@ -28,7 +28,7 @@ t) (when (find-package :dbi) - (clsql-sys:database-type-load-foreign :aodbc)) + (clsql-sys:database-type-load-foreign :aodbc)) ;; AODBC interface @@ -37,7 +37,7 @@ ((aodbc-db-type :accessor database-aodbc-db-type :initform :unknown))) (defmethod database-name-from-spec (connection-spec - (database-type (eql :aodbc))) + (database-type (eql :aodbc))) (check-connection-spec connection-spec database-type (dsn user password)) (destructuring-bind (dsn user password) connection-spec (declare (ignore password)) @@ -48,37 +48,37 @@ #+aodbc-v2 (destructuring-bind (dsn user password) connection-spec (handler-case - (make-instance 'aodbc-database - :name (database-name-from-spec connection-spec :aodbc) - :database-type :aodbc - :dbi-package (find-package '#:dbi) - :odbc-conn - (dbi:connect :user user - :password password - :data-source-name dsn)) + (make-instance 'aodbc-database + :name (database-name-from-spec connection-spec :aodbc) + :database-type :aodbc + :dbi-package (find-package '#:dbi) + :odbc-conn + (dbi:connect :user user + :password password + :data-source-name dsn)) (sql-error (e) - (error e)) - (error () ;; Init or Connect failed - (error 'sql-connection-error - :database-type database-type - :connection-spec connection-spec - :message "Connection failed"))))) + (error e)) + (error () ;; Init or Connect failed + (error 'sql-connection-error + :database-type database-type + :connection-spec connection-spec + :message "Connection failed"))))) -(defmethod database-query (query-expression (database aodbc-database) - result-types field-names) +(defmethod database-query (query-expression (database aodbc-database) + result-types field-names) #+aodbc-v2 (handler-case (dbi:sql query-expression - :db (clsql-sys::odbc-conn database) - :types result-types - :column-names field-names) + :db (clsql-sys::odbc-conn database) + :types result-types + :column-names field-names) #+ignore (error () (error 'sql-database-data-error - :database database - :expression query-expression - :message "Query failed")))) + :database database + :expression query-expression + :message "Query failed")))) (defmethod database-create (connection-spec (type (eql :aodbc))) (warn "Not implemented."))