;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
-;;;; Name: sql.lisp
-;;;; Purpose: Low-level SQL routines data for UMLisp
-;;;; Author: Kevin M. Rosenberg
-;;;; Date Started: Apr 2000
+;;;; Name: sql.lisp
+;;;; Purpose: Low-level SQL routines data for UMLisp
+;;;; Author: Kevin M. Rosenberg
+;;;; Created: Apr 2000
;;;;
;;;; $Id$
;;;;
;;;; This file, part of UMLisp, is
-;;;; Copyright (c) 2000-2003 by Kevin M. Rosenberg, M.D.
+;;;; Copyright (c) 2000-2006 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.
(in-package #:umlisp)
(defvar +umls-sql-map+
- '((:2002AD . "KUMLS2002AD") (:2003AA . "KUMLS2003AA")
- (:2003AB . "KUMLS2003AB") (:2003AC . "KUMLS2003AC")
- (:2004AA . "KUMLS2004AA")))
-(defvar +default-umls-db+ :2003AC)
+ '((:2004aa . "KUMLS2004AA")
+ (:2006ac . "KUMLS2006AC")
+ (:2006ad . "MTS2006AD")))
+(defvar +default-umls-db+ "MTS2006AD")
(defun lookup-db-name (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 ()
(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"
- (clsql:connect (list *umls-sql-host* (lookup-db-name *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)
(progn ,@body)
(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))
+ (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)