projects
/
umlisp-orf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r11859: Canonicalize whitespace
[umlisp-orf.git]
/
sql.lisp
diff --git
a/sql.lisp
b/sql.lisp
index 7b3c4a365e39cefea444702393510bc76a4b708b..b41b03ab66c089e06e67ab977904469c5228de71 100644
(file)
--- a/
sql.lisp
+++ b/
sql.lisp
@@
-66,8
+66,8
@@
(defun sql-connect ()
"Connect to UMLS database, automatically used pooled connections"
(clsql:connect (list *umls-sql-host* (lookup-db-name *umls-sql-db*)
(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*)
- :database-type *umls-sql-type* :pool t))
+ *umls-sql-user* *umls-sql-passwd*)
+
:database-type *umls-sql-type* :pool t))
(defun sql-disconnect (conn)
"Disconnect from UMLS database, but put connection back into pool"
(defun sql-disconnect (conn)
"Disconnect from UMLS database, but put connection back into pool"
@@
-79,7
+79,7
@@
(defmacro with-sql-connection ((conn) &body body)
`(let ((,conn (sql-connect)))
(unwind-protect
(defmacro with-sql-connection ((conn) &body body)
`(let ((,conn (sql-connect)))
(unwind-protect
- (progn ,@body)
+
(progn ,@body)
(when ,conn (clsql:disconnect :database ,conn)))))
(defun sql (stmt conn)
(when ,conn (clsql:disconnect :database ,conn)))))
(defun sql (stmt conn)
@@
-103,7
+103,7
@@
(defmacro with-mutex-sql ((conn) &body body)
`(let ((,conn (sql-connect)))
(unwind-protect
(defmacro with-mutex-sql ((conn) &body body)
`(let ((,conn (sql-connect)))
(unwind-protect
- (progn ,@body)
+
(progn ,@body)
(when ,conn (sql-disconnect ,conn)))))
(defun mutex-sql-execute (cmd)
(when ,conn (sql-disconnect ,conn)))))
(defun mutex-sql-execute (cmd)