--- parser3/src/include/pa_sql_driver_manager.h 2009/05/14 11:27:23 1.35 +++ parser3/src/include/pa_sql_driver_manager.h 2020/12/11 11:52:21 1.40 @@ -2,14 +2,14 @@ Parser: sql driver manager decl. global sql driver manager, must be thread-safe - Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ #ifndef PA_SQL_DRIVER_MANAGER_H #define PA_SQL_DRIVER_MANAGER_H -static const char * const IDENT_SQL_DRIVER_MANAGER_H="$Date: 2009/05/14 11:27:23 $"; +#define IDENT_PA_SQL_DRIVER_MANAGER_H "$Id: pa_sql_driver_manager.h,v 1.40 2020/12/11 11:52:21 moko Exp $" #include "pa_sql_driver.h" @@ -40,7 +40,6 @@ private: friend class SQL_Connection; - bool is_dlinited; driver_cache_type driver_cache; connection_cache_type connection_cache; @@ -54,10 +53,7 @@ public: using driver dynamic library found in table, if not loaded yet checks driver version */ - SQL_Connection* get_connection(const String& aurl, - Table *protocol2driver_and_client, - const char* arequest_charset, - const char* adocument_root); + SQL_Connection* get_connection(const String& aurl, Table *protocol2driver_and_client, const char* arequest_charset, const char* adocument_root); private: // driver cache @@ -67,16 +63,14 @@ private: // driver cache private: // connection cache SQL_Connection* get_connection_from_cache(connection_cache_type::key_type url); - void put_connection_to_cache(connection_cache_type::key_type url, - SQL_Connection* connection); + void put_connection_to_cache(connection_cache_type::key_type url, SQL_Connection* connection); private: time_t prev_expiration_pass_time; private: // for SQL_Connection /// caches connection - void close_connection(connection_cache_type::key_type url, - SQL_Connection* connection); + void close_connection(connection_cache_type::key_type url, SQL_Connection* connection); public: // Cache_manager