r11209: fix test

[umlisp.git] / sql.lisp

diff --git a/sql.lisp b/sql.lisp
index 7d2b0c6d652171eb9c6e1146986e6ff4776a3960..d2900d6d2a8bb40231d52cac24d6cc18b08e3c19 100644 (file)
--- a/sql.lisp
+++ b/sql.lisp
@@ -10,7 +10,7 @@
 ;;;; $Id$
 ;;;;
 ;;;; This file, part of UMLisp, is
-;;;;    Copyright (c) 2000-2004 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.
@@ -19,8 +19,9 @@
 (in-package #:umlisp)
 
 (defvar +umls-sql-map+
-    '((:2004aa . "KUMLS2004AA")))
-(defvar +default-umls-db+ :2004aa)
+    '((:2004aa . "KUMLS2004AA")
+      (:2006ac . "KUMLS2006AC")))
+(defvar +default-umls-db+ :2006ac)
 
 
 (defun lookup-db-name (db)
@@ -64,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*)
-                      *umls-sql-user* *umls-sql-passwd*) 
+                      *umls-sql-user* *umls-sql-passwd*)
                 :database-type *umls-sql-type* :pool t))
 
 (defun sql-disconnect (conn)
@@ -80,17 +81,17 @@
         (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 :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)