--- 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	2013/07/05 21:09:57	1.37
@@ -2,16 +2,16 @@
 	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-2012 Art. Lebedev Studio (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: 2003/01/28 09:48:16 $";
+#define IDENT_PA_SQL_DRIVER_MANAGER_H "$Id: pa_sql_driver_manager.h,v 1.37 2013/07/05 21:09:57 moko Exp $"
+
 
-#include "pa_pool.h"
 #include "pa_sql_driver.h"
 #include "pa_hash.h"
 #include "pa_table.h"
@@ -27,16 +27,20 @@ static const char* IDENT_SQL_DRIVER_MANA
 // forwards
 
 class SQL_Connection;
-DECLARE_OBJECT_PTR (SQL_Connection)
 
 /// sql driver 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;
 
-	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:
@@ -49,8 +53,10 @@ 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,
-		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
 
@@ -59,9 +65,9 @@ private: // driver cache
 
 private: // connection cache
 
-	SQL_ConnectionPtr get_connection_from_cache(connection_cache_type::key_type url);
+	SQL_Connection* get_connection_from_cache(connection_cache_type::key_type url);
 	void put_connection_to_cache(connection_cache_type::key_type url, 
-		SQL_ConnectionPtr connection);
+		SQL_Connection* connection);
 private:
 	time_t prev_expiration_pass_time;
 
@@ -69,16 +75,16 @@ private: // for SQL_Connection
 
 	/// caches connection
 	void close_connection(connection_cache_type::key_type url, 
-		SQL_ConnectionPtr connection);
+		SQL_Connection* connection);
 
 public: // Cache_manager
 
-	override ValuePtr get_status(Pool& pool, ConstStringPtr source);
+	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