--- parser3/src/main/pa_sql_driver_manager.C 2002/09/04 14:59:54 1.65 +++ parser3/src/main/pa_sql_driver_manager.C 2002/12/09 12:19:16 1.68 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (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: 2002/12/09 12:19:16 $"; #include "pa_sql_driver_manager.h" #include "ltdl.h" @@ -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(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