projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r10146: 09 Nov 2004 Kevin Rosenberg <kevin@rosenberg.net>
[clsql.git]
/
db-odbc
/
odbc-sql.lisp
diff --git
a/db-odbc/odbc-sql.lisp
b/db-odbc/odbc-sql.lisp
index e1ad0c234d03333177ae3c4798777880076ef1ef..c28e937860d50e6d3362a108d92da1282114e292 100644
(file)
--- a/
db-odbc/odbc-sql.lisp
+++ b/
db-odbc/odbc-sql.lisp
@@
-48,7
+48,11
@@
:password password
:data-source-name dsn))))
(store-type-of-connected-database db)
:password password
:data-source-name dsn))))
(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)
db)
+ #+ignore
(error () ;; Init or Connect failed
(error 'sql-connection-error
:database-type database-type
(error () ;; Init or Connect failed
(error 'sql-connection-error
:database-type database-type
@@
-67,9
+71,14
@@
(cond
((or (search "postgresql" server-name :test #'char-equal)
(search "postgresql" dbms-name :test #'char-equal))
(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 "mysql" server-name :test #'char-equal)
(search "mysql" dbms-name :test #'char-equal))
:postgresql)
((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))
:mysql)
((or (search "oracle" server-name :test #'char-equal)
(search "oracle" dbms-name :test #'char-equal))