--- parser3/src/include/pa_sql_connection.h	2005/08/09 08:14:50	1.40
+++ 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-2005 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: 2005/08/09 08:14:50 $";
+#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"
@@ -35,8 +35,9 @@ class SQL_Driver_services_impl: public S
 	const String* furl;
 	Exception fexception;
 	const char* frequest_charset;
+	const char* fdocument_root;
 public:
-	SQL_Driver_services_impl(const char* arequest_charset): furl(0), frequest_charset(arequest_charset) {}
+	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;
 
@@ -45,6 +46,8 @@ public:
 	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,
@@ -61,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
@@ -69,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;
@@ -94,10 +96,10 @@ class SQL_Connection: public PA_Object {
 
 public:
 
-	SQL_Connection(const String& aurl, SQL_Driver& adriver, const char* arequest_charset):
+	SQL_Connection(const String& aurl, SQL_Driver& adriver, const char* arequest_charset, const char* adocument_root):
 		furl(aurl),
 		fdriver(adriver),
-		fservices(arequest_charset),
+		fservices(arequest_charset, adocument_root),
 		fconnection(0),
 		time_used(0) {
 	}
@@ -130,11 +132,13 @@ public:
 		SQL_CONNECTION_SERVICED_FUNC_GUARDED(
 			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(fconnection, str, length)
 		);
+		return NULL; // never reached, warning war
 	}
 
 	void query(
@@ -145,18 +149,12 @@ public:
 		const String& source) {
 		try {
 			SQL_CONNECTION_SERVICED_FUNC_GUARDED(
-				fdriver.query(fconnection, 
-					statement, 
-					placeholders_count, placeholders,
-					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;
 		}