;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
-;;;; Name: sql.lisp
-;;;; Purpose: Low-level SQL routines data for UMLisp
-;;;; Author: Kevin M. Rosenberg
-;;;; Date Started: Apr 2000
+;;;; Name: sql.lisp
+;;;; Purpose: Low-level SQL routines data for UMLisp
+;;;; Author: Kevin M. Rosenberg
+;;;; Created: Apr 2000
;;;;
-;;;; $Id: sql.lisp,v 1.14 2003/08/08 09:06:06 kevin Exp $
+;;;; $Id$
;;;;
;;;; This file, part of UMLisp, is
-;;;; Copyright (c) 2000-2003 by Kevin M. Rosenberg, M.D.
+;;;; Copyright (c) 2000-2004 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.
(in-package #:umlisp)
(defvar +umls-sql-map+
- '((:2002AD . "KUMLS2002AD") (:2003AA . "KUMLS2003AA")
- (:2003AB . "KUMLS2003AB")))
-(defvar +default-umls-db+ "KUMLS2003AB")
+ '((:2004aa . "KUMLS2004AA")))
+(defvar +default-umls-db+ :2004aa)
(defun lookup-db-name (db)
(cdr (assoc (ensure-keyword db) +umls-sql-map+)))
+(defvar *umls-sql-db* +default-umls-db+)
(defun umls-sql-db ()
*umls-sql-db*)
(defun umls-sql-db! (db)
- (unless (eq db *umls-sql-db*)
- (sql-disconnect-pooled))
(setq *umls-sql-db* db))
-(umls-sql-db! :2003AB)
-
(defvar *umls-sql-user* "secret")
(defun umls-sql-user ()
*umls-sql-user*)
(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 :field-names nil))
(defun sql-execute (cmd conn)
(clsql:execute-command cmd :database conn))
(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)))