projects
/
umlisp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes needed for 2009AB version of UMLS
[umlisp.git]
/
sql.lisp
diff --git
a/sql.lisp
b/sql.lisp
index 39f82dc2767ad65a8146428341df8ee638662725..207d68c6fa86ef933298fc2576ce6b35e26fb698 100644
(file)
--- a/
sql.lisp
+++ b/
sql.lisp
@@
-2,15
+2,13
@@
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
-;;;; Name: sql.lisp
-;;;; Purpose: Low-level SQL routines data for UMLisp
-;;;; Author: Kevin M. Rosenberg
-;;;; Date Started: Apr 2000
-;;;;
-;;;; $Id$
+;;;; Name: sql.lisp
+;;;; Purpose: Low-level SQL routines data for UMLisp
+;;;; Author: Kevin M. Rosenberg
+;;;; Created: Apr 2000
;;;;
;;;; This file, part of UMLisp, is
;;;;
;;;; This file, part of UMLisp, is
-;;;; Copyright (c) 2000-20
03
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.
@@
-19,11
+17,11
@@
(in-package #:umlisp)
(defvar +umls-sql-map+
(in-package #:umlisp)
(defvar +umls-sql-map+
- '((:200
2AD . "KUMLS2002AD") (:2003AA . "KUMLS2003
AA")
- (:200
3AB . "KUMLS2003AB") (:2003AC . "KUMLS2003
AC")
- (:200
4AA . "KUMLS2004AA"))
)
-
(defvar +default-umls-db+ :2003AC
)
-
+ '((:200
4aa . "KUMLS2004
AA")
+ (:200
6ac . "KUMLS2006
AC")
+ (:200
6ad . "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+)))
@@
-33,9
+31,11
@@
*umls-sql-db*)
(defun umls-sql-db! (db)
*umls-sql-db*)
(defun umls-sql-db! (db)
- (setq *umls-sql-db* db))
-
-(umls-sql-db! :2003AC)
+ (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 ()
@@
-65,11
+65,18
@@
(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* :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"
@@
-81,20
+88,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))
(defun sql-query (cmd conn &key (result-types :auto))
- (clsql:query cmd :database conn :result-types result-types))
+ (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-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)
@@
-105,7
+112,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)