projects
/
clsql.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b55c36d
)
r1902: mod with-database
author
Kevin M. Rosenberg
<kevin@rosenberg.net>
Sat, 4 May 2002 02:43:15 +0000
(
02:43
+0000)
committer
Kevin M. Rosenberg
<kevin@rosenberg.net>
Sat, 4 May 2002 02:43:15 +0000
(
02:43
+0000)
sql/functional.cl
patch
|
blob
|
history
diff --git
a/sql/functional.cl
b/sql/functional.cl
index 754ad9eac2e44f9693b71ffbb5840569374acb8a..636215452eb7d836156acfe2a570a2d4789e5ddd 100644
(file)
--- a/
sql/functional.cl
+++ b/
sql/functional.cl
@@
-8,7
+8,7
@@
;;;;
;;;; Copyright (c) 1999-2001 Pierre R. Mai
;;;;
;;;;
;;;; Copyright (c) 1999-2001 Pierre R. Mai
;;;;
-;;;; $Id: functional.cl,v 1.
3 2002/05/03 20:50:18 marc.battyani
Exp $
+;;;; $Id: functional.cl,v 1.
4 2002/05/04 02:43:15 kevin
Exp $
;;;;
;;;; This file is part of CLSQL.
;;;;
;;;;
;;;; This file is part of CLSQL.
;;;;
@@
-85,9
+85,8
@@
:database database))))
(defmacro with-database ((db-var connection-spec
:database database))))
(defmacro with-database ((db-var connection-spec
- &key (if-exists *connect-if-exists*)
- (database-type *default-database-type*)
- (pool nil))
+ &rest connect-args
+ &key (pool nil))
&body body)
"Evaluate the body in an environment, where `db-var' is bound to the
database connection given by `connection-spec' and `connect-args'.
&body body)
"Evaluate the body in an environment, where `db-var' is bound to the
database connection given by `connection-spec' and `connect-args'.
@@
-95,8
+94,8
@@
If pool is t the the connection will be taken from the general pool,
if pool is a conn-pool object the connection will be taken from this pool.
The connection is automatically closed or released to the pool
on exit from the body."
if pool is a conn-pool object the connection will be taken from this pool.
The connection is automatically closed or released to the pool
on exit from the body."
- `(let ((,db-var (connect ,connection-spec :pool ,pool
- :database-type ,database-type :if-exists ,if-exists)))
+ `(let ((,db-var (connect ,connection-spec :pool ,pool ,@connect-args)))
(unwind-protect
(unwind-protect
- (let ((,db-var ,db-var)) ,@body)
- (disconnect :database ,db-var))))
+ (progn
+ ,@body)
+ (disconnect :database ,db-var :poool ,pool))))