--- parser3/src/main/pa_sql_driver_manager.C	2002/09/04 14:59:54	1.65
+++ parser3/src/main/pa_sql_driver_manager.C	2003/01/27 16:00:42	1.69.2.1
@@ -1,11 +1,11 @@
 /** @file
 	Parser: sql driver manager implementation.
 
-	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_SQL_DRIVER_MANAGER_C="$Date: 2002/09/04 14:59:54 $";
+static const char* IDENT_SQL_DRIVER_MANAGER_C="$Date: 2003/01/27 16:00:42 $";
 
 #include "pa_sql_driver_manager.h"
 #include "ltdl.h"
@@ -19,7 +19,7 @@ static const char* IDENT_SQL_DRIVER_MANA
 
 // globals
 
-SQL_Driver_manager *SQL_driver_manager;
+SQL_Driver_manager SQL_driver_manager;
 
 // consts
 
@@ -59,16 +59,18 @@ public:
 		one can simply 'throw' from dynamic library.
 		[sad story: one can not longjump/throw due to some bug in gcc as of 3.2.1 version]
 	*/
-	virtual void _throw(const char *comment) { 
+	virtual void _throw(const SQL_Error& aexception) { 
+		// converting SQL_exception to parser Exception
 		// hiding passwords and addresses from accidental show [imagine user forgot @exception]
 #ifdef PA_WITH_SJLJ_EXCEPTIONS
 		throw
 #else
-		e=
+		fexception=
 #endif
-			Exception("sql.connect", 
-				&url_without_login(pool(), furl),
-				comment); 
+			Exception(aexception.type(), 
+				aexception.problem_source()?static_cast<const String*>(aexception.problem_source())
+					:&url_without_login(pool(), furl),
+				aexception.comment()); 
 
 #ifndef PA_WITH_SJLJ_EXCEPTIONS
 		longjmp(mark, 1);
@@ -76,13 +78,13 @@ public:
 	}
 	virtual void propagate_exception() {
 #ifndef PA_WITH_SJLJ_EXCEPTIONS
-		throw e;
+		throw fexception;
 #endif
 	}
 
 private:
 	const String& furl;
-	Exception e;
+	Exception fexception;
 };
 
 // helpers
@@ -102,10 +104,8 @@ static void expire_connections(const Has
 
 // SQL_Driver_manager
 
-SQL_Driver_manager::SQL_Driver_manager(Pool& apool) : Cache_manager(apool),
-		driver_cache(apool),
-		connection_cache(apool),
-		prev_expiration_pass_time(0) {
+SQL_Driver_manager::SQL_Driver_manager(): 
+	prev_expiration_pass_time(0) {
 }
 
 SQL_Driver_manager::~SQL_Driver_manager() {
@@ -114,7 +114,7 @@ SQL_Driver_manager::~SQL_Driver_manager(
 }
 
 /// @param request_url protocol://[driver-dependent]
-SQL_Connection_ptr SQL_Driver_manager::get_connection(const String& request_url,
+SQL_ConnectionPtr SQL_Driver_manager::get_connection(const String& request_url,
 												   const String& request_origin,
 												   Table *protocol2driver_and_client) {
 	Pool& pool=request_origin.pool(); // request pool											   
@@ -243,7 +243,7 @@ SQL_Connection_ptr SQL_Driver_manager::g
 	if(!connection->connected())
 		connection->connect(request_url_cstr);
 	// return autoclosing object for it
-	return SQL_Connection_ptr(connection);
+	return SQL_ConnectionPtr(connection);
 }
 
 void SQL_Driver_manager::close_connection(const String& url,