;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
-;;;; Name: sql.lisp
-;;;; Purpose: Low-level SQL routines data for UMLisp
-;;;; Programmer: 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: sql.lisp,v 1.8 2002/11/11 07:15:48 kevin Exp $
+;;;; $Id$
;;;;
;;;; This file, part of UMLisp, is
-;;;; Copyright (c) 2000-2002 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)
-(declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3)))
+(in-package #:umlisp)
+(defvar +umls-sql-map+
+ '((:2004aa . "KUMLS2004AA")
+ (:2006ac . "KUMLS2006AC")))
+(defvar +default-umls-db+ :2006ac)
-(defvar *umls-sql-dsn* "KUMLS2002AD")
-(defun umls-sql-dsn ()
- *umls-sql-dsn*)
-(defun umls-sql-dsn! (dbname)
- (sql-disconnect-pooled)
- (setq *umls-sql-dsn* dbname))
+
+(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)
+ (setq *umls-sql-db* db))
(defvar *umls-sql-user* "secret")
(defun umls-sql-user ()
(defun sql-connect ()
"Connect to UMLS database, automatically used pooled connections"
- (clsql:connect `(,(umls-sql-host) ,(umls-sql-dsn) ,(umls-sql-user) ,(umls-sql-passwd))
+ (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))
(defun sql-disconnect (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-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)
(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)
- (sql-query cmd conn :types types)))
+ (sql-query cmd conn :result-types result-types)))