--- parser3/src/sql/mysql/Attic/parser3mysql.C 2001/05/17 08:42:22 1.16 +++ parser3/src/sql/mysql/Attic/parser3mysql.C 2001/07/23 13:59:52 1.26 @@ -4,9 +4,8 @@ Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: parser3mysql.C,v 1.16 2001/05/17 08:42:22 parser Exp $ */ +static const char *RCSId="$Id: parser3mysql.C,v 1.26 2001/07/23 13:59:52 parser Exp $"; #include "config_includes.h" @@ -36,10 +35,6 @@ static char *lsplit(char *string, char d /** 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: @@ -51,22 +46,32 @@ public: int api_version() { return SQL_DRIVER_API_VERSION; } /// initialize driver by loading sql dynamic link library const char *initialize(const char *dlopen_file_spec) { - return dlink(dlopen_file_spec); + return dlopen_file_spec? + dlink(dlopen_file_spec):"client library column is empty"; } /** connect - @param used_only_to_connect_url - format: @b user:pass@host[:port]/database/charset + @param used_only_in_connect_url + format: @b user:pass@host[:port]|[/unix/socket]/database/charset 3.23.22b Currently the only option for @b character_set_name is cp1251_koi8. WARNING: must be used only to connect, for buffer doesn't live long */ void connect( - char *used_only_to_connect_url, + char *used_only_in_connect_url, + SQL_Driver_services& services, void **connection ///< output: MYSQL * ) { - char *user=used_only_to_connect_url; - char *host=lsplit(user, '@'); - char *db=lsplit(host, '/'); + char *user=used_only_in_connect_url; + char *s=lsplit(user, '@'); + char *host=0; + char *unix_socket=0; + if(s && s[0]=='[') { // unix socket + unix_socket=1+s; + s=lsplit(unix_socket, ']'); + } else { // IP + host=s; + } + char *db=lsplit(s, '/'); char *pwd=lsplit(user, ':'); char *error_pos=0; char *port_cstr=lsplit(host, ':'); @@ -75,8 +80,8 @@ public: MYSQL *mysql=mysql_init(NULL); if(!mysql_real_connect(mysql, - host, user, pwd, db, port?port:MYSQL_PORT, NULL, 0)) - services->_throw(mysql_error(mysql)); + host, user, pwd, db, port?port:MYSQL_PORT, unix_socket, 0)) + services._throw(mysql_error(mysql)); if(charset) { // set charset @@ -84,23 +89,24 @@ public: strncat(statement, charset, MAX_STRING); if(mysql_query(mysql, statement)) - services->_throw(mysql_error(mysql)); + services._throw(mysql_error(mysql)); (*mysql_store_result)(mysql); // throw out the result [don't need but must call] } *(MYSQL **)connection=mysql; } - void disconnect(void *connection) { + void disconnect(SQL_Driver_services&, void *connection) { mysql_close((MYSQL *)connection); } - void commit(void *connection) {} - void rollback(void *connection) {} + void commit(SQL_Driver_services&, void *) {} + void rollback(SQL_Driver_services&, void *) {} - bool ping(void *connection) { + bool ping(SQL_Driver_services&, void *connection) { return mysql_ping((MYSQL *)connection)==0; } - unsigned int quote(void *connection, + unsigned int quote( + SQL_Driver_services&, void *connection, char *to, const char *from, unsigned int length) { /* 3.23.22b @@ -112,10 +118,10 @@ public: */ return (*mysql_escape_string)(to, from, length); } - void query(void *connection, + void query( + SQL_Driver_services& services, void *connection, const char *astatement, unsigned long offset, unsigned long limit, - unsigned int *column_count, Cell **columns, - unsigned long *row_count, Cell ***rows) { + SQL_Driver_query_event_handlers& handlers) { MYSQL *mysql=(MYSQL *)connection; MYSQL_RES *res=NULL; @@ -123,7 +129,7 @@ public: const char *statement; if(offset || limit) { size_t statement_size=strlen(astatement); - char *statement_limited=(char *)services->malloc( + char *statement_limited=(char *)services.malloc( statement_size+MAX_NUMBER*2+8/* limit #,#*/+1); char *cur=statement_limited; memcpy(cur, astatement, statement_size); cur+=statement_size; @@ -137,46 +143,46 @@ public: statement=astatement; if(mysql_query(mysql, statement)) - services->_throw(mysql_error(mysql)); + services._throw(mysql_error(mysql)); if(!(res=mysql_store_result(mysql)) && mysql_field_count(mysql)) - services->_throw(mysql_error(mysql)); - if(!res) { - // empty result - *row_count=0; - *column_count=0; + services._throw(mysql_error(mysql)); + if(!res) // empty result: insert|delete|update|... return; - } - *column_count=mysql_num_fields(res); - if(!*column_count) // old client - *column_count=mysql_field_count(mysql); + int column_count=mysql_num_fields(res); + if(!column_count) // old client + column_count=mysql_field_count(mysql); - *columns=(Cell *)services->malloc(sizeof(Cell)*(*column_count)); + if(!column_count) + services._throw("result contains no columns"); - *row_count=(unsigned long)mysql_num_rows(res); - *rows=(Cell **)services->malloc(sizeof(Cell *)*(*row_count)); - - for(unsigned int i=0; i<(*column_count); i++){ + for(int i=0; iname); - (*columns)[i].size=size; - (*columns)[i].ptr=services->malloc(size); - memcpy((*columns)[i].ptr, field->name, size); + void *ptr=services.malloc(size); + memcpy(ptr, field->name, size); + handlers.add_column(ptr, size); } + + handlers.before_rows(); - 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=services->malloc(size); - memcpy(row[i].ptr, mysql_row[i], size); + if(unsigned long row_count=(unsigned long)mysql_num_rows(res)) + for(unsigned long r=0; r