r2029: corrections

diff --git a/sql/pool.cl b/sql/pool.cl
index 6468c56047efb68fd7335f679b913fca82065569..00b87154a78b1d8591007bffbac62511fd9db031 100644 (file)
--- a/sql/pool.cl
+++ b/sql/pool.cl
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg, Marc Battyani
 ;;;; Date Started:  Apr 2002
 ;;;;
-;;;; $Id: pool.cl,v 1.5 2002/05/04 16:21:27 marc.battyani Exp $
+;;;; $Id: pool.cl,v 1.6 2002/05/13 16:55:07 marc.battyani Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -48,8 +48,8 @@
   (setf (fill-pointer (free-connections pool)) 0)
   (setf (fill-pointer (all-connections pool)) 0))
 
-(defun find-or-create-conn-pool (connection-spec database-type)
-  "Find connection vector in hash table, creates a new conn-vector if not found"
+(defun find-or-create-connection-pool (connection-spec database-type)
+  "Find connection pool in hash table, creates a new connection pool if not found"
   (let* ((key (list connection-spec database-type))
         (conn-pool (gethash key *db-pool*)))
     (unless conn-pool
@@ -61,7 +61,7 @@
 
 (defun acquire-from-pool (connection-spec database-type &optional pool)
   (unless (typep pool 'conn-pool)
-    (setf pool (find-or-create-conn-pool connection-spec database-type)))
+    (setf pool (find-or-create-connection-pool connection-spec database-type)))
   (acquire-from-conn-pool pool))
 
 (defun release-to-pool (database)

diff --git a/sql/transactions.cl b/sql/transactions.cl
index 7717162d604cbf833b427dd50903dfbb2a5ac782..693e7a5738e907eee5d9242debd2d94ffb7132d1 100644 (file)
--- a/sql/transactions.cl
+++ b/sql/transactions.cl
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Marc Battyani
 ;;;; Date Started:  Apr 2002
 ;;;;
-;;;; $Id: transactions.cl,v 1.3 2002/05/10 08:05:48 marc.battyani Exp $
+;;;; $Id: transactions.cl,v 1.4 2002/05/13 16:55:07 marc.battyani Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -52,7 +52,7 @@
            (map nil #'funcall (commit-hooks transaction)))
          (unwind-protect ;status is not :commited
               (execute-command "ROLLBACK" :database database)
-           (map nil #'funcall (rollback-hooks database))))))
+           (map nil #'funcall (rollback-hooks transaction))))))
     (warn "Continue without commit."
          'clsql-simple-error
          :format-control "Cannot commit transaction against ~A because there is no transaction in progress."
@@ -79,7 +79,7 @@
     `(let ((,db ,database))
       (unwind-protect
           (progn
-            (start-transaction ,db)
+            (database-start-transaction ,db)
             ,@body
             (commit-transaction ,db))
        (database-end-transaction ,db)))))