--- parser3/src/sql/pa_sql_driver.h	2001/05/17 08:42:22	1.9
+++ parser3/src/sql/pa_sql_driver.h	2002/02/08 08:30:17	1.26
@@ -1,11 +1,10 @@
 /** @file
 	Parser: sql driver interface.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: pa_sql_driver.h,v 1.9 2001/05/17 08:42:22 parser Exp $
+	$Id: pa_sql_driver.h,v 1.26 2002/02/08 08:30:17 paf Exp $
 
 
 	driver dynamic library must look like this:
@@ -38,34 +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:
 
-	/// assignes services to driver. you can not use driver until this
-	void set_services(SQL_Driver_services *aservices) { services=aservices; }
-
-	SQL_Driver() :
-		services(0) {
-	}
 	/// 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
@@ -73,25 +74,24 @@ public:
 
 		@returns true+'connection' on success. 'error' on failure
 	*/
-	virtual void connect(char *used_only_to_connect_url, void **connection) =0;
+	virtual void connect(char *used_only_in_connect_url_cstr, 
+		SQL_Driver_services& services, void **connection) =0;
 	virtual void disconnect(void *connection) =0;
-	virtual void commit(void *connection) =0;
-	virtual void rollback(void *connection) =0;
+	virtual void commit(
+		SQL_Driver_services& services, void *connection) =0;
+	virtual void rollback(
+		SQL_Driver_services& services, void *connection) =0;
 	/// @returns true to indicate that connection still alive 
-	virtual bool ping(void *connection) =0;
+	virtual bool ping(
+		SQL_Driver_services& services, void *connection) =0;
 	/// encodes the string in 'from' to an escaped SQL string
-	virtual unsigned int quote(void *connection,
+	virtual unsigned int quote(
+		SQL_Driver_services& services, void *connection,
 		char *to, const char *from, unsigned int length) =0;
-	virtual void query(void *connection,
+	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, ...);
-
-protected:
-
-	SQL_Driver_services *services;
+		SQL_Driver_query_event_handlers& handlers) =0;
 };
 
 typedef SQL_Driver *(*SQL_Driver_create_func)();