changed how where clauses are output to ensure that we do not output a "where"

[clsql.git] / sql / pool.lisp

diff --git a/sql/pool.lisp b/sql/pool.lisp
index 457315560bc5499c494c4da3a5e5e87f25050d7b..d1c0a230bc43255f8d9b3940286e1545c3e7d50d 100644 (file)
--- a/sql/pool.lisp
+++ b/sql/pool.lisp
@@ -32,29 +32,39 @@
          :initform (make-process-lock "Connection pool"))))
 
 (defun acquire-from-conn-pool (pool)
+  "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
+command to put the connection back into its default state."
   (or (with-process-lock ((conn-pool-lock pool) "Acquire from pool")
         (when (plusp (length (free-connections pool)))
           (let ((pconn (vector-pop (free-connections pool))))
             ;; test if connection still valid.
-            ;; Currently, on supported on MySQL
-            (cond
-              ((eq :mysql (database-type pconn))
-               (handler-case
-                   (database-query "SHOW ERRORS LIMIT 1" pconn nil nil)
-                 (error (e)
-                   ;; we could check for error type 2006 for "SERVER GONE AWAY",
-                   ;; but, it's safer just to disconnect the pooled conn for any error
-                   (warn "Database connection ~S had an error when attempted to be acquired from the pool:
+           ;; (e.g. db reboot -> invalid connection )
+           (handler-case
+               (case (database-underlying-type pconn)
+                 (:postgresql
+                    (database-execute-command "RESET ALL" pconn))
+                 (:mysql
+                    (database-query "SHOW ERRORS LIMIT 1" pconn nil nil))
+                 (:mssql
+                    ;; rpc escape sequence since this can't be called as a normal sp.
+                    ;;http://msdn.microsoft.com/en-us/library/aa198358%28SQL.80%29.aspx
+                    (database-execute-command "{rpc sp_reset_connection}" pconn))
+                 (T
+                    (database-query "SELECT 1;"  pconn '(integer) nil)))
+             (sql-database-error (e)
+               ;; we could check for a specific error,
+               ;; but, it's safer just to disconnect the pooled conn for any error ?
+               (warn "Database connection ~S had an error when attempted to be acquired from the pool:
   ~S
 Disconnecting.~%"
-                         pconn e)
-                   (ignore-errors (database-disconnect pconn))
-                   nil)
-                 (:no-error (res fields)
-                   (declare (ignore res fields))
-                   pconn)))
-              (t
-               pconn)))))
+                     pconn e)
+               (ignore-errors (database-disconnect pconn))
+               nil)
+             (:no-error (&rest args)
+               (declare (ignore args))
+               pconn)))))
       (let ((conn (connect (connection-spec pool)
                            :database-type (pool-database-type pool)
                            :if-exists :new