projects
/
umlisp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r11477: nicer verbose tracing output
[umlisp.git]
/
sql.lisp
diff --git
a/sql.lisp
b/sql.lisp
index b856e6b37ad9779015fe66226ab74b615dbf8e75..82af22b282da669dd8a92b4e233060ace99d01b9 100644
(file)
--- a/
sql.lisp
+++ b/
sql.lisp
@@
-2,30
+2,42
@@
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
-;;;; Name:
sql.lisp
-;;;; Purpose:
Low-level SQL routines data for UMLisp
-;;;;
Programmer:
Kevin M. Rosenberg
-;;;;
Date Star
ted: Apr 2000
+;;;; Name: sql.lisp
+;;;; Purpose: Low-level SQL routines data for UMLisp
+;;;;
Author:
Kevin M. Rosenberg
+;;;;
Crea
ted: Apr 2000
;;;;
;;;;
-;;;; $Id
: sql.lisp,v 1.10 2002/12/23 21:59:44 kevin Exp
$
+;;;; $Id$
;;;;
;;;; This file, part of UMLisp, is
;;;;
;;;; This file, part of UMLisp, is
-;;;; Copyright (c) 2000-200
2
by Kevin M. Rosenberg, M.D.
+;;;; Copyright (c) 2000-200
6
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.
;;;; *************************************************************************
-(in-package :umlisp)
-(declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3)))
+(in-package #:umlisp)
+(defvar +umls-sql-map+
+ '((:2004aa . "KUMLS2004AA")
+ (:2006ac . "KUMLS2006AC")
+ (:2006ad . "MTS2006AD")))
+(defvar +default-umls-db+ "MTS2006AD")
-(defvar *umls-sql-db* "KUMLS2003AA")
+
+(defun lookup-db-name (db)
+ (cdr (assoc (ensure-keyword db) +umls-sql-map+)))
+
+(defvar *umls-sql-db* +default-umls-db+)
(defun umls-sql-db ()
*umls-sql-db*)
(defun umls-sql-db ()
*umls-sql-db*)
-(defun umls-sql-db! (dbname)
- (sql-disconnect-pooled)
- (setq *umls-sql-db* dbname))
+
+(defun 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 ()
@@
-55,9
+67,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
`(,(umls-sql-host) ,(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)
@@
-73,17
+89,17
@@
(progn ,@body)
(when ,conn (clsql:disconnect :database ,conn)))))
(progn ,@body)
(when ,conn (clsql:disconnect :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 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 (types :auto))
- (clsql:query cmd :database conn :types types))
-
-(defun sql-execute (cmd conn)
- (clsql:execute-command cmd :database 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)
@@
-101,6
+117,6
@@
(with-mutex-sql (conn)
(sql-execute cmd conn)))
(with-mutex-sql (conn)
(sql-execute cmd conn)))
-(defun mutex-sql-query (cmd &key (types :auto))
+(defun mutex-sql-query (cmd &key (
result-
types :auto))
(with-mutex-sql (conn)
(with-mutex-sql (conn)
- (sql-query cmd conn :
types
types)))
+ (sql-query cmd conn :
result-types result-
types)))