--- parser3/src/sql/pa_sql_driver.h	2002/12/09 11:14:55	1.31
+++ parser3/src/sql/pa_sql_driver.h	2002/12/09 12:19:16	1.32
@@ -26,26 +26,24 @@
 #ifndef PA_SQL_DRIVER_H
 #define PA_SQL_DRIVER_H
 
-static const char* IDENT_SQL_DRIVER_H="$Date: 2002/12/09 11:14:55 $";
+static const char* IDENT_SQL_DRIVER_H="$Date: 2002/12/09 12:19:16 $";
 
 #include <sys/types.h>
 
-#define SQL_DRIVER_API_VERSION 0x0004
+#define SQL_DRIVER_API_VERSION 0x0005
 #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;
-
+class SQL_Error {
 	bool fdefined;
 	const char *ftype;
 	const void *fproblem_source;
 	const char *fcomment;
 public:
-	SQL_Exception():
+	SQL_Error():
 		fdefined(false) {}
-	SQL_Exception(
+	SQL_Error(
 		const char *atype,
 		const void *aproblem_source, 
 		const char *acomment):
@@ -53,19 +51,12 @@ public:
 		ftype(atype),
 		fproblem_source(aproblem_source),
 		fcomment(acomment) {}
-	SQL_Exception(const char *acomment):
+	SQL_Error(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) {}
-*/
-	SQL_Exception& operator =(const SQL_Exception& src) {
+	SQL_Error& operator =(const SQL_Error& src) {
 		fdefined=src.fdefined;
 		ftype=src.ftype;
 		fproblem_source=src.fproblem_source;
@@ -73,10 +64,10 @@ public:
 		return *this;
 	}
 
-	bool defined() { return fdefined; }
-	const char *type() { return ftype; }
-	const void *problem_source() { return fproblem_source; }
-	const char *comment() { return fcomment; }
+	bool defined() const { return fdefined; }
+	const char *type() const { return ftype; }
+	const void *problem_source() const { return fproblem_source; }
+	const char *comment() const { return fcomment; }
 };
 
 /// service functions for SQL driver to use
@@ -87,23 +78,27 @@ public:
 	/// allocates some bytes clearing them with zeros
 	virtual void *calloc(size_t size) =0;
 	/// prepare throw exception
-	virtual void _throw(const SQL_Exception& e) =0;
+	virtual void _throw(const SQL_Error& 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)); }
+	void _throw(const char *comment) { _throw(SQL_Error(0, 0, comment)); }
 public:
 	/// regretrully public, because can't make stack frames: "nowhere to return to"
 	jmp_buf mark;
 };
 
-/// events, occuring when SQL_Driver::query()-ing
+/** events, occuring when SQL_Driver::query()-ing. 
+
+		when OK must return false.
+		must NOT throw exceptions, must store them to error & return true.
+*/
 class SQL_Driver_query_event_handlers {
 public:
-	virtual void add_column(void *ptr, size_t size) =0;
-	virtual void before_rows() =0;
-	virtual void add_row() =0;
-	virtual void add_row_cell(void *ptr, size_t size) =0;
+	virtual bool add_column(SQL_Error& error, void *ptr, size_t size) =0;
+	virtual bool before_rows(SQL_Error& error) =0;
+	virtual bool add_row(SQL_Error& error) =0;
+	virtual bool add_row_cell(SQL_Error& error, void *ptr, size_t size) =0;
 };
 
 /// SQL driver API