projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r10724: change from ftp to http access for boa
[clsql.git]
/
db-odbc
/
odbc-sql.lisp
diff --git
a/db-odbc/odbc-sql.lisp
b/db-odbc/odbc-sql.lisp
index 385d378ee8adb9c084837503540e86f5775a2299..c28e937860d50e6d3362a108d92da1282114e292 100644
(file)
--- a/
db-odbc/odbc-sql.lisp
+++ b/
db-odbc/odbc-sql.lisp
@@
-52,6
+52,7
@@
;; underlying database
(initialize-database-type :database-type database-type)
db)
;; underlying database
(initialize-database-type :database-type database-type)
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
@@
-70,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))