projects
/
umlisp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r11164: fix case in tests
[umlisp.git]
/
sql.lisp
diff --git
a/sql.lisp
b/sql.lisp
index e4900ad0734183afc91a701e8aa670f609ab18ef..d2900d6d2a8bb40231d52cac24d6cc18b08e3c19 100644
(file)
--- a/
sql.lisp
+++ b/
sql.lisp
@@
-2,15
+2,15
@@
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
-;;;; Name:
sql.lisp
-;;;; Purpose:
Low-level SQL routines data for UMLisp
-;;;; Author:
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.14 2003/08/08 09:06:06 kevin Exp
$
+;;;; $Id$
;;;;
;;;; This file, part of UMLisp, is
;;;;
;;;; This file, part of UMLisp, is
-;;;; Copyright (c) 2000-200
3
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.
@@
-19,24
+19,21
@@
(in-package #:umlisp)
(defvar +umls-sql-map+
(in-package #:umlisp)
(defvar +umls-sql-map+
- '((:200
2AD . "KUMLS2002AD") (:2003AA . "KUMLS2003
AA")
- (:200
3AB . "KUMLS2003AB
")))
-(defvar +default-umls-db+
"KUMLS2003AB"
)
+ '((:200
4aa . "KUMLS2004
AA")
+ (:200
6ac . "KUMLS2006AC
")))
+(defvar +default-umls-db+
:2006ac
)
(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+)))
+(defvar *umls-sql-db* +default-umls-db+)
(defun umls-sql-db ()
*umls-sql-db*)
(defun umls-sql-db! (db)
(defun umls-sql-db ()
*umls-sql-db*)
(defun umls-sql-db! (db)
- (unless (eq db *umls-sql-db*)
- (sql-disconnect-pooled))
(setq *umls-sql-db* db))
(setq *umls-sql-db* db))
-(umls-sql-db! :2003AB)
-
(defvar *umls-sql-user* "secret")
(defun umls-sql-user ()
*umls-sql-user*)
(defvar *umls-sql-user* "secret")
(defun umls-sql-user ()
*umls-sql-user*)
@@
-68,7
+65,7
@@
(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*)
+ *umls-sql-user* *umls-sql-passwd*)
:database-type *umls-sql-type* :pool t))
(defun sql-disconnect (conn)
:database-type *umls-sql-type* :pool t))
(defun sql-disconnect (conn)
@@
-84,17
+81,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)
@@
-112,6
+109,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)))