update SRLUS for 20009AB SNOMED change

[umlisp.git] / sql.lisp

diff --git a/sql.lisp b/sql.lisp
index 207d68c6fa86ef933298fc2576ce6b35e26fb698..42b30802cd6fc8e9aa535a9b70edf3d472c6ad0e 100644 (file)
--- a/sql.lisp
+++ b/sql.lisp
@@ -30,7 +30,7 @@
 (defun umls-sql-db ()
   *umls-sql-db*)
 
-(defun umls-sql-db! (db)
+(defun set-umls-sql-db (db)
   (etypecase db
     (string
      (setq *umls-sql-db* db))
@@ -40,28 +40,28 @@
 (defvar *umls-sql-user* "secret")
 (defun umls-sql-user ()
   *umls-sql-user*)
-(defun 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 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 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 umls-sql-type! (h)
+(defun set-umls-sql-type (h)
   (sql-disconnect-pooled)
   (setq *umls-sql-type* h))
 
@@ -76,7 +76,9 @@
 (defun sql-connect ()
   "Connect to UMLS database, automatically used pooled connections"
   (clsql:connect (umls-connection-spec)
-                 :database-type *umls-sql-type* :pool t))
+                 :database-type *umls-sql-type*
+                 :encoding :utf-8
+                 :pool t))
 
 (defun sql-disconnect (conn)
   "Disconnect from UMLS database, but put connection back into pool"