r9049: remove redundant statement

[umlisp.git] / sql.lisp

diff --git a/sql.lisp b/sql.lisp
index 758c6ba8d47d963d732fdc860026488a456881fa..d3132ab191e0882c3dc6f9ba048e2dda0122ccee 100644 (file)
--- a/sql.lisp
+++ b/sql.lisp
@@ -22,7 +22,7 @@
     '((:2002AD . "KUMLS2002AD") (:2003AA . "KUMLS2003AA")
       (:2003AB . "KUMLS2003AB") (:2003AC . "KUMLS2003AC")
       (:2004AA . "KUMLS2004AA")))
-(defvar +default-umls-db+ :2003AB)
+(defvar +default-umls-db+ :2003AC)
 
 
 (defun lookup-db-name (db)
@@ -35,8 +35,6 @@
 (defun umls-sql-db! (db)
   (setq *umls-sql-db* db))
 
-(umls-sql-db! :2003AB)
-
 (defvar *umls-sql-user* "secret")
 (defun umls-sql-user ()
   *umls-sql-user*)
@@ -89,8 +87,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 +110,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)))