projects
/
umlisp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r11410: abstract interfaces for medtermserver
[umlisp.git]
/
sql.lisp
diff --git
a/sql.lisp
b/sql.lisp
index d2900d6d2a8bb40231d52cac24d6cc18b08e3c19..83f38e97164311bea10885f4f95866bfc18800d9 100644
(file)
--- a/
sql.lisp
+++ b/
sql.lisp
@@
-32,7
+32,11
@@
*umls-sql-db*)
(defun umls-sql-db! (db)
*umls-sql-db*)
(defun umls-sql-db! (db)
- (setq *umls-sql-db* db))
+ (etypecase db
+ (string
+ (setq *umls-sql-db* db))
+ (keyword
+ (setq *umls-sql-db* (lookup-db-name db)))))
(defvar *umls-sql-user* "secret")
(defun umls-sql-user ()
(defvar *umls-sql-user* "secret")
(defun umls-sql-user ()
@@
-62,10
+66,13
@@
(sql-disconnect-pooled)
(setq *umls-sql-type* h))
(sql-disconnect-pooled)
(setq *umls-sql-type* h))
+(defun umls-connection-spec ()
+ (list *umls-sql-host* *umls-sql-db*
+ *umls-sql-user* *umls-sql-passwd*))
+
(defun sql-connect ()
"Connect to UMLS database, automatically used pooled connections"
(defun sql-connect ()
"Connect to UMLS database, automatically used pooled connections"
- (clsql:connect (list *umls-sql-host* (lookup-db-name *umls-sql-db*)
- *umls-sql-user* *umls-sql-passwd*)
+ (clsql:connect (umls-connection-spec)
:database-type *umls-sql-type* :pool t))
(defun sql-disconnect (conn)
:database-type *umls-sql-type* :pool t))
(defun sql-disconnect (conn)