--- parser3/src/main/pa_sql_driver_manager.C 2002/12/09 11:14:55 1.67 +++ 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 (http://paf.design.ru) */ -static const char* IDENT_SQL_DRIVER_MANAGER_C="$Date: 2002/12/09 11:14:55 $"; +static const char* IDENT_SQL_DRIVER_MANAGER_C="$Date: 2003/04/11 15:00:05 $"; #include "pa_sql_driver_manager.h" #include "ltdl.h" @@ -59,7 +59,7 @@ 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 SQL_Exception& aexception) { + 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 @@ -67,10 +67,10 @@ public: #else fexception= #endif - Exception(aexception.ftype, - aexception.fproblem_source?static_cast(aexception.fproblem_source) + Exception(aexception.type(), + aexception.problem_source()?static_cast(aexception.problem_source()) :&url_without_login(pool(), furl), - aexception.fcomment); + aexception.comment()); #ifndef PA_WITH_SJLJ_EXCEPTIONS longjmp(mark, 1); @@ -174,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(),