projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 6.5.0 Release
[clsql.git]
/
sql
/
database.lisp
diff --git
a/sql/database.lisp
b/sql/database.lisp
index bb87046fb6c8ce494976b9293efbc11d997b7e9d..b860d309f628d4de7001506809d48dbf90ddf712 100644
(file)
--- a/
sql/database.lisp
+++ b/
sql/database.lisp
@@
-104,7
+104,7
@@
be taken from this pool."
:verbose nil))
(if pool
:verbose nil))
(if pool
- (let ((conn (acquire-from-pool connection-spec database-type pool)))
+ (let ((conn (acquire-from-pool connection-spec database-type pool
encoding
)))
(when make-default (setq *default-database* conn))
conn)
(let* ((db-name (database-name-from-spec connection-spec database-type))
(when make-default (setq *default-database* conn))
conn)
(let* ((db-name (database-name-from-spec connection-spec database-type))
@@
-193,7
+193,9
@@
and signal an sql-user-error if they don't match. This function
is called by database backends."
`(handler-case
(destructuring-bind ,template ,connection-spec
is called by database backends."
`(handler-case
(destructuring-bind ,template ,connection-spec
- (declare (ignore ,@(remove '&optional template)))
+ (declare (ignore ,@(remove-if
+ (lambda (x) (member x '(&key &rest &optional)))
+ template)))
t)
(error ()
(error 'sql-user-error
t)
(error ()
(error 'sql-user-error
@@
-234,7
+236,7
@@
database connection cannot be closed, an error is signalled."
(ignore-errors (disconnect :database db))
(disconnect :database db :error nil)))
(ignore-errors (disconnect :database db))
(disconnect :database db :error nil)))
- (connect (connection-spec db))))
+ (connect (connection-spec db)
:encoding (encoding db)
)))
(defun status (&optional full)
(defun status (&optional full)