X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-odbc%2Fodbc-sql.lisp;h=79fd4a5f092d307955168c88f50e84a1bd50774f;hp=e76b9d0bdf45d13fd3a897d15382d9d4b7e46f4b;hb=refs%2Ftags%2Fv3.8.6;hpb=215ec41559dda52d46539d48a0aa390811c2423c diff --git a/db-odbc/odbc-sql.lisp b/db-odbc/odbc-sql.lisp index e76b9d0..79fd4a5 100644 --- a/db-odbc/odbc-sql.lisp +++ b/db-odbc/odbc-sql.lisp @@ -29,7 +29,7 @@ ((odbc-db-type :accessor database-odbc-db-type))) (defmethod database-name-from-spec (connection-spec - (database-type (eql :odbc))) + (database-type (eql :odbc))) (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)) @@ -39,58 +39,58 @@ (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 - :dbi-package (find-package '#:odbc-dbi) - :odbc-conn - (odbc-dbi:connect :user user - :password password - :data-source-name dsn + (let ((db (make-instance 'odbc-database + :name (database-name-from-spec connection-spec :odbc) + :database-type :odbc + :dbi-package (find-package '#:odbc-dbi) + :odbc-conn + (odbc-dbi:connect :user user + :password password + :data-source-name dsn :connection-string connection-string :completion completion :window-handle window-handle)))) - (store-type-of-connected-database db) - ;; Ensure this database type is initialized so can check capabilities of - ;; underlying database - (initialize-database-type :database-type database-type) - db) + (store-type-of-connected-database db) + ;; Ensure this database type is initialized so can check capabilities of + ;; underlying database + (initialize-database-type :database-type database-type) + db) #+ignore - (error () ;; Init or Connect failed - (error 'sql-connection-error - :database-type database-type - :connection-spec connection-spec - :message "Connection failed"))))) + (error () ;; Init or Connect failed + (error 'sql-connection-error + :database-type database-type + :connection-spec connection-spec + :message "Connection failed"))))) (defmethod database-underlying-type ((database odbc-database)) (database-odbc-db-type database)) (defun store-type-of-connected-database (db) (let* ((odbc-conn (clsql-sys::odbc-conn db)) - (server-name (odbc-dbi::get-odbc-info odbc-conn odbc::$SQL_SERVER_NAME)) - (dbms-name (odbc-dbi::get-odbc-info odbc-conn odbc::$SQL_DBMS_NAME)) - (type - ;; need SERVER-NAME and DBMS-NAME because many drivers mix this up - (cond - ((or (search "postgresql" server-name :test #'char-equal) - (search "postgresql" dbms-name :test #'char-equal)) - (unless (find-package 'clsql-postgresql) - (ignore-errors (asdf:operate 'asdf:load-op 'clsql-postgresql-socket))) - :postgresql) + (server-name (odbc-dbi::get-odbc-info odbc-conn odbc::$SQL_SERVER_NAME)) + (dbms-name (odbc-dbi::get-odbc-info odbc-conn odbc::$SQL_DBMS_NAME)) + (type + ;; need SERVER-NAME and DBMS-NAME because many drivers mix this up + (cond + ((or (search "postgresql" server-name :test #'char-equal) + (search "postgresql" dbms-name :test #'char-equal)) + (unless (find-package 'clsql-postgresql) + (ignore-errors (asdf:operate 'asdf:load-op 'clsql-postgresql-socket))) + :postgresql) ((or (search "Microsoft SQL Server" server-name :test #'char-equal) (search "Microsoft SQL Server" dbms-name :test #'char-equal)) :mssql) - ((or (search "mysql" server-name :test #'char-equal) - (search "mysql" dbms-name :test #'char-equal)) - (unless (find-package 'clsql-mysql) - ;; ignore errors on platforms where the shared libraries are not available - (ignore-errors (asdf:operate 'asdf:load-op 'clsql-mysql))) - :mysql) - ((or (search "oracle" server-name :test #'char-equal) - (search "oracle" dbms-name :test #'char-equal)) - :oracle)))) + ((or (search "mysql" server-name :test #'char-equal) + (search "mysql" dbms-name :test #'char-equal)) + (unless (find-package 'clsql-mysql) + ;; ignore errors on platforms where the shared libraries are not available + (ignore-errors (asdf:operate 'asdf:load-op 'clsql-mysql))) + :mysql) + ((or (search "oracle" server-name :test #'char-equal) + (search "oracle" dbms-name :test #'char-equal)) + :oracle)))) (setf (database-odbc-db-type db) type))) - + (defmethod database-create (connection-spec (type (eql :odbc))) @@ -103,7 +103,7 @@ (defmethod database-probe (connection-spec (type (eql :odbc))) (when (find (car connection-spec) (database-list connection-spec type) - :test #'string-equal) + :test #'string-equal) t)) (defmethod database-list (connection-spec (type (eql :odbc))) @@ -115,26 +115,26 @@ (let ((result '())) (dolist (table (database-list-tables database :owner owner) result) (setq result - (append (database-list-table-indexes table database :owner owner) - result))))) + (append (database-list-table-indexes table database :owner owner) + result))))) (defmethod database-list-table-indexes (table (database odbc-database) - &key (owner nil)) + &key (owner nil)) (declare (ignore owner)) (multiple-value-bind (rows col-names) - (odbc-dbi:list-table-indexes + (odbc-dbi:list-table-indexes table :db (clsql-sys::odbc-conn database)) (declare (ignore col-names)) ;; INDEX_NAME is hard-coded in sixth position by ODBC driver ;; FIXME: ??? is hard-coded in the fourth position (do ((results nil) - (loop-rows rows (cdr loop-rows))) - ((null loop-rows) (nreverse results)) + (loop-rows rows (cdr loop-rows))) + ((null loop-rows) (nreverse results)) (let* ((row (car loop-rows)) - (col (nth 5 row))) - (unless (or (null col) (find col results :test #'string-equal)) - (push col results)))))) + (col (nth 5 row))) + (unless (or (null col) (find col results :test #'string-equal)) + (push col results)))))) ;;; Database capabilities