--- parser3/src/include/pa_sql_driver_manager.h 2003/12/22 11:44:35 1.31 +++ parser3/src/include/pa_sql_driver_manager.h 2013/07/05 21:09:57 1.37 @@ -2,14 +2,14 @@ Parser: sql driver manager decl. global sql driver manager, must be thread-safe - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2012 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: 2003/12/22 11:44:35 $"; +#define IDENT_PA_SQL_DRIVER_MANAGER_H "$Id: pa_sql_driver_manager.h,v 1.37 2013/07/05 21:09:57 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; @@ -56,7 +55,8 @@ public: */ SQL_Connection* get_connection(const String& aurl, Table *protocol2driver_and_client, - const char* arequest_charset); + const char* arequest_charset, + const char* adocument_root); private: // driver cache