projects
/
umlisp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove obsolute uso class, simply loop exit
[umlisp.git]
/
sql.lisp
diff --git
a/sql.lisp
b/sql.lisp
index 1c4b0579a413fc1d9ee6277fbc7c7546558389af..42b30802cd6fc8e9aa535a9b70edf3d472c6ad0e 100644
(file)
--- a/
sql.lisp
+++ b/
sql.lisp
@@
-7,10
+7,8
@@
;;;; Author: Kevin M. Rosenberg
;;;; Created: Apr 2000
;;;;
;;;; Author: Kevin M. Rosenberg
;;;; Created: Apr 2000
;;;;
-;;;; $Id$
-;;;;
;;;; This file, part of UMLisp, is
;;;; This file, part of UMLisp, is
-;;;; Copyright (c) 2000-20
06
by Kevin M. Rosenberg, M.D.
+;;;; Copyright (c) 2000-20
10
by Kevin M. Rosenberg, M.D.
;;;;
;;;; UMLisp users are granted the rights to distribute and use this software
;;;; as governed by the terms of the GNU General Public License.
;;;;
;;;; UMLisp users are granted the rights to distribute and use this software
;;;; as governed by the terms of the GNU General Public License.
@@
-20,9
+18,10
@@
(defvar +umls-sql-map+
'((:2004aa . "KUMLS2004AA")
(defvar +umls-sql-map+
'((:2004aa . "KUMLS2004AA")
- (:2006ac . "KUMLS2006AC")))
-(defvar +default-umls-db+ :2006ac)
-
+ (:2006ac . "KUMLS2006AC")
+ (:2006ad . "MTS2006AD")
+ (:2009ab . "MTS2009AB")))
+(defvar +default-umls-db+ "MTS2009AB")
(defun lookup-db-name (db)
(cdr (assoc (ensure-keyword db) +umls-sql-map+)))
(defun lookup-db-name (db)
(cdr (assoc (ensure-keyword db) +umls-sql-map+)))
@@
-31,42
+30,55
@@
(defun umls-sql-db ()
*umls-sql-db*)
(defun umls-sql-db ()
*umls-sql-db*)
-(defun umls-sql-db! (db)
- (setq *umls-sql-db* db))
+(defun set-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 ()
*umls-sql-user*)
(defvar *umls-sql-user* "secret")
(defun umls-sql-user ()
*umls-sql-user*)
-(defun
umls-sql-user!
(u)
+(defun
set-umls-sql-user
(u)
(sql-disconnect-pooled)
(setq *umls-sql-user* u))
(defvar *umls-sql-passwd* "secret")
(defun umls-sql-passwd ()
*umls-sql-passwd*)
(sql-disconnect-pooled)
(setq *umls-sql-user* u))
(defvar *umls-sql-passwd* "secret")
(defun umls-sql-passwd ()
*umls-sql-passwd*)
-(defun
umls-sql-passwd!
(p)
+(defun
set-umls-sql-passwd
(p)
(sql-disconnect-pooled)
(setq *umls-sql-passwd* p))
(defvar *umls-sql-host* "localhost")
(defun umls-sql-host ()
*umls-sql-host*)
(sql-disconnect-pooled)
(setq *umls-sql-passwd* p))
(defvar *umls-sql-host* "localhost")
(defun umls-sql-host ()
*umls-sql-host*)
-(defun
umls-sql-host!
(h)
+(defun
set-umls-sql-host
(h)
(sql-disconnect-pooled)
(setq *umls-sql-host* h))
(defvar *umls-sql-type* :mysql)
(defun umls-sql-type ()
*umls-sql-type*)
(sql-disconnect-pooled)
(setq *umls-sql-host* h))
(defvar *umls-sql-type* :mysql)
(defun umls-sql-type ()
*umls-sql-type*)
-(defun
umls-sql-type!
(h)
+(defun
set-umls-sql-type
(h)
(sql-disconnect-pooled)
(setq *umls-sql-type* h))
(sql-disconnect-pooled)
(setq *umls-sql-type* h))
+(defun umls-connection-spec ()
+ (if (eql *umls-sql-type* :mysql)
+ (list *umls-sql-host* *umls-sql-db*
+ *umls-sql-user* *umls-sql-passwd*
+ nil '((:local-infile . 1)))
+ (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*)
- :database-type *umls-sql-type* :pool t))
+ (clsql:connect (umls-connection-spec)
+ :database-type *umls-sql-type*
+ :encoding :utf-8
+ :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"
@@
-78,20
+90,20
@@
(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)))))
(when ,conn (clsql:disconnect :database ,conn)))))
-(defun sql (stmt conn)
- (if (string-equal "SELECT" (subseq stmt 0 6))
- (sql-query stmt conn)
- (sql-execute stmt conn)))
-
(defun sql-query (cmd conn &key (result-types :auto))
(clsql:query cmd :database conn :result-types result-types :field-names nil))
(defun sql-execute (cmd conn)
(clsql:execute-command cmd :database conn))
(defun sql-query (cmd conn &key (result-types :auto))
(clsql:query cmd :database conn :result-types result-types :field-names nil))
(defun sql-execute (cmd conn)
(clsql:execute-command cmd :database conn))
+(defun sql (stmt conn)
+ (if (string-equal "SELECT" (subseq stmt 0 6))
+ (sql-query stmt conn)
+ (sql-execute stmt conn)))
+
(defun umls-sql (stmt)
(check-type stmt string)
(with-sql-connection (conn)
(defun umls-sql (stmt)
(check-type stmt string)
(with-sql-connection (conn)
@@
-102,7
+114,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)