--- parser3/src/sql/mysql/Attic/parser3mysql.C	2001/04/04 12:45:47	1.4
+++ parser3/src/sql/mysql/Attic/parser3mysql.C	2001/04/05 11:50:11	1.8
@@ -1,18 +1,18 @@
 /** @file
 	Parser: MySQL driver.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com)
 
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)
 
-	$Id: parser3mysql.C,v 1.4 2001/04/04 12:45:47 paf Exp $
+	$Id: parser3mysql.C,v 1.8 2001/04/05 11:50:11 paf Exp $
 */
 
 #include <stdlib.h>
 
 #include "pa_sql_driver.h"
 #include "mysql.h"
-#include "pa_common.h"
+#include "pa_common.h" //
 
 char *lsplit(char *string, char delim) {
     if(string) {
@@ -25,14 +25,14 @@ char *lsplit(char *string, char delim) {
     return 0;
 }
 
-char *lsplit(char **string_ref, char delim) {
-    char *result=*string_ref;
-	char *next=lsplit(*string_ref, delim);
-    *string_ref=next;
-    return result;
-}
-
-/// MySQL server driver
+/**
+	MySQL server driver
+	
+	@todo 
+		figure out about memory for errors:
+		- static=add multithread locks
+		- dynamic=who should free it up?
+*/
 class MySQL_Driver : public SQL_Driver {
 public:
 
@@ -40,9 +40,12 @@ public:
 	}
 
 	/// get api version
-	int api_version() { return SQL_API_VERSION; }
+	int api_version() { return SQL_DRIVER_API_VERSION; }
 	/// connect
-	const char *connect(char *url, void **info) {
+	void connect(
+		char *url, ///< @b user:pass@host[:port]/database
+		void **connection ///< output: MYSQL *
+		) {
 		char *user=url;
 		char *host=lsplit(user, '@');
 		char *db=lsplit(host, '/');
@@ -54,22 +57,73 @@ public:
 	    MYSQL *mysql=mysql_init(NULL);
 		if(!mysql_real_connect(mysql, 
 			host, user, pwd, db, port?port:MYSQL_PORT, NULL, 0))
-			return "mysql connect failed";
+			fservices->_throw(mysql_error(mysql));
 
-		*(MYSQL **)info=mysql;
-		return 0;
+		*(MYSQL **)connection=mysql;
 	}
-	const char *disconnect(void *info) {
-	    mysql_close((MYSQL *)info);
-		return 0;
+	void disconnect(void *connection) {
+	    mysql_close((MYSQL *)connection);
 	}
-	const char *commit(void *info) {
-		return 0;//"mysql commit failed";
+	void commit(void *connection) {}
+	void rollback(void *connection) {}
+
+	bool ping(void *connection) {
+		return false;
+		return mysql_ping((MYSQL *)connection)==0;
 	}
-	const char *rollback(void *info) {
-		return 0;//"mysql rollback failed";
+
+	void query(void *connection, 
+		const char *statement, unsigned long offset, unsigned long limit,
+		unsigned int *column_count, Cell **columns, 
+		unsigned long *row_count, Cell ***rows) {
+
+		MYSQL *mysql=(MYSQL *)connection;
+		MYSQL_RES *res=NULL;
+
+		//mysql_character_set_name
+		//mysql_real_escape_string
+		//mysql_escape_string
+		
+		if(mysql_query(mysql, statement)) 
+			fservices->_throw(mysql_error(mysql));
+		if(!(res=mysql_store_result(mysql)) && mysql_field_count(mysql)) 
+			fservices->_throw(mysql_error(mysql));
+		if(!res) {
+			// empty result
+			*row_count=0;
+			*column_count=0;
+			return;
+		}
+		
+		*column_count=mysql_num_fields(res);
+		*columns=(Cell *)fservices->malloc(sizeof(Cell)*(*column_count));
+
+		*row_count=(unsigned long)mysql_num_rows(res);
+		*rows=(Cell **)fservices->malloc(sizeof(Cell *)*(*row_count));
+		
+		for(unsigned int i=0; i<(*column_count); i++){
+			MYSQL_FIELD *field=mysql_fetch_field(res);
+			size_t size=strlen(field->name);
+			(*columns)[i].size=size;
+			(*columns)[i].ptr=fservices->malloc(size);
+			memcpy((*columns)[i].ptr, field->name, size);
+		}
+		
+		for(unsigned long r=0; r<(*row_count); r++) 
+			if(MYSQL_ROW mysql_row=mysql_fetch_row(res)) { // never false..
+				unsigned long *lengths=mysql_fetch_lengths(res);
+				Cell *row=(Cell *)malloc(sizeof(Cell)*(*column_count));
+				(*rows)[r]=row;
+				for(unsigned int i=0; i<(*column_count); i++){
+					size_t size=(size_t)lengths[i];
+					row[i].size=size;
+					row[i].ptr=fservices->malloc(size);
+					memcpy(row[i].ptr, mysql_row[i], size);
+				}
+		}
+		
+		mysql_free_result(res);
 	}
-	;
 };
 
 extern "C" SQL_Driver *create() {