Diff for /parser3/src/main/pa_sql_driver_manager.C between versions 1.2 and 1.5

version 1.2, 2001/04/04 11:47:29 version 1.5, 2001/04/05 11:50:09
Line 24  SQL_Driver_manager *SQL_driver_manager; Line 24  SQL_Driver_manager *SQL_driver_manager;
 const int MAX_PROTOCOL=20;  const int MAX_PROTOCOL=20;
 const char *LIBRARY_CREATE_FUNC_NAME="create";  const char *LIBRARY_CREATE_FUNC_NAME="create";
   
   
   /// Services_for_SQL_driver implementation
   class Services_for_SQL_driver_impl : public Services_for_SQL_driver, public Pooled {
   public:
           Services_for_SQL_driver_impl(Pool& apool, const String& aurl) : Pooled(apool),
                   furl(aurl) {
           }
   
           /// allocates some bytes on pool
           void *malloc(size_t size) { return Pooled::malloc(size); }
           /// allocates some bytes clearing them with zeros
           void *calloc(size_t size) { return Pooled::calloc(size); }
           /// throw exception
           void _throw(const char *comment) { 
                   THROW(0, 0, 
                           &furl, 
                           comment); 
           }
   
   private:
           const String& furl;
   };
   
   // SQL_Driver_manager
   
 // url:  // url:
 //   protocol://user:pass@host:port/database  //   protocol://user:pass@host:port/database
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ this is driver-dependent  //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ this is driver-dependent
Line 41  SQL_Connection& SQL_Driver_manager::get_ Line 66  SQL_Connection& SQL_Driver_manager::get_
   
         // first trying to get cached connection          // first trying to get cached connection
         if(SQL_Connection *result=get_connection_from_cache(url))          if(SQL_Connection *result=get_connection_from_cache(url))
                 return *result;                  if(result->ping())
                           return *result;
                   else
                           result->disconnect(); // kill unpingabe=dead connection
         // no cached connection          // no cached connection
   
         int pos=url.pos("://", 3);          int pos=url.pos("://", 3);
Line 95  SQL_Connection& SQL_Driver_manager::get_ Line 123  SQL_Connection& SQL_Driver_manager::get_
   
                 // validate driver api version                  // validate driver api version
                 int driver_api_version=driver->api_version();                  int driver_api_version=driver->api_version();
                 if(driver_api_version<SQL_API_VERSION)                  if(driver_api_version<SQL_DRIVER_API_VERSION)
                         PTHROW(0, 0,                          PTHROW(0, 0,
                                 library,                                  library,
                                 "driver API version is 0x%04X while current minimum is 0x%04X",                                  "driver API version is 0x%04X while current minimum is 0x%04X",
                                         driver_api_version, SQL_API_VERSION);                                          driver_api_version, SQL_DRIVER_API_VERSION);
   
                 // cache it                  // cache it
                 put_driver_to_cache(protocol, *driver);                  put_driver_to_cache(protocol, *driver);
         }          }
                   
         return *new(this->pool()) SQL_Connection(url.pool(), //< associate with request          // services associated with request
                 *driver, url_cstr, url);          Services_for_SQL_driver_impl& services=
                   *new(pool) Services_for_SQL_driver_impl(pool, url);
   
           // allocate in global pool 
           // associate with services[request], deassociates at close
           SQL_Connection& result=
                   *new(this->pool()) SQL_Connection(this->pool(), url, *driver, services, url_cstr);
           
           return result;
 }  }
   
 void SQL_Driver_manager::close_connection(const String& url,   void SQL_Driver_manager::close_connection(const String& url, 
                                                                                   SQL_Connection& connection) {                                                                                    SQL_Connection& connection) {
         SYNCHRONIZED(true);          SYNCHRONIZED(true);
   
         connection.set_pool(0); // deassociate from request  
         put_connection_to_cache(url, connection);          put_connection_to_cache(url, connection);
 }  }
   

Removed from v.1.2  
changed lines
  Added in v.1.5


E-mail: