projects
/
umlisp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r9596: Automated commit for Debian build of umlisp upstream-version-4.1.0
[umlisp.git]
/
sql.lisp
diff --git
a/sql.lisp
b/sql.lisp
index 758c6ba8d47d963d732fdc860026488a456881fa..7d2b0c6d652171eb9c6e1146986e6ff4776a3960 100644
(file)
--- a/
sql.lisp
+++ b/
sql.lisp
@@
-2,15
+2,15
@@
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
-;;;; Name:
sql.lisp
-;;;; Purpose:
Low-level SQL routines data for UMLisp
-;;;; Author:
Kevin M. Rosenberg
-;;;;
Date Star
ted: Apr 2000
+;;;; Name: sql.lisp
+;;;; Purpose: Low-level SQL routines data for UMLisp
+;;;; Author: Kevin M. Rosenberg
+;;;;
Crea
ted: Apr 2000
;;;;
;;;; $Id$
;;;;
;;;; This file, part of UMLisp, is
;;;;
;;;; $Id$
;;;;
;;;; This file, part of UMLisp, is
-;;;; Copyright (c) 2000-200
3
by Kevin M. Rosenberg, M.D.
+;;;; Copyright (c) 2000-200
4
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.
;;;;
;;;; UMLisp users are granted the rights to distribute and use this software
;;;; as governed by the terms of the GNU General Public License.
@@
-19,10
+19,8
@@
(in-package #:umlisp)
(defvar +umls-sql-map+
(in-package #:umlisp)
(defvar +umls-sql-map+
- '((:2002AD . "KUMLS2002AD") (:2003AA . "KUMLS2003AA")
- (:2003AB . "KUMLS2003AB") (:2003AC . "KUMLS2003AC")
- (:2004AA . "KUMLS2004AA")))
-(defvar +default-umls-db+ :2003AB)
+ '((:2004aa . "KUMLS2004AA")))
+(defvar +default-umls-db+ :2004aa)
(defun lookup-db-name (db)
(defun lookup-db-name (db)
@@
-35,8
+33,6
@@
(defun umls-sql-db! (db)
(setq *umls-sql-db* db))
(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*)
(defvar *umls-sql-user* "secret")
(defun umls-sql-user ()
*umls-sql-user*)
@@
-89,8
+85,8
@@
(sql-query stmt conn)
(sql-execute stmt conn)))
(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))
(defun sql-execute (cmd conn)
(clsql:execute-command cmd :database conn))
@@
-112,6
+108,6
@@
(with-mutex-sql (conn)
(sql-execute cmd 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)
(with-mutex-sql (conn)
- (sql-query cmd conn :
types
types)))
+ (sql-query cmd conn :
result-types result-
types)))