X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql.lisp;fp=sql.lisp;h=207d68c6fa86ef933298fc2576ce6b35e26fb698;hb=8dc001f5e7cf851c06006e489473a85611d348be;hp=985bf98900fe5334635fd08f577f2cccf91882f5;hpb=bfdadbcc62f9b2f4e6d5bdb96683b5aa1187e0a1;p=umlisp.git diff --git a/sql.lisp b/sql.lisp index 985bf98..207d68c 100644 --- a/sql.lisp +++ b/sql.lisp @@ -7,10 +7,8 @@ ;;;; Author: Kevin M. Rosenberg ;;;; Created: Apr 2000 ;;;; -;;;; $Id$ -;;;; ;;;; This file, part of UMLisp, is -;;;; Copyright (c) 2000-2006 by Kevin M. Rosenberg, M.D. +;;;; Copyright (c) 2000-2010 by Kevin M. Rosenberg, M.D. ;;;; ;;;; UMLisp users are granted the rights to distribute and use this software ;;;; as governed by the terms of the GNU General Public License. @@ -21,9 +19,9 @@ (defvar +umls-sql-map+ '((:2004aa . "KUMLS2004AA") (:2006ac . "KUMLS2006AC") - (:2006ad . "MTS2006AD"))) -(defvar +default-umls-db+ "MTS2006AD") - + (:2006ad . "MTS2006AD") + (:2009ab . "MTS2009AB"))) +(defvar +default-umls-db+ "MTS2009AB") (defun lookup-db-name (db) (cdr (assoc (ensure-keyword db) +umls-sql-map+))) @@ -68,8 +66,12 @@ (setq *umls-sql-type* h)) (defun umls-connection-spec () - (list *umls-sql-host* *umls-sql-db* - *umls-sql-user* *umls-sql-passwd*)) + (if (eql *umls-sql-type* :mysql) + (list *umls-sql-host* *umls-sql-db* + *umls-sql-user* *umls-sql-passwd* + nil '((:local-infile . 1))) + (list *umls-sql-host* *umls-sql-db* + *umls-sql-user* *umls-sql-passwd*))) (defun sql-connect () "Connect to UMLS database, automatically used pooled connections"