Update for 2010AA release

[umlisp.git] / sql.lisp

diff --git a/sql.lisp b/sql.lisp
index 565672ee5810015ff56f94b55eacc5d2b7f3ba7a..e1414d9d0840015702adcb18e5d22a112c1a92e6 100644 (file)
--- a/sql.lisp
+++ b/sql.lisp
@@ -20,8 +20,9 @@
     '((:2004aa . "KUMLS2004AA")
       (:2006ac . "KUMLS2006AC")
       (:2006ad . "MTS2006AD")
-      (:2009ab . "MTS2009AB")))
-(defvar +default-umls-db+ "MTS2009AB")
+      (:2009ab . "MTS2009AB")
+      (:2010aa . "MTS2010AA")))
+(defvar +default-umls-db+ "MTS2010AA")
 
 (defun lookup-db-name (db)
   (cdr (assoc (ensure-keyword db) +umls-sql-map+)))
@@ -30,7 +31,7 @@
 (defun umls-sql-db ()
   *umls-sql-db*)
 
-(defun (setf umls-sql-db) (db)
+(defun set-umls-sql-db (db)
   (etypecase db
     (string
      (setq *umls-sql-db* db))
@@ -40,28 +41,28 @@
 (defvar *umls-sql-user* "secret")
 (defun umls-sql-user ()
   *umls-sql-user*)
-(defun (setf umls-sql-user) (u)
+(defun set-umls-sql-user (u)
   (sql-disconnect-pooled)
   (setq *umls-sql-user* u))
 
 (defvar *umls-sql-passwd* "secret")
 (defun umls-sql-passwd ()
   *umls-sql-passwd*)
-(defun (setf umls-sql-passwd) (p)
+(defun set-umls-sql-passwd (p)
   (sql-disconnect-pooled)
   (setq *umls-sql-passwd* p))
 
 (defvar *umls-sql-host* "localhost")
 (defun umls-sql-host ()
   *umls-sql-host*)
-(defun (setf umls-sql-host) (h)
+(defun set-umls-sql-host (h)
   (sql-disconnect-pooled)
   (setq *umls-sql-host* h))
 
 (defvar *umls-sql-type* :mysql)
 (defun umls-sql-type ()
   *umls-sql-type*)
-(defun (setf umls-sql-type) (h)
+(defun set-umls-sql-type (h)
   (sql-disconnect-pooled)
   (setq *umls-sql-type* h))
 
@@ -75,8 +76,11 @@
 
 (defun sql-connect ()
   "Connect to UMLS database, automatically used pooled connections"
-  (clsql:connect (umls-connection-spec)
-                 :database-type *umls-sql-type* :pool t))
+  (let ((db (clsql:connect (umls-connection-spec)
+                           :database-type *umls-sql-type*
+                           :encoding :utf-8
+                           :pool t)))
+    db))
 
 (defun sql-disconnect (conn)
   "Disconnect from UMLS database, but put connection back into pool"