--- parser3/src/include/pa_sql_driver_manager.h 2003/01/28 09:48:16 1.26.2.4 +++ parser3/src/include/pa_sql_driver_manager.h 2003/01/31 12:34:31 1.26.2.7 @@ -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-2003 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* IDENT_SQL_DRIVER_MANAGER_H="$Date: 2003/01/28 09:48:16 $"; +static const char* IDENT_SQL_DRIVER_MANAGER_H="$Date: 2003/01/31 12:34:31 $"; #include "pa_pool.h" #include "pa_sql_driver.h" @@ -26,17 +26,16 @@ static const char* IDENT_SQL_DRIVER_MANA // forwards -class SQL_Connection; -DECLARE_OBJECT_PTR (SQL_Connection) +class SQL_Connection; DECLARE_OBJECT_PTR (SQL_Connection); /// sql driver manager class SQL_Driver_manager: public Cache_manager { friend class SQL_Connection; Pool driver_cache_pool; - typedef Hash driver_cache_type; + typedef Hash driver_cache_type; driver_cache_type driver_cache; - typedef Hash > > connection_cache_type; + typedef Hash > > connection_cache_type; connection_cache_type connection_cache; public: @@ -49,7 +48,7 @@ public: using driver dynamic library found in table, if not loaded yet checks driver version */ - SQL_ConnectionPtr get_connection(Pool& pool, ConstStringPtr arequest_url, ConstStringPtr aorigin, + SQL_ConnectionPtr get_connection(Pool& pool, StringPtr arequest_url, StringPtr aorigin, Table *protocol2driver_and_client); private: // driver cache @@ -73,7 +72,7 @@ private: // for SQL_Connection public: // Cache_manager - override ValuePtr get_status(Pool& pool, ConstStringPtr source); + override ValuePtr get_status(Pool& pool, StringPtr source); override void maybe_expire_cache(); };