Diff for /parser3/src/main/pa_sql_driver_manager.C between versions 1.90 and 1.93

version 1.90, 2009/07/06 12:07:04 version 1.93, 2015/04/02 22:18:26
Line 1 Line 1
 /** @file  /** @file
         Parser: sql driver manager implementation.          Parser: sql driver manager implementation.
   
         Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)          Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
         Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)          Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */  */
   
 static const char * const IDENT_SQL_DRIVER_MANAGER_C="$Date$";  
   
 #include "pa_sql_driver_manager.h"  #include "pa_sql_driver_manager.h"
 #include "ltdl.h"  #include "ltdl.h"
 #include "pa_threads.h"  #include "pa_threads.h"
Line 17  static const char * const IDENT_SQL_DRIV Line 15  static const char * const IDENT_SQL_DRIV
 #include "pa_vtable.h"  #include "pa_vtable.h"
 #include "pa_charsets.h"  #include "pa_charsets.h"
   
   volatile const char * IDENT_PA_SQL_DRIVER_MANAGER_C="$Id$" IDENT_PA_SQL_DRIVER_MANAGER_H IDENT_PA_SQL_CONNECTION_H;
   
 // globals  // globals
   
 SQL_Driver_manager* SQL_driver_manager=0;  SQL_Driver_manager* SQL_driver_manager=0;
Line 101  static void expire_connections(SQL_Drive Line 101  static void expire_connections(SQL_Drive
   
 // SQL_Driver_manager  // SQL_Driver_manager
   
 SQL_Driver_manager::SQL_Driver_manager():   SQL_Driver_manager::SQL_Driver_manager(): prev_expiration_pass_time(0) {}
         is_dlinited(false), prev_expiration_pass_time(0) {  
 }  
   
 SQL_Driver_manager::~SQL_Driver_manager() {  SQL_Driver_manager::~SQL_Driver_manager() {
         connection_cache.for_each<time_t>(expire_connections, time(0)+(time_t)10/*=in future=expire all*/);          connection_cache.for_each<time_t>(expire_connections, time(0)+(time_t)10/*=in future=expire all*/);
   
         if(is_dlinited)  
                 lt_dlexit();  
 }  }
   
 /// @param aurl protocol://[driver-dependent]  /// @param aurl protocol://[driver-dependent]
Line 121  SQL_Connection* SQL_Driver_manager::get_ Line 116  SQL_Connection* SQL_Driver_manager::get_
         if(!protocol2driver_and_client)          if(!protocol2driver_and_client)
                 throw Exception(PARSER_RUNTIME,                  throw Exception(PARSER_RUNTIME,
                         &aurl,                          &aurl,
                         "$"MAIN_SQL_NAME":"MAIN_SQL_DRIVERS_NAME" table must be defined");                          "$" MAIN_SQL_NAME ":" MAIN_SQL_DRIVERS_NAME " table must be defined");
   
         // first trying to get cached connection          // first trying to get cached connection
         SQL_Connection* connection=get_connection_from_cache(aurl);          SQL_Connection* connection=get_connection_from_cache(aurl);
Line 170  SQL_Connection* SQL_Driver_manager::get_ Line 165  SQL_Connection* SQL_Driver_manager::get_
                                         "undefined protocol '%s'",                                           "undefined protocol '%s'", 
                                                 protocol_cstr);                                                  protocol_cstr);
   
                         if(!is_dlinited) {                          pa_dlinit();
                                 if(lt_dlinit())  
                                         throw Exception(0,  
                                                 library,  
                                                 "prepare to dynamic loading failed, %s", lt_dlerror());  
   
                                 is_dlinited=true;  
                         }  
   
                         const char* filename=library->taint_cstr(String::L_FILE_SPEC);                          const char* filename=library->taint_cstr(String::L_FILE_SPEC);
                         lt_dlhandle handle=lt_dlopen(filename);                          lt_dlhandle handle=lt_dlopen(filename);
Line 193  SQL_Connection* SQL_Driver_manager::get_ Line 181  SQL_Connection* SQL_Driver_manager::get_
                         if(!create)                          if(!create)
                                 throw Exception(0,                                  throw Exception(0,
                                         library,                                          library,
                                         "function '"SQL_DRIVER_CREATE_NAME"' was not found");                                          "function '" SQL_DRIVER_CREATE_NAME "' was not found");
   
                         // create library-driver!                          // create library-driver!
                         driver=(*create)();                          driver=(*create)();

Removed from v.1.90  
changed lines
  Added in v.1.93


E-mail: