--- parser3/src/include/pa_sql_connection.h	2001/10/29 17:34:24	1.16
+++ parser3/src/include/pa_sql_connection.h	2003/01/27 16:19:11	1.30.2.2
@@ -1,16 +1,15 @@
 /** @file
 	Parser: sql fconnection decl.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: pa_sql_connection.h,v 1.16 2001/10/29 17:34:24 paf Exp $
+	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
 #ifndef PA_SQL_CONNECTION_H
 #define PA_SQL_CONNECTION_H
 
-#include "pa_config_includes.h"
+static const char* IDENT_SQL_CONNECTION_H="$Date: 2003/01/27 16:19:11 $";
+
 #include "pa_pool.h"
 #include "pa_sql_driver.h"
 #include "pa_sql_driver_manager.h"
@@ -18,65 +17,56 @@
 // defines
 
 /// @see SQL_Driver_services_impl::_throw
-#define SQL_CONNECTION_FUNC_GUARDED(actions) \
-	if(!fservices || !setjmp(fservices->mark)) { \
-		actions; \
-	} else \
-		fservices->propagate_exception();
+#ifdef PA_WITH_SJLJ_EXCEPTIONS
+	#define SQL_CONNECTION_SERVICED_FUNC_GUARDED(actions) actions
+#else
+	#define SQL_CONNECTION_SERVICED_FUNC_GUARDED(actions) \
+		if(!fservices || !setjmp(fservices->mark)) { \
+			actions; \
+		} else \
+			fservices->propagate_exception();
+#endif
 
 /// SQL connection. handy wrapper around low level SQL_Driver
-class SQL_Connection : public Pooled {
+class SQL_Connection: public PA_Object {
 
 public:
 
-	SQL_Connection(Pool& pool, const String& aurl, SQL_Driver& adriver) : Pooled(pool),
+	SQL_Connection(ConstStringPtr aurl, SQL_Driver& adriver):
 		furl(aurl),
 		fdriver(adriver),
 		fconnection(0),
-		time_stamp(0) {
+		time_used(0), 
+		marked_to_rollback(false) {
 	}
 	
-	const String& url() { return furl; }
+	ConstStringPtr get_url() { return furl; }
 
 	void set_services(SQL_Driver_services *aservices) {
-		time_stamp=time(0); // they started to use at this time
 		fservices=aservices;
 	}
 	bool expired(time_t older_dies) {
-		return time_stamp<older_dies;
-	}
-
-	void close() {
-		SQL_driver_manager->close_connection(furl, *this);
+		return /*!freferences && */time_used<older_dies;
 	}
+	time_t get_time_used() { return time_used; }
 
 	bool connected() { return fconnection!=0; }
 	void connect(char *used_only_in_connect_url_cstr) { 
-		SQL_CONNECTION_FUNC_GUARDED(
+		SQL_CONNECTION_SERVICED_FUNC_GUARDED(
 			fdriver.connect(used_only_in_connect_url_cstr, *fservices, &fconnection)
 		);
 	}
 	void disconnect() { 
 		fdriver.disconnect(fconnection); fconnection=0; 
 	}
-	void commit() { 
-		SQL_CONNECTION_FUNC_GUARDED(
-			fdriver.commit(*fservices, fconnection) 
-		);
-	}
-	void rollback() { 
-		SQL_CONNECTION_FUNC_GUARDED(
-			fdriver.rollback(*fservices, fconnection)
-		);
-	}
 	bool ping() { 
-		SQL_CONNECTION_FUNC_GUARDED(
+		SQL_CONNECTION_SERVICED_FUNC_GUARDED(
 			return fdriver.ping(*fservices, fconnection)
 		);
 		return 0; // never reached
 	}
 	uint quote(char *to, const char *from, unsigned int length) {
-		SQL_CONNECTION_FUNC_GUARDED(
+		SQL_CONNECTION_SERVICED_FUNC_GUARDED(
 			return fdriver.quote(*fservices, fconnection, to, from, length)
 		);
 		return 0; // never reached
@@ -84,22 +74,61 @@ public:
 
 	void query(
 		const char *statement, unsigned long offset, unsigned long limit,
-		SQL_Driver_query_event_handlers& handlers) { 
-		SQL_CONNECTION_FUNC_GUARDED(
-			fdriver.query(*fservices, fconnection, 
-				statement, offset, limit, 
-				handlers)
+		SQL_Driver_query_event_handlers& handlers, 
+		ConstStringPtr source) {
+		try {
+			SQL_CONNECTION_SERVICED_FUNC_GUARDED(
+				fdriver.query(*fservices, fconnection, 
+					statement, offset, limit, 
+					handlers)
+			);	
+		} catch(const Exception& e) { // query problem
+			if(strcmp(e.type(), "sql.connect")==0) { // if it is _throw exception, 
+				// give more specific source [were url]
+				throw Exception("sql.execute",
+					source, 
+					"%s", e.comment());
+			} else
+				/*re*/throw;
+		}
+	}
+
+	void mark_to_rollback() {
+		marked_to_rollback=true;
+	}
+
+private: // closing process
+
+	void commit() { 
+		SQL_CONNECTION_SERVICED_FUNC_GUARDED(
+			fdriver.commit(*fservices, fconnection) 
+		);
+	}
+	void rollback() { 
+		SQL_CONNECTION_SERVICED_FUNC_GUARDED(
+			fdriver.rollback(*fservices, fconnection)
 		);
 	}
 
+	/// return to cache
+	void close() {
+		if(marked_to_rollback) {
+			rollback();
+			marked_to_rollback=false;
+		} else
+			commit();
+
+		SQL_driver_manager.close_connection(furl, *this);
+	}
 
 private:
 
-	const String& furl;
+	ConstStringPtr  furl;
 	SQL_Driver& fdriver;
 	SQL_Driver_services *fservices;
 	void *fconnection;
-	time_t time_stamp;
+	time_t time_used;
+	bool marked_to_rollback;
 };
 
 #endif