--- parser3/src/main/pa_sql_driver_manager.C	2002/02/08 07:27:48	1.60
+++ parser3/src/main/pa_sql_driver_manager.C	2002/12/09 11:07:40	1.66
@@ -2,11 +2,11 @@
 	Parser: sql driver manager implementation.
 
 	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
-
-	$Id: pa_sql_driver_manager.C,v 1.60 2002/02/08 07:27:48 paf Exp $
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
+static const char* IDENT_SQL_DRIVER_MANAGER_C="$Date: 2002/12/09 11:07:40 $";
+
 #include "pa_sql_driver_manager.h"
 #include "ltdl.h"
 #include "pa_sql_connection.h"
@@ -50,20 +50,36 @@ public:
 	virtual void *calloc(size_t size) { return Pooled::calloc(size); }
 
 	/**
+		normally we can't 'throw' from dynamic library, so
 		the idea is to #1 jump to C++ some function to main body, where
 		every function stack frame has exception unwind information
 		and from there... #2 propagate_exception()
+
+        but when parser configured --with-sjlj-exceptions
+		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_Exception& e) { 
+		// converting SQL_exception to parser Exception
 		// hiding passwords and addresses from accidental show [imagine user forgot @exception]
-		e=Exception(0, 0, 
-			&url_without_login(pool(), furl),
-			comment); 
+#ifdef PA_WITH_SJLJ_EXCEPTIONS
+		throw
+#else
+		e=
+#endif
+			Exception(e.ftype, 
+				e.fproblem_source?static_cast<const String*>(e.fproblem_source)
+					:&url_without_login(pool(), furl),
+				e.fcomment); 
 
+#ifndef PA_WITH_SJLJ_EXCEPTIONS
 		longjmp(mark, 1);
+#endif
 	}
 	virtual void propagate_exception() {
+#ifndef PA_WITH_SJLJ_EXCEPTIONS
 		throw e;
+#endif
 	}
 
 private:
@@ -107,7 +123,7 @@ SQL_Connection_ptr SQL_Driver_manager::g
 
 	// we have table for locating protocol's library
 	if(!protocol2driver_and_client)
-		throw Exception(0, 0,
+		throw Exception("parser.runtime",
 			&request_url,
 			"$"MAIN_SQL_NAME":"MAIN_SQL_DRIVERS_NAME" table must be defined");
 
@@ -130,9 +146,9 @@ SQL_Connection_ptr SQL_Driver_manager::g
 	else { // no cached connection or it were unpingabe: connect/reconnect
 		int pos=request_url.pos("://", 3);
 		if(pos<0)
-			throw Exception(0, 0,
+			throw Exception("parser.runtime",
 				request_url.size()?&request_url:&request_origin,
-				"connection string must start with protocol://"); // NOTE: not THROW, but PTHROW
+				"connection string must start with protocol://");
 
 		// make global_url C-string on global pool
 		request_url_cstr=request_url.cstr();
@@ -160,33 +176,33 @@ SQL_Connection_ptr SQL_Driver_manager::g
 			const String *dlopen_file_spec=0;
 			if(protocol2driver_and_client->locate(0, global_protocol)) {
 				if(!(library=protocol2driver_and_client->item(1)) || library->size()==0)
-					throw Exception(0, 0,
+					throw Exception("parser.runtime",
 						protocol2driver_and_client->origin_string(),
 						"driver library column for protocol '%s' is empty", 
 							request_protocol_cstr);
 				dlopen_file_spec=protocol2driver_and_client->item(2);
 			} else
-				throw Exception(0, 0,
+				throw Exception("parser.runtime",
 					&request_url,
 					"undefined protocol '%s'", 
 						request_protocol_cstr);
 
 			if(lt_dlinit())
-				throw Exception(0, 0,
+				throw Exception(0,
 					library,
 					"prepare to dynamic loading failed, %s", lt_dlerror());
 
 			const char *filename=library->cstr(String::UL_FILE_SPEC);
 			lt_dlhandle handle=lt_dlopen(filename);
 			if (!handle)
-				throw Exception(0, 0,
+				throw Exception(0,
 					library,
 					"can not open the module, %s", lt_dlerror());
 
 			SQL_Driver_create_func create=(SQL_Driver_create_func)lt_dlsym(handle, 
 				SQL_DRIVER_CREATE_NAME);
 			if(!create)
-				throw Exception(0, 0,
+				throw Exception(0,
 					library,
 					"function '"SQL_DRIVER_CREATE_NAME"' was not found");
 
@@ -196,7 +212,7 @@ SQL_Connection_ptr SQL_Driver_manager::g
 			// validate driver api version
 			int driver_api_version=driver->api_version();
 			if(driver_api_version!=SQL_DRIVER_API_VERSION)
-				throw Exception(0, 0,
+				throw Exception(0,
 					library,
 					"driver implements API version 0x%04X not equal to 0x%04X",
 						driver_api_version, SQL_DRIVER_API_VERSION);
@@ -207,7 +223,7 @@ SQL_Connection_ptr SQL_Driver_manager::g
 				dlopen_file_spec->cstr(String::UL_AS_IS):0;
 			if(const char *error=driver->initialize(
 				dlopen_file_spec_cstr))
-				throw Exception(0, 0,
+				throw Exception(0,
 					library,
 					"driver failed to initialize client library '%s', %s",
 						dlopen_file_spec_cstr?dlopen_file_spec_cstr:"unspecifed",