--- parser3/src/include/pa_sql_driver_manager.h	2002/08/01 11:41:16	1.25
+++ parser3/src/include/pa_sql_driver_manager.h	2003/01/28 09:48:16	1.26.2.4
@@ -2,14 +2,14 @@
 	Parser: sql driver manager decl.
 	global sql driver manager, must be thread-safe
 
-	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (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: 2002/08/01 11:41:16 $";
+static const char* IDENT_SQL_DRIVER_MANAGER_H="$Date: 2003/01/28 09:48:16 $";
 
 #include "pa_pool.h"
 #include "pa_sql_driver.h"
@@ -17,6 +17,7 @@ static const char* IDENT_SQL_DRIVER_MANA
 #include "pa_table.h"
 #include "pa_string.h"
 #include "pa_cache_managers.h"
+#include "pa_stack.h"
 
 // defines
 
@@ -26,54 +27,58 @@ 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;
+
+	Pool driver_cache_pool;
+	typedef Hash<ConstStringPtr, SQL_Driver *> driver_cache_type;
+	driver_cache_type driver_cache;
+	typedef Hash<ConstStringPtr, object_ptr<Stack<SQL_ConnectionPtr> > > connection_cache_type;
+	connection_cache_type connection_cache;
+
 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(Pool& pool, ConstStringPtr arequest_url, ConstStringPtr aorigin,
 		Table *protocol2driver_and_client);
 
 private: // driver cache
 
-	SQL_Driver *get_driver_from_cache(const String& protocol);
-	void put_driver_to_cache(const String& protocol, SQL_Driver& driver);
+	SQL_Driver *get_driver_from_cache(driver_cache_type::key_type protocol);
+	void put_driver_to_cache(driver_cache_type::key_type protocol, driver_cache_type::value_type driver);
 
 private: // connection cache
 
-	SQL_Connection *get_connection_from_cache(const String& url);
-	void put_connection_to_cache(const String& url, SQL_Connection& connection);
+	SQL_ConnectionPtr get_connection_from_cache(connection_cache_type::key_type url);
+	void put_connection_to_cache(connection_cache_type::key_type url, 
+		SQL_ConnectionPtr connection);
 private:
 	time_t prev_expiration_pass_time;
 
 private: // for SQL_Connection
 
 	/// caches connection
-	void close_connection(const String& url, SQL_Connection& connection);
-
-private:
-
-	Hash driver_cache;
-	Hash connection_cache;
+	void close_connection(connection_cache_type::key_type url, 
+		SQL_ConnectionPtr connection);
 
 public: // Cache_manager
 
-	virtual Value& get_status(Pool& pool, const String *source);
-	virtual void maybe_expire_cache();
+	override ValuePtr get_status(Pool& pool, ConstStringPtr source);
+	override void maybe_expire_cache();
 
 };
 
 /// global
-extern SQL_Driver_manager *SQL_driver_manager;
+extern SQL_Driver_manager SQL_driver_manager;
 
 #endif