Pass encoding argument to pooled connections

[clsql.git] / sql / pool.lisp

diff --git a/sql/pool.lisp b/sql/pool.lisp
index 5f871532bb78d6cb8111ea63bbbc41e90eb5931e..e4f4b608b6d429549ae2d868cd64dcce920b54d3 100644 (file)
--- a/sql/pool.lisp
+++ b/sql/pool.lisp
@@ -30,10 +30,10 @@ that should, on avg keep the free connections about this size.")
    (free-connections :accessor free-connections :initform nil)
    (all-connections :accessor all-connections :initform nil)
    (lock :accessor conn-pool-lock
-         :initform (make-process-lock "Connection pool"))))
+        :initform (make-process-lock "Connection pool"))))
 
 
-(defun acquire-from-pool (connection-spec database-type &optional pool)
+(defun acquire-from-pool (connection-spec database-type &optional pool encoding)
   "Try to find a working database connection in the pool or create a new
 one if needed. This performs 1 query against the DB to ensure it's still
 valid. When possible (postgres, mssql) that query will be a reset
@@ -68,7 +68,8 @@ Disconnecting.~%"
    (let ((conn (connect (connection-spec pool)
                        :database-type (pool-database-type pool)
                        :if-exists :new
-                       :make-default nil)))
+                       :make-default nil
+                        :encoding encoding)))
      (with-process-lock ((conn-pool-lock pool) "new conection")
        (push conn (all-connections pool))
        (setf (conn-pool conn) pool))
@@ -85,8 +86,9 @@ chance to do cleanup."
       ;;not the list). Multiple threads getting to this test at the
       ;;same time might result in the free-connections getting
       ;;longer... meh.
-      ((>= (length (free-connections pool))
-          *db-pool-max-free-connections*)
+      ((and *db-pool-max-free-connections*
+           (>= (length (free-connections pool))
+               *db-pool-max-free-connections*))
        (%pool-force-disconnect database)
        (with-process-lock ((conn-pool-lock pool) "Remove extra Conn")
         (setf (all-connections pool)
@@ -131,12 +133,12 @@ chance to do cleanup."
 if not found"
   (with-process-lock (*db-pool-lock* "Find-or-create connection")
     (let* ((key (list connection-spec database-type))
-           (conn-pool (gethash key *db-pool*)))
+          (conn-pool (gethash key *db-pool*)))
       (unless conn-pool
-        (setq conn-pool (make-instance 'conn-pool
-                                       :connection-spec connection-spec
-                                       :pool-database-type database-type))
-        (setf (gethash key *db-pool*) conn-pool))
+       (setq conn-pool (make-instance 'conn-pool
+                                      :connection-spec connection-spec
+                                      :pool-database-type database-type))
+       (setf (gethash key *db-pool*) conn-pool))
       conn-pool)))
 
 (defun disconnect-pooled (&optional clear)
@@ -145,8 +147,8 @@ the pool objects."
   (with-process-lock (*db-pool-lock* "Disconnect pooled")
     (maphash
      #'(lambda (key conn-pool)
-         (declare (ignore key))
-         (clear-conn-pool conn-pool))
+        (declare (ignore key))
+        (clear-conn-pool conn-pool))
      *db-pool*)
     (when clear (clrhash *db-pool*)))
   t)