r8834: changes for clsql 2

[umlisp.git] / sql.lisp

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