--- parser3/src/include/pa_sql_driver_manager.h	2001/11/08 14:47:31	1.18
+++ parser3/src/include/pa_sql_driver_manager.h	2009/05/14 11:27:23	1.35
@@ -2,22 +2,22 @@
 	Parser: sql driver manager decl.
 	global sql driver manager, must be thread-safe
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
-
-	$Id: pa_sql_driver_manager.h,v 1.18 2001/11/08 14:47:31 paf Exp $
+	Copyright (c) 2001-2009 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
 
-#include "pa_config_includes.h"
-#include "pa_pool.h"
+static const char * const IDENT_SQL_DRIVER_MANAGER_H="$Date: 2009/05/14 11:27:23 $";
+
+
 #include "pa_sql_driver.h"
 #include "pa_hash.h"
 #include "pa_table.h"
 #include "pa_string.h"
 #include "pa_cache_managers.h"
+#include "pa_stack.h"
 
 // defines
 
@@ -29,51 +29,63 @@
 class SQL_Connection;
 
 /// sql driver manager
-class SQL_Driver_manager : public Cache_manager {
+class SQL_Driver_manager: public Cache_manager {
+public:
+
+	typedef HashString<SQL_Driver *> driver_cache_type;
+	typedef Stack<SQL_Connection*> connection_cache_element_base_type;
+	typedef HashString<connection_cache_element_base_type*> connection_cache_type;
+
+private:
+	
 	friend class SQL_Connection;
+
+	bool is_dlinited;
+	driver_cache_type driver_cache;
+	connection_cache_type connection_cache;
+
 public:
 
-	SQL_Driver_manager(Pool& apool);
-	~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& get_connection(const String& url, const String& request_origin,
-		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
 
-	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_Connection* get_connection_from_cache(connection_cache_type::key_type url);
+	void put_connection_to_cache(connection_cache_type::key_type url, 
+		SQL_Connection* 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_Connection* connection);
 
 public: // Cache_manager
 
-	virtual Value& get_status(Pool& pool, const String *source);
-	virtual void maybe_expire_cache();
+	override Value* get_status();
+	override void maybe_expire_cache();
 
 };
 
 /// global
-extern SQL_Driver_manager *SQL_driver_manager;
+extern SQL_Driver_manager* SQL_driver_manager;
 
 #endif