--- parser3/src/include/pa_sql_driver_manager.h	2001/09/05 09:02:52	1.8
+++ parser3/src/include/pa_sql_driver_manager.h	2003/01/21 15:51:11	1.26
@@ -1,27 +1,22 @@
 /** @file
 	Parser: sql driver manager decl.
-
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: pa_sql_driver_manager.h,v 1.8 2001/09/05 09:02:52 parser Exp $
-
-
 	global sql driver manager, must be thread-safe
+
+	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
 
-#include "pa_config_includes.h"
+static const char* IDENT_SQL_DRIVER_MANAGER_H="$Date: 2003/01/21 15:51:11 $";
+
 #include "pa_pool.h"
 #include "pa_sql_driver.h"
 #include "pa_hash.h"
-#include "pa_stack.h"
 #include "pa_table.h"
 #include "pa_string.h"
-
+#include "pa_cache_managers.h"
 
 // defines
 
@@ -31,24 +26,23 @@
 // forwards
 
 class SQL_Connection;
+class SQL_Connection_ptr;
 
 /// sql driver manager
-class SQL_Driver_manager : public Pooled {
-	friend SQL_Connection;
+class SQL_Driver_manager : public Cache_manager {
+	friend class SQL_Connection;
 public:
 
-	SQL_Driver_manager(Pool& pool) : Pooled(pool),
-		driver_cache(pool),
-		connection_cache(pool),
-		prev_expiration_pass_time(0) {
-	}
+	SQL_Driver_manager(Pool& apool);
+	virtual ~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, Table *protocol2driver_and_client);
+	SQL_Connection_ptr get_connection(const String& url, const String& request_origin,
+		Table *protocol2driver_and_client);
 
 private: // driver cache
 
@@ -59,7 +53,6 @@ private: // connection cache
 
 	SQL_Connection *get_connection_from_cache(const String& url);
 	void put_connection_to_cache(const String& url, SQL_Connection& connection);
-	void maybe_expire_connection_cache();
 private:
 	time_t prev_expiration_pass_time;
 
@@ -72,6 +65,12 @@ private:
 
 	Hash driver_cache;
 	Hash connection_cache;
+
+public: // Cache_manager
+
+	virtual Value& get_status(Pool& pool, const String *source);
+	virtual void maybe_expire_cache();
+
 };
 
 /// global