X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-odbc%2Fodbc-sql.lisp;h=447795c656ce55cd8cee9f8fbff337f13af124fd;hp=79fd4a5f092d307955168c88f50e84a1bd50774f;hb=906d7a71b35ee1cd6d281623694bc90ced22c339;hpb=e567409d9fff3f7231c2a0bb69b345e19de2b246 diff --git a/db-odbc/odbc-sql.lisp b/db-odbc/odbc-sql.lisp index 79fd4a5..447795c 100644 --- a/db-odbc/odbc-sql.lisp +++ b/db-odbc/odbc-sql.lisp @@ -7,8 +7,6 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id$ -;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; ;;;; CLSQL users are granted the rights to distribute and use this software @@ -30,18 +28,21 @@ (defmethod database-name-from-spec (connection-spec (database-type (eql :odbc))) - (check-connection-spec connection-spec database-type (dsn user password &key connection-string completion window-handle)) + (check-connection-spec connection-spec database-type + (dsn user password &key connection-string completion window-handle)) (destructuring-bind (dsn user password &key connection-string completion window-handle) connection-spec (declare (ignore password connection-string completion window-handle)) (concatenate 'string dsn "/" user))) (defmethod database-connect (connection-spec (database-type (eql :odbc))) - (check-connection-spec connection-spec database-type (dsn user password &key connection-string completion window-handle)) + (check-connection-spec connection-spec database-type + (dsn user password &key connection-string completion window-handle)) (destructuring-bind (dsn user password &key connection-string (completion :no-prompt) window-handle) connection-spec (handler-case (let ((db (make-instance 'odbc-database :name (database-name-from-spec connection-spec :odbc) :database-type :odbc + :connection-spec connection-spec :dbi-package (find-package '#:odbc-dbi) :odbc-conn (odbc-dbi:connect :user user