--- parser3/src/main/pa_sql_driver_manager.C	2001/04/04 10:53:57	1.1
+++ parser3/src/main/pa_sql_driver_manager.C	2001/04/05 11:01:57	1.4
@@ -5,12 +5,13 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_sql_driver_manager.C,v 1.1 2001/04/04 10:53:57 paf Exp $
+	$Id: pa_sql_driver_manager.C,v 1.4 2001/04/05 11:01:57 paf Exp $
 */
 
 #include "pa_config_includes.h"
 #include "ltdl.h"
 #include "pa_sql_driver_manager.h"
+#include "pa_sql_connection.h"
 #include "pa_exception.h"
 #include "pa_common.h"
 
@@ -23,6 +24,31 @@ SQL_Driver_manager *SQL_driver_manager;
 const int MAX_PROTOCOL=20;
 const char *LIBRARY_CREATE_FUNC_NAME="create";
 
+
+/// Services_for_SQL_driver implementation
+class Services_for_SQL_driver_impl : public Services_for_SQL_driver, public Pooled {
+public:
+	Services_for_SQL_driver_impl(Pool& apool, const String& aurl) : Pooled(apool),
+		furl(aurl) {
+	}
+
+	/// allocates some bytes on pool
+	void *malloc(size_t size) { return Pooled::malloc(size); }
+	/// allocates some bytes clearing them with zeros
+	void *calloc(size_t size) { return Pooled::calloc(size); }
+	/// throw exception
+	void _throw(const char *comment) { 
+		THROW(0, 0, 
+			&furl, 
+			comment); 
+	}
+
+private:
+	const String& furl;
+};
+
+// SQL_Driver_manager
+
 // url:
 //   protocol://user:pass@host:port/database
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ this is driver-dependent
@@ -66,17 +92,17 @@ SQL_Connection& SQL_Driver_manager::get_
 		// no cached
 		const String *library=0;
 		if(protocol2library->locate(0, protocol)) {
-			if(!(library=protocol2library->item(1)))
+			if(!(library=protocol2library->item(1)) || library->size()==0)
 				PTHROW(0, 0,
 					protocol2library->origin_string(),
 					"library column for protocol '%s' is empty", protocol_cstr);
 		} else
 			PTHROW(0, 0,
-				protocol2library->origin_string(),
-				"protocol '%s' not found", protocol_cstr);
+				&url,
+				"undefined protocol '%s'", protocol_cstr);
 
 		const char *filename=library->cstr(String::UL_FILE_NAME);
-        lt_dlhandle handle = lt_dlopen(filename);
+        lt_dlhandle handle=lt_dlopen(filename);
         if (!handle)
 			PTHROW(0, 0,
 				library,
@@ -89,37 +115,37 @@ SQL_Connection& SQL_Driver_manager::get_
 				library,
 				"function '%s' was not found", LIBRARY_CREATE_FUNC_NAME);
 
-		// create library-driver
+		// create library-driver!
 		driver=(*create)();
 
 		// validate driver api version
 		int driver_api_version=driver->api_version();
-		if(driver_api_version < SQL_API_VERSION)
+		if(driver_api_version<SQL_DRIVER_API_VERSION)
 			PTHROW(0, 0,
 				library,
 				"driver API version is 0x%04X while current minimum is 0x%04X",
-					driver_api_version, SQL_API_VERSION);
+					driver_api_version, SQL_DRIVER_API_VERSION);
 
 		// cache it
 		put_driver_to_cache(protocol, *driver);
 	}
 	
-	void *info;
-	char *error;
-	if(!driver->connect(url_cstr, &info, &error))
-		PTHROW(0, 0,
-			&url,
-			"can not connect - %s", error);
-
-	return *new(this->pool()) SQL_Connection(url.pool(), //< associate with request
-		*driver, info, url);
+	// services associated with request
+	Services_for_SQL_driver_impl& services=
+		*new(pool) Services_for_SQL_driver_impl(pool, url);
+
+	// allocate in global pool 
+	// associate with services[request], deassociates at close
+	SQL_Connection& result=
+		*new(this->pool()) SQL_Connection(this->pool(), url, *driver, services, url_cstr);
+	
+	return result;
 }
 
 void SQL_Driver_manager::close_connection(const String& url, 
 										  SQL_Connection& connection) {
 	SYNCHRONIZED(true);
 
-	connection.set_pool(0); // deassociate from request
 	put_connection_to_cache(url, connection);
 }
 
@@ -148,6 +174,7 @@ SQL_Connection *SQL_Driver_manager::get_
 	return 0;
 }
 
+/// @todo cache expiration[use SQL_Driver::disconnect], pinging. 
 void SQL_Driver_manager::put_connection_to_cache(const String& url, 
 												 SQL_Connection& connection) { 
 	Stack *connections;