--- parser3/src/sql/pa_sql_driver.h	2001/05/17 13:23:28	1.10
+++ parser3/src/sql/pa_sql_driver.h	2002/08/01 11:41:20	1.28
@@ -1,11 +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.10 2001/05/17 13:23:28 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:
@@ -29,6 +26,8 @@
 #ifndef PA_SQL_DRIVER_H
 #define PA_SQL_DRIVER_H
 
+static const char* IDENT_SQL_DRIVER_H="$Date: 2002/08/01 11:41:20 $";
+
 #include <sys/types.h>
 
 /// service functions for SQL driver to use
@@ -38,29 +37,36 @@ public:
 	virtual void *malloc(size_t size) =0;
 	/// allocates some bytes clearing them with zeros
 	virtual void *calloc(size_t size) =0;
-	/// throw exception
+	/// prepare throw exception
 	virtual void _throw(const char *comment) =0;
+	/// throw C++ exception from prepared
+	virtual void propagate_exception() =0;
+public:
+	/// regretrully public, because can't make stack frames: "nowhere to return to"
+	jmp_buf mark;
 };
 
-#define SQL_DRIVER_API_VERSION 0x0301
+#define SQL_DRIVER_API_VERSION 0x0003
+#define SQL_DRIVER_CREATE create /* used in driver implementation */
+#define SQL_DRIVER_CREATE_NAME "create" /* could not figure out how to # it :( */
 
-/// SQL driver API
-class SQL_Driver {
+/// events, occuring when SQL_Driver::query()-ing
+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;
+};
 
-	/// row cell & column title  storage
-	struct Cell {
-		void *ptr;
-		size_t size;
-	};
-
+/// SQL driver API
+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
@@ -70,8 +76,7 @@ public:
 	*/
 	virtual void connect(char *used_only_in_connect_url_cstr, 
 		SQL_Driver_services& services, void **connection) =0;
-	virtual void disconnect(
-		SQL_Driver_services& services, void *connection) =0;
+	virtual void disconnect(void *connection) =0;
 	virtual void commit(
 		SQL_Driver_services& services, void *connection) =0;
 	virtual void rollback(
@@ -86,11 +91,7 @@ public:
 	virtual void query(
 		SQL_Driver_services& services, void *connection,
 		const char *statement, unsigned long offset, unsigned long limit,
-		unsigned int *column_count, Cell **columns,
-		unsigned long *row_count, Cell ***rows) =0;
-	/// log error message
-	//static void log(Pool& pool, const char *fmt, ...);
-
+		SQL_Driver_query_event_handlers& handlers) =0;
 };
 
 typedef SQL_Driver *(*SQL_Driver_create_func)();