r11209: fix test

[umlisp.git] / sql.lisp

diff --git a/sql.lisp b/sql.lisp
index 7e5ce8892f1e5d61c17b964c8711b2819cfce680..d2900d6d2a8bb40231d52cac24d6cc18b08e3c19 100644 (file)
--- a/sql.lisp
+++ b/sql.lisp
@@ -1,18 +1,38 @@
-;;;;  -*- Mode: LISP; Syntax: Common-Lisp; Base: 10; Pkg: umlisp -*-
-;; SQL/UMLS database Layer over database backend
-;; Copyright (c) 2001 Kevin M. Rosenberg, M.D.
-;; $Id: sql.lisp,v 1.2 2002/10/08 22:13:41 kevin Exp $
-
-(in-package :umlisp)
-
-(declaim (optimize (speed 1) (safety 3)))
-
-(defvar *umls-sql-dsn* "KUMLS2002AC")
-(defun umls-sql-dsn ()
-  *umls-sql-dsn*)
-(defun umls-sql-dsn! (dbname)
-  (sql-disconnect-pooled)
-  (setq *umls-sql-dsn* dbname))
+;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; Package: umlisp -*-
+;;;; *************************************************************************
+;;;; FILE IDENTIFICATION
+;;;;
+;;;; 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-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+
+    '((:2004aa . "KUMLS2004AA")
+      (:2006ac . "KUMLS2006AC")))
+(defvar +default-umls-db+ :2006ac)
+
+
+(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 ()
@@ -44,7 +64,8 @@
 
 (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)
@@ -60,17 +81,17 @@
         (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)
@@ -88,9 +109,6 @@
   (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)))