--- parser3/src/include/pa_sql_driver_manager.h 2003/01/21 15:51:11 1.26 +++ parser3/src/include/pa_sql_driver_manager.h 2003/01/27 16:00:41 1.26.2.1 @@ -9,7 +9,7 @@ #ifndef PA_SQL_DRIVER_MANAGER_H #define PA_SQL_DRIVER_MANAGER_H -static const char* IDENT_SQL_DRIVER_MANAGER_H="$Date: 2003/01/21 15:51:11 $"; +static const char* IDENT_SQL_DRIVER_MANAGER_H="$Date: 2003/01/27 16:00:41 $"; #include "pa_pool.h" #include "pa_sql_driver.h" @@ -26,22 +26,22 @@ static const char* IDENT_SQL_DRIVER_MANA // forwards class SQL_Connection; -class SQL_Connection_ptr; +DECLARE_OBJECT_PTR (SQL_Connection) /// sql driver manager -class SQL_Driver_manager : public Cache_manager { +class SQL_Driver_manager: public Cache_manager { friend class SQL_Connection; public: - SQL_Driver_manager(Pool& apool); - virtual ~SQL_Driver_manager(); + SQL_Driver_manager(); + override ~SQL_Driver_manager(); /** connect to specified url, using driver dynamic library found in table, if not loaded yet checks driver version */ - SQL_Connection_ptr get_connection(const String& url, const String& request_origin, + SQL_ConnectionPtr get_connection(const String& url, const String& request_origin, Table *protocol2driver_and_client); private: // driver cache @@ -63,7 +63,7 @@ private: // for SQL_Connection private: - Hash driver_cache; + Hash driver_cache; Hash connection_cache; public: // Cache_manager @@ -74,6 +74,6 @@ public: // Cache_manager }; /// global -extern SQL_Driver_manager *SQL_driver_manager; +extern SQL_Driver_manager SQL_driver_manager; #endif