r9039: 2003AC updates

[umlisp.git] / sql.lisp

diff --git a/sql.lisp b/sql.lisp
index 49ac0539d160b0091c6437d2afd230cf7c1d23b2..39f82dc2767ad65a8146428341df8ee638662725 100644 (file)
--- a/sql.lisp
+++ b/sql.lisp
@@ -19,9 +19,9 @@
 (in-package #:umlisp)
 
 (defvar +umls-sql-map+
-    '((:2002AD . "KUMLS2002AD") (:2003AA . "KUMLS2003AA"))
+    '((:2002AD . "KUMLS2002AD") (:2003AA . "KUMLS2003AA")
       (:2003AB . "KUMLS2003AB") (:2003AC . "KUMLS2003AC")
-      (:2004AA . "KUMLS2004AA"))
+      (:2004AA . "KUMLS2004AA")))
 (defvar +default-umls-db+ :2003AC)
 
 
@@ -35,7 +35,7 @@
 (defun umls-sql-db! (db)
   (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)))