--- parser3/src/include/pa_request.h	2001/12/07 15:24:47	1.112
+++ parser3/src/include/pa_request.h	2002/01/16 10:28:34	1.117
@@ -4,13 +4,12 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_request.h,v 1.112 2001/12/07 15:24:47 paf Exp $
+	$Id: pa_request.h,v 1.117 2002/01/16 10:28:34 paf Exp $
 */
 
 #ifndef PA_REQUEST_H
 #define PA_REQUEST_H
 
-#include "pa_config_includes.h"
 #include "pa_pool.h"
 #include "pa_hash.h"
 #include "pa_wcontext.h"
@@ -50,10 +49,12 @@
 
 class Temp_lang;
 class Methoded;
+class VMethodFrame;
 
 /// Main workhorse.
 class Request : public Pooled {
 	friend class Temp_lang;
+	friend class Temp_connection;
 public:
 
 #ifdef RESOURCES_DEBUG
@@ -158,8 +159,15 @@ public:
 	/// returns the mime type of 'user_file_name_cstr'
 	const String& mime_type_of(const char *user_file_name_cstr);
 
-	/// PCRE character tables
-	const unsigned char *pcre_tables();
+	/// returns current SQL connection if any
+	SQL_Connection *connection(const String *source) { 
+		if(!fconnection && source)
+			throw Exception(0, 0,
+				source,
+				"outside of 'connect' operator");
+
+		return fconnection; 
+	}
 
 public:
 	
@@ -193,9 +201,6 @@ public:
 	/// 'MAIN' class conglomerat
 	VStateless_class *main_class;
 
-	/// connection
-	SQL_Connection *connection;
-
 	/// classes configured data
 	Hash classes_conf;
 
@@ -215,9 +220,6 @@ private: // core data
 	*/
 	uint anti_endless_execute_recoursion;
 
-	/// charset->pcre_tables
-	Hash CTYPE;	
-
 	/// stack trace
 	Stack trace;
 
@@ -227,19 +229,16 @@ private: // compile.C
 
 private: // execute.C
 
-	const String *execute_method(Value& aself, 
-		const Method& method, bool return_cstr=true);
-	const String *execute_virtual_method(Value& aself, 
-		const String& method_name, bool return_cstr=true);
+	const String *execute_method(Value& aself, const Method& method,
+		bool return_cstr);
+	const String& execute_method(VMethodFrame& amethodFrame, const Method& method);
+	const String *execute_virtual_method(Value& aself, const String& method_name);
 	const String *execute_nonvirtual_method(VStateless_class& aclass, 
-		const String& method_name, bool return_cstr=true);
+		const String& method_name,
+		bool return_cstr);
 
 	Value *get_element();
 
-private: // lang&raw 
-	
-	uchar flang;
-
 private: // defaults
 
 	const uchar fdefault_lang;
@@ -261,6 +260,28 @@ private: // lang manipulation
 		flang=alang;
 	}
 
+private: // lang&raw 
+	
+	uchar flang;
+
+
+private: // connection manipulation
+
+	SQL_Connection *set_connection(SQL_Connection *aconnection) {
+		SQL_Connection *result=fconnection;
+		fconnection=aconnection;
+		return result;
+	}
+	void restore_connection(SQL_Connection *aconnection) {
+		fconnection=aconnection;
+	}
+
+private:
+
+	/// connection
+	SQL_Connection *fconnection;
+
+
 private:
 
 	void output_result(const VFile& body_file, bool header_only);
@@ -280,6 +301,20 @@ public:
 	}
 };
 
+///	Auto-object used for temporary changing Request::fconnection.
+class Temp_connection {
+	Request& frequest;
+	SQL_Connection *saved_connection;
+public:
+	Temp_connection(Request& arequest, SQL_Connection *aconnection) : 
+		frequest(arequest),
+		saved_connection(arequest.set_connection(aconnection)) {
+	}
+	~Temp_connection() { 
+		frequest.restore_connection(saved_connection); 
+	}
+};
+
 /**
 	@b method parameters passed in this array.
 	contains handy typecast ad junction/not junction ensurers