--- parser3/src/sql/pa_sql_driver.h	2001/10/24 14:43:17	1.18
+++ parser3/src/sql/pa_sql_driver.h	2002/12/09 11:11:33	1.30
@@ -1,10 +1,8 @@
 /** @file
 	Parser: sql driver interface.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: pa_sql_driver.h,v 1.18 2001/10/24 14:43:17 parser Exp $
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
 
 	driver dynamic library must look like this:
@@ -28,8 +26,59 @@
 #ifndef PA_SQL_DRIVER_H
 #define PA_SQL_DRIVER_H
 
+static const char* IDENT_SQL_DRIVER_H="$Date: 2002/12/09 11:11:33 $";
+
 #include <sys/types.h>
 
+#define SQL_DRIVER_API_VERSION 0x0004
+#define SQL_DRIVER_CREATE create /* used in driver implementation */
+#define SQL_DRIVER_CREATE_NAME "create" /* could not figure out how to # it :( */
+
+/// fields are freed elsewhere
+class SQL_Exception {
+	friend class SQL_Driver_services_impl;
+
+	bool fdefined;
+	const char *ftype;
+	const void *fproblem_source;
+	const char *fcomment;
+public:
+	SQL_Exception():
+		fdefined(false) {}
+	SQL_Exception(
+		const char *atype,
+		const void *aproblem_source, 
+		const char *acomment):
+		fdefined(true),
+		ftype(atype),
+		fproblem_source(aproblem_source),
+		fcomment(acomment) {}
+	SQL_Exception(const char *acomment):
+		fdefined(true),
+		ftype(0),
+		fproblem_source(0),
+		fcomment(acomment) {}
+/*
+	SQL_Exception(const SQL_Exception& src) : 
+		fdefined(src.fdefined),
+		ftype(src.ftype),
+		fproblem_source(src.fproblem_source),
+		fcomment(src.fcomment) {}
+*/
+	const SQL_Exception& operator =(const SQL_Exception& src) {
+		fdefined=src.fdefined;
+		ftype=src.ftype;
+		fproblem_source=src.fproblem_source;
+		fcomment=src.fcomment;
+		return *this;
+	}
+
+	bool defined() { return fdefined; }
+	const char *type() { return ftype; }
+	const void *problem_source() { return fproblem_source; }
+	const char *comment() { return fcomment; }
+};
+
 /// service functions for SQL driver to use
 class SQL_Driver_services {
 public:
@@ -37,14 +86,17 @@ public:
 	virtual void *malloc(size_t size) =0;
 	/// allocates some bytes clearing them with zeros
 	virtual void *calloc(size_t size) =0;
-	/// throw exception
-	virtual void _throw(const char *comment) =0;
+	/// prepare throw exception
+	virtual void _throw(const SQL_Exception& e) =0;
+	/// throw C++ exception from prepared
+	virtual void propagate_exception() =0;
+	/// helper func
+	void _throw(const char *comment) { _throw(SQL_Exception(0, 0, comment)); }
+public:
+	/// regretrully public, because can't make stack frames: "nowhere to return to"
+	jmp_buf mark;
 };
 
-#define SQL_DRIVER_API_VERSION 0x0305
-#define SQL_DRIVER_CREATE create
-#define SQL_DRIVER_CREATE_NAME "create" /* could not figure out how to # it :( */
-
 /// events, occuring when SQL_Driver::query()-ing
 class SQL_Driver_query_event_handlers {
 public:
@@ -58,11 +110,10 @@ public:
 class SQL_Driver {
 public:
 
-	SQL_Driver() {}
 	/// get api version
 	virtual int api_version() =0;
 	/// initialize driver by loading sql dynamic link library
-	virtual const char *initialize(const char *dlopen_file_spec) =0;
+	virtual const char *initialize(char *dlopen_file_spec) =0;
 	/**	connect to sql database using 
 		@param used_only_to_connect_url 
 			format is driver specific