r9039: 2003AC updates

[umlisp.git] / sql.lisp

diff --git a/sql.lisp b/sql.lisp
index e4900ad0734183afc91a701e8aa670f609ab18ef..39f82dc2767ad65a8146428341df8ee638662725 100644 (file)
--- a/sql.lisp
+++ b/sql.lisp
@@ -7,7 +7,7 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: sql.lisp,v 1.14 2003/08/08 09:06:06 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2003 by Kevin M. Rosenberg, M.D.
@@ -20,22 +20,22 @@
 
 (defvar +umls-sql-map+
     '((:2002AD . "KUMLS2002AD") (:2003AA . "KUMLS2003AA")
-      (:2003AB . "KUMLS2003AB")))
-(defvar +default-umls-db+ "KUMLS2003AB")
+      (:2003AB . "KUMLS2003AB") (:2003AC . "KUMLS2003AC")
+      (:2004AA . "KUMLS2004AA")))
+(defvar +default-umls-db+ :2003AC)
 
 
 (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)
-  (unless (eq db *umls-sql-db*)
-    (sql-disconnect-pooled))
   (setq *umls-sql-db* db))
 
-(umls-sql-db! :2003AB)
+(umls-sql-db! :2003AC)
 
 (defvar *umls-sql-user* "secret")
 (defun umls-sql-user ()
@@ -89,8 +89,8 @@
       (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-query (cmd conn &key (result-types :auto))
+  (clsql:query cmd :database conn :result-types result-types))
 
 (defun sql-execute (cmd conn)
   (clsql:execute-command cmd :database conn))
@@ -112,6 +112,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)))