--- parser3/src/include/pa_sql_connection.h	2003/12/10 14:17:45	1.34
+++ parser3/src/include/pa_sql_connection.h	2020/12/15 17:10:32	1.47
@@ -1,14 +1,14 @@
 /** @file
 	Parser: sql fconnection decl.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
 #ifndef PA_SQL_CONNECTION_H
 #define PA_SQL_CONNECTION_H
 
-static const char * const IDENT_SQL_CONNECTION_H="$Date: 2003/12/10 14:17:45 $";
+#define IDENT_PA_SQL_CONNECTION_H "$Id: pa_sql_connection.h,v 1.47 2020/12/15 17:10:32 moko Exp $"
 
 
 #include "pa_sql_driver.h"
@@ -18,9 +18,12 @@ static const char * const IDENT_SQL_CONN
 
 /// @see SQL_Driver_services_impl::_throw
 #ifdef PA_WITH_SJLJ_EXCEPTIONS
-	#define SQL_CONNECTION_SERVICED_FUNC_GUARDED(actions) actions
+	#define SQL_CONNECTION_SERVICED_FUNC_GUARDED(actions) \
+		use(); \
+		actions
 #else
 	#define SQL_CONNECTION_SERVICED_FUNC_GUARDED(actions) \
+		use(); \
 		if(!setjmp(fservices.mark)) { \
 			actions; \
 		} else \
@@ -31,14 +34,25 @@ static const char * const IDENT_SQL_CONN
 class SQL_Driver_services_impl: public SQL_Driver_services {
 	const String* furl;
 	Exception fexception;
+	const char* frequest_charset;
+	const char* fdocument_root;
 public:
-	SQL_Driver_services_impl(): furl(0) {}
+	SQL_Driver_services_impl(const char* arequest_charset, const char* adocument_root): furl(0), frequest_charset(arequest_charset), fdocument_root(adocument_root) {}
 	void set_url(const String& aurl) { furl=&aurl;}
 	const String& url_without_login() const;
 
-	override void *malloc(size_t size) { return pa_malloc(size); }
-	override void *malloc_atomic(size_t size) { return pa_malloc_atomic(size); }
-	override void *realloc(void *ptr, size_t size) { return pa_realloc(ptr, size); }
+	override void* malloc(size_t size) { return pa_malloc(size); }
+	override void* malloc_atomic(size_t size) { return pa_malloc_atomic(size); }
+	override void* realloc(void *ptr, size_t size) { return pa_realloc(ptr, size); }
+
+	override const char* request_charset() { return frequest_charset; }
+	override const char* request_document_root() { return fdocument_root; }
+	
+	override void transcode(const char* src, size_t src_length,
+		const char*& dst, size_t& dst_length,
+		const char* charset_from_name,
+		const char* charset_to_name
+		);
 
 	/**
 		normally we can't 'throw' from dynamic library, so
@@ -50,7 +64,7 @@ public:
 		one can simply 'throw' from dynamic library.
 		[sad story: one can not longjump/throw due to some bug in gcc as of 3.2.1 version]
 	*/
-	override void _throw(const SQL_Error& aexception) { 
+	override void _throw(const SQL_Error& aexception) {
 		// converting SQL_exception to parser Exception
 		// hiding passwords and addresses from accidental show [imagine user forgot @exception]
 #ifdef PA_WITH_SJLJ_EXCEPTIONS
@@ -58,14 +72,13 @@ public:
 #else
 		fexception=
 #endif
-		Exception(aexception.type(), 
-				&url_without_login(),
-				aexception.comment()); 
+		Exception(aexception.type() ? aexception.type() : "sql.connect", &url_without_login(), aexception.comment());
 
 #ifndef PA_WITH_SJLJ_EXCEPTIONS
 		longjmp(mark, 1);
 #endif
 	}
+
 	virtual void propagate_exception() {
 #ifndef PA_WITH_SJLJ_EXCEPTIONS
 		throw fexception;
@@ -80,16 +93,15 @@ class SQL_Connection: public PA_Object {
 	SQL_Driver_services_impl fservices;
 	void *fconnection;
 	time_t time_used;
-	bool marked_to_rollback;
 
 public:
 
-	SQL_Connection(const String& aurl, SQL_Driver& adriver):
+	SQL_Connection(const String& aurl, SQL_Driver& adriver, const char* arequest_charset, const char* adocument_root):
 		furl(aurl),
 		fdriver(adriver),
+		fservices(arequest_charset, adocument_root),
 		fconnection(0),
-		time_used(0), 
-		marked_to_rollback(false) {
+		time_used(0) {
 	}
 
 	SQL_Driver_services_impl& services() { return fservices; }
@@ -103,7 +115,7 @@ public:
 		time_used=time(0); // they started to use at this time
 	}
 	bool expired(time_t older_dies) {
-		return /*!freferences && */time_used<older_dies;
+		return time_used<older_dies;
 	}
 	time_t get_time_used() { return time_used; }
 
@@ -118,32 +130,31 @@ public:
 	}
 	bool ping() { 
 		SQL_CONNECTION_SERVICED_FUNC_GUARDED(
-			return fdriver.ping(fservices, fconnection)
+			return fdriver.ping(fconnection)
 		);
+		return false; // never reached, warning war
 	}
 	const char* quote(const char* str, unsigned int length) {
 		SQL_CONNECTION_SERVICED_FUNC_GUARDED(
-			return fdriver.quote(fservices, fconnection, str, length)
+			return fdriver.quote(fconnection, str, length)
 		);
-//		return 0; // never reached
+		return NULL; // never reached, warning war
 	}
 
 	void query(
-		const char* statement, unsigned long offset, unsigned long limit,
+		const char* statement, 
+		size_t placeholders_count, SQL_Driver::Placeholder* placeholders,
+		unsigned long offset, unsigned long limit,
 		SQL_Driver_query_event_handlers& handlers, 
 		const String& source) {
 		try {
 			SQL_CONNECTION_SERVICED_FUNC_GUARDED(
-				fdriver.query(fservices, fconnection, 
-					statement, offset, limit, 
-					handlers)
-			);	
+				fdriver.query(fconnection, statement, placeholders_count, placeholders, 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());
+				// show query instead of connect string
+				throw Exception("sql.execute", &source, "%s", e.comment());
 			} else
 				rethrow;
 		}
@@ -151,24 +162,18 @@ public:
 
 	void commit() { 
 		SQL_CONNECTION_SERVICED_FUNC_GUARDED(
-			fdriver.commit(fservices, fconnection) 
+			fdriver.commit(fconnection) 
 		);
 	}
 	void rollback() { 
 		SQL_CONNECTION_SERVICED_FUNC_GUARDED(
-			fdriver.rollback(fservices, fconnection)
+			fdriver.rollback(fconnection)
 		);
 	}
 
 	/// return to cache
 	void close() {
-		if(marked_to_rollback) {
-			rollback();
-			marked_to_rollback=false;
-		} else
-			commit();
-
-		SQL_driver_manager.close_connection(furl, this);
+		SQL_driver_manager->close_connection(furl, this);
 	}
 
 };