--- parser3/src/include/pa_sql_driver_manager.h 2004/02/11 15:33:14 1.32 +++ parser3/src/include/pa_sql_driver_manager.h 2026/04/25 13:38:46 1.44 @@ -2,14 +2,14 @@ Parser: sql driver manager decl. global sql driver manager, must be thread-safe - Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexandr Petrosian (http://paf.design.ru) + Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com) + Authors: Konstantin Morshnev , Alexandr Petrosian */ #ifndef PA_SQL_DRIVER_MANAGER_H #define PA_SQL_DRIVER_MANAGER_H -static const char * const IDENT_SQL_DRIVER_MANAGER_H="$Date: 2004/02/11 15:33:14 $"; +#define IDENT_PA_SQL_DRIVER_MANAGER_H "$Id: pa_sql_driver_manager.h,v 1.44 2026/04/25 13:38:46 moko Exp $" #include "pa_sql_driver.h" @@ -32,15 +32,14 @@ class SQL_Connection; class SQL_Driver_manager: public Cache_manager { public: - typedef Hash driver_cache_type; + typedef HashString driver_cache_type; typedef Stack connection_cache_element_base_type; - typedef Hash connection_cache_type; + typedef HashString connection_cache_type; private: friend class SQL_Connection; - bool is_dlinited; driver_cache_type driver_cache; connection_cache_type connection_cache; @@ -54,9 +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); + SQL_Connection* get_connection(const String& aurl, Table *protocol2driver_and_client, const char* arequest_charset, const char* adocument_root); private: // driver cache @@ -66,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