--- parser3/src/sql/pa_sql_driver.h	2002/12/09 11:11:33	1.30
+++ parser3/src/sql/pa_sql_driver.h	2003/07/24 11:31:24	1.35
@@ -1,13 +1,13 @@
 /** @file
 	Parser: sql driver interface.
 
-	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
 
 	driver dynamic library must look like this:
 	@code
-		class X_SQL_Driver : public SQL_Driver {
+		class X_SQL_Driver: public SQL_Driver {
 		public:
 
 			X_SQL_Driver() : SQL_driver() {}
@@ -26,94 +26,97 @@
 #ifndef PA_SQL_DRIVER_H
 #define PA_SQL_DRIVER_H
 
-static const char* IDENT_SQL_DRIVER_H="$Date: 2002/12/09 11:11:33 $";
+static const char* IDENT_SQL_DRIVER_H="$Date: 2003/07/24 11:31:24 $";
 
 #include <sys/types.h>
+#include <setjmp.h>
+#include <stdlib.h>
 
-#define SQL_DRIVER_API_VERSION 0x0004
+#define SQL_DRIVER_API_VERSION 0x0007
 #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;
+	const char* ftype;
+	const char* fcomment;
 public:
-	SQL_Exception():
+	SQL_Error():
 		fdefined(false) {}
-	SQL_Exception(
-		const char *atype,
-		const void *aproblem_source, 
-		const char *acomment):
+	SQL_Error(
+		const char* atype,
+		const char* acomment):
 		fdefined(true),
 		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) {}
-*/
-	const 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;
 		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; }
+	bool defined() const { return fdefined; }
+	const char* type() const { return ftype; }
+	const char* comment() const { return fcomment; }
 };
 
 /// service functions for SQL driver to use
 class SQL_Driver_services {
 public:
-	/// allocates some bytes on pool
+	/// allocates some bytes
 	virtual void *malloc(size_t size) =0;
-	/// allocates some bytes clearing them with zeros
-	virtual void *calloc(size_t size) =0;
+	/// allocates some bytes, user promises: no pointers inside
+	virtual void *malloc_atomic(size_t size) =0;
+	/// reallocates bytes 
+	virtual void *realloc(void *ptr, 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("sql.connect", 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, const char* str, size_t length) =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, const char* str, size_t length) =0;
 };
 
 /// SQL driver API
 class SQL_Driver {
 public:
 
+	/** allocated using our allocator,
+		@todo never freed
+	*/
+	static void *operator new(size_t size) { 
+		void *result=::malloc(size);
+		if(!result)
+			abort();
+
+		return result;
+	}
 	/// get api version
 	virtual int api_version() =0;
 	/// initialize driver by loading sql dynamic link library
-	virtual const char *initialize(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
@@ -132,12 +135,12 @@ public:
 	virtual bool ping(
 		SQL_Driver_services& services, void *connection) =0;
 	/// encodes the string in 'from' to an escaped SQL string
-	virtual unsigned int quote(
+	virtual const char* quote(
 		SQL_Driver_services& services, void *connection,
-		char *to, const char *from, unsigned int length) =0;
+		const char* str, unsigned int length) =0;
 	virtual void query(
 		SQL_Driver_services& services, void *connection,
-		const char *statement, unsigned long offset, unsigned long limit,
+		const char* statement, unsigned long offset, unsigned long limit,
 		SQL_Driver_query_event_handlers& handlers) =0;
 };