X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=sql%2Fsql.cl;h=ed18c0b28a33c4ee0e65e38f95eab5f6a7a9c6f8;hb=865598033baf78cf3ba9da36a031a85eb18849e0;hp=4b88fd584118ec8f3eb3023bd5d4b1ab4f0c9d04;hpb=2073ba6b66571d3da57523dbdcb30ed6ffb4b161;p=clsql.git

diff --git a/sql/sql.cl b/sql/sql.cl
index 4b88fd5..ed18c0b 100644
--- a/sql/sql.cl
+++ b/sql/sql.cl
@@ -8,7 +8,7 @@
 ;;;;                 Original code by Pierre R. Mai 
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: sql.cl,v 1.12 2002/04/19 20:25:20 marc.battyani Exp $
+;;;; $Id: sql.cl,v 1.16 2002/05/11 14:31:10 marc.battyani Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
@@ -76,8 +76,6 @@ initialized, as indicated by `*initialized-database-types*'."
 (defvar *default-database* nil
   "Specifies the default database to be used.")
 
-
-
 (defun find-database (database &optional (errorp t))
   (etypecase database
     (database
@@ -95,31 +93,37 @@ initialized, as indicated by `*initialized-database-types*'."
 
 (defun connect (connection-spec
 		&key (if-exists *connect-if-exists*)
-		(database-type *default-database-type*))
+		(database-type *default-database-type*)
+		(pool nil))
   "Connects to a database of the given database-type, using the type-specific
-connection-spec.  if-exists is currently ignored."
-  (let* ((db-name (database-name-from-spec connection-spec database-type))
-	 (old-db (find-database db-name nil))
-	 (result nil))
-    (if old-db
+connection-spec.  if-exists is currently ignored.
+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.
+"
+  (if pool
+    (acquire-from-pool connection-spec database-type pool)
+    (let* ((db-name (database-name-from-spec connection-spec database-type))
+	   (old-db (unless (eq if-exists :new) (find-database db-name nil)))
+	   (result nil))
+      (if old-db
 	(case if-exists
-	  (:new
-	   (setq result
-		 (database-connect connection-spec database-type)))
+;	    (:new
+;	     (setq result
+;	       (database-connect connection-spec database-type)))
 	  (:warn-new
 	   (setq result
 		 (database-connect connection-spec database-type))
 	   (warn 'clsql-exists-warning :old-db old-db :new-db result))
 	  (:error
 	   (restart-case
-	       (error 'clsql-exists-error :old-db old-db)
-	     (create-new ()
-	       :report "Create a new connection."
-	       (setq result
-		     (database-connect connection-spec database-type)))
-	     (use-old ()
-	       :report "Use the existing connection."
-	       (setq result old-db))))
+		 (error 'clsql-exists-error :old-db old-db)
+	       (create-new ()
+		   :report "Create a new connection."
+		 (setq result
+		   (database-connect connection-spec database-type)))
+	       (use-old ()
+		   :report "Use the existing connection."
+		 (setq result old-db))))
 	  (:warn-old
 	   (setq result old-db)
 	   (warn 'clsql-exists-warning :old-db old-db :new-db old-db))
@@ -127,24 +131,24 @@ connection-spec.  if-exists is currently ignored."
 	   (setq result old-db)))
 	(setq result
 	      (database-connect connection-spec database-type)))
-    (when result
-      (pushnew result *connected-databases*)
-      (setq *default-database* result)
-      result)))
-
+      (when result
+	(pushnew result *connected-databases*)
+	(setq *default-database* result)
+	result))))
 
 
 (defun disconnect (&key (database *default-database*))
   "Closes the connection to database. Resets *default-database* if that
-database was disconnected and only one other connection exists."
-  (when (database-disconnect database)
-    (setq *connected-databases* (delete database *connected-databases*))
-    (when (eq database *default-database*)
-      (setq *default-database* (car *connected-databases*)))
-    (change-class database 'closed-database)
-    t))
-
-
+database was disconnected and only one other connection exists.
+if the database is from a pool it will be released to this pool."
+  (if (conn-pool database)
+      (release-to-pool database)
+    (when (database-disconnect database)
+      (setq *connected-databases* (delete database *connected-databases*))
+      (when (eq database *default-database*)
+	(setq *default-database* (car *connected-databases*)))
+      (change-class database 'closed-database)
+      t)))
 
 ;;; Basic operations on databases