--- parser3/src/main/pa_sql_driver_manager.C	2001/04/05 08:09:24	1.3
+++ parser3/src/main/pa_sql_driver_manager.C	2001/04/26 10:16:07	1.9
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_sql_driver_manager.C,v 1.3 2001/04/05 08:09:24 paf Exp $
+	$Id: pa_sql_driver_manager.C,v 1.9 2001/04/26 10:16:07 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -25,10 +25,10 @@ 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 {
+/// SQL_Driver_services Pooled implementation
+class SQL_Driver_services_impl : public SQL_Driver_services, public Pooled {
 public:
-	Services_for_SQL_driver_impl(Pool& apool, const String& aurl) : Pooled(apool),
+	SQL_Driver_services_impl(Pool& apool, const String& aurl) : Pooled(apool),
 		furl(aurl) {
 	}
 
@@ -52,32 +52,37 @@ private:
 // url:
 //   protocol://user:pass@host:port/database
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ this is driver-dependent
-SQL_Connection& SQL_Driver_manager::get_connection(const String& url, 
-												   Table *protocol2library) {
+SQL_Connection& SQL_Driver_manager::get_connection(const String& request_owned_url, 
+												   Table *protocol2driver_and_client) {
 	SYNCHRONIZED(true);
 
-	Pool& pool=url.pool(); // request pool											   
+	Pool& pool=request_owned_url.pool(); // request pool											   
 
 	// we have table for locating protocol's library
-	if(!protocol2library)
+	if(!protocol2driver_and_client)
 		PTHROW(0, 0,
-			&url,
-			"SQL:drivers table must be defined");
+			&request_owned_url,
+			"$SQL:drivers table must be defined");
 
 	// first trying to get cached connection
-	if(SQL_Connection *result=get_connection_from_cache(url))
-		return *result;
+	if(SQL_Connection *result=get_connection_from_cache(request_owned_url))
+		if(result->ping())
+			return *result;
+		else
+			result->disconnect(); // kill unpingabe=dead connection
 	// no cached connection
 
-	int pos=url.pos("://", 3);
+	int pos=request_owned_url.pos("://", 3);
 	if(pos<0)
 		PTHROW(0, 0,
-			&url,
+			&request_owned_url,
 			"no protocol specified"); // NOTE: not THROW, but PTHROW
 
-	// make url string on global pool
+	// make url C-string on global pool
 	char *url_cstr=(char *)malloc(MAX_STRING);
-	strncpy(url_cstr, url.cstr(String::UL_AS_IS), MAX_STRING);
+	strncpy(url_cstr, request_owned_url.cstr(String::UL_AS_IS), MAX_STRING);
+	// make url string on global pool
+	String& url=*new(this->pool()) String(this->pool(), url_cstr);
 	
 	char *protocol_cstr=lsplit(&url_cstr, ':');
 	String& protocol=*new(this->pool()) String(this->pool(), protocol_cstr);
@@ -87,15 +92,20 @@ SQL_Connection& SQL_Driver_manager::get_
 		url_cstr++;
 
 	SQL_Driver *driver;
+	const String *dlopen_file_spec=0;
 	// first trying to get cached driver
 	if(!(driver=get_driver_from_cache(protocol))) {
 		// no cached
 		const String *library=0;
-		if(protocol2library->locate(0, protocol)) {
-			if(!(library=protocol2library->item(1)) || library->size()==0)
+		if(protocol2driver_and_client->locate(0, protocol)) {
+			if(!(library=protocol2driver_and_client->item(1)) || library->size()==0)
+				PTHROW(0, 0,
+					protocol2driver_and_client->origin_string(),
+					"driver library column for protocol '%s' is empty", protocol_cstr);
+			if(!(dlopen_file_spec=protocol2driver_and_client->item(2)) || dlopen_file_spec->size()==0)
 				PTHROW(0, 0,
-					protocol2library->origin_string(),
-					"library column for protocol '%s' is empty", protocol_cstr);
+					protocol2driver_and_client->origin_string(),
+					"client library column for protocol '%s' is empty", protocol_cstr);
 		} else
 			PTHROW(0, 0,
 				&url,
@@ -120,23 +130,34 @@ SQL_Connection& SQL_Driver_manager::get_
 
 		// validate driver api version
 		int driver_api_version=driver->api_version();
-		if(driver_api_version<SQL_DRIVER_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 implements API version 0x%04X not equal to 0x%04X",
 					driver_api_version, SQL_DRIVER_API_VERSION);
 
+		// initialise by connecting to sql client dynamic link library
+		const char *dlopen_file_spec_cstr=dlopen_file_spec->cstr(String::UL_FILE_NAME);
+		if(const char *error=driver->initialize(
+			dlopen_file_spec_cstr))
+			PTHROW(0, 0,
+				library,
+				"driver failed to initialize client library '%s', %s",
+					dlopen_file_spec_cstr, error);
+
 		// cache it
 		put_driver_to_cache(protocol, *driver);
 	}
 	
-	// associate with request
-	Services_for_SQL_driver_impl& services=
-		*new(pool) Services_for_SQL_driver_impl(pool, url);
+	// services associated with request
+	SQL_Driver_services_impl& services=
+		*new(pool) SQL_Driver_services_impl(pool, url);
 
-	// allocate in global pool. associate with services[request]
+	// 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);
+		*new(this->pool()) SQL_Connection(this->pool(), 
+		url, *driver, services, url_cstr);
 	
 	return result;
 }