--- parser3/src/main/pa_sql_driver_manager.C	2002/08/01 11:26:51	1.63
+++ parser3/src/main/pa_sql_driver_manager.C	2003/04/11 15:00:05	1.70
@@ -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="$Id: pa_sql_driver_manager.C,v 1.63 2002/08/01 11:26:51 paf Exp $";
+static const char* IDENT_SQL_DRIVER_MANAGER_C="$Date: 2003/04/11 15:00:05 $";
 
 #include "pa_sql_driver_manager.h"
 #include "ltdl.h"
@@ -50,25 +50,41 @@ 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_Error& aexception) { 
+		// converting SQL_exception to parser Exception
 		// hiding passwords and addresses from accidental show [imagine user forgot @exception]
-		e=Exception("sql.connect", 
-			&url_without_login(pool(), furl),
-			comment); 
+#ifdef PA_WITH_SJLJ_EXCEPTIONS
+		throw
+#else
+		fexception=
+#endif
+			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);
+#endif
 	}
 	virtual void propagate_exception() {
-		throw e;
+#ifndef PA_WITH_SJLJ_EXCEPTIONS
+		throw fexception;
+#endif
 	}
 
 private:
 	const String& furl;
-	Exception e;
+	Exception fexception;
 };
 
 // helpers
@@ -158,7 +174,8 @@ SQL_Connection_ptr SQL_Driver_manager::g
 			// no cached
 			const String *library=0;
 			const String *dlopen_file_spec=0;
-			if(protocol2driver_and_client->locate(0, global_protocol)) {
+			Table::Action_options options;
+			if(protocol2driver_and_client->locate(0, global_protocol, options)) {
 				if(!(library=protocol2driver_and_client->item(1)) || library->size()==0)
 					throw Exception("parser.runtime",
 						protocol2driver_and_client->origin_string(),