--- parser3/src/sql/pa_sql_driver.h	2001/04/17 19:00:46	1.6
+++ parser3/src/sql/pa_sql_driver.h	2001/07/23 13:59:52	1.12
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_sql_driver.h,v 1.6 2001/04/17 19:00:46 paf Exp $
+	$Id: pa_sql_driver.h,v 1.12 2001/07/23 13:59:52 parser Exp $
 
 
 	driver dynamic library must look like this:
@@ -32,7 +32,7 @@
 #include <sys/types.h>
 
 /// service functions for SQL driver to use
-class Services_for_SQL_driver {
+class SQL_Driver_services {
 public:
 	/// allocates some bytes on pool
 	virtual void *malloc(size_t size) =0;
@@ -42,49 +42,52 @@ public:
 	virtual void _throw(const char *comment) =0;
 };
 
-#define SQL_DRIVER_API_VERSION 0x0301
+#define SQL_DRIVER_API_VERSION 0x0303
 
-/// 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;
+};
 
-	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(Services_for_SQL_driver *aservices) { services=aservices; }
-
-	SQL_Driver() :
-		services(0) {
-	}
+	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;
-	/// connect. @returns true+'connection' on success. 'error' on failure
-	virtual void connect(char *url, void **connection) =0;
-	virtual void disconnect(void *connection) =0;
-	virtual void commit(void *connection) =0;
-	virtual void rollback(void *connection) =0;
+	/**	connect to sql database using 
+		@param used_only_to_connect_url 
+			format is driver specific
+			WARNING: must be used only to connect, for buffer doesn't live long enough
+
+		@returns true+'connection' on success. 'error' on failure
+	*/
+	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 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:
-
-	Services_for_SQL_driver *services;
+		SQL_Driver_query_event_handlers& handlers) =0;
 };
 
 typedef SQL_Driver *(*SQL_Driver_create_func)();