--- parser3/src/include/pa_sql_driver_manager.h 2003/11/20 16:34:25 1.29 +++ parser3/src/include/pa_sql_driver_manager.h 2009/05/14 11:27:23 1.35 @@ -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-2009 ArtLebedev Group (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/11/20 16:34:25 $"; +static const char * const IDENT_SQL_DRIVER_MANAGER_H="$Date: 2009/05/14 11:27:23 $"; #include "pa_sql_driver.h" @@ -32,9 +32,9 @@ 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: @@ -54,7 +54,10 @@ 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); + SQL_Connection* get_connection(const String& aurl, + Table *protocol2driver_and_client, + const char* arequest_charset, + const char* adocument_root); private: // driver cache @@ -83,6 +86,6 @@ public: // Cache_manager }; /// global -extern SQL_Driver_manager SQL_driver_manager; +extern SQL_Driver_manager* SQL_driver_manager; #endif