--- sql/mysql/parser3mysql.C 2004/01/26 15:09:02 1.16 +++ sql/mysql/parser3mysql.C 2004/12/23 16:54:52 1.26 @@ -10,7 +10,7 @@ 2001.11.06 numrows on "HP-UX istok1 B.11.00 A 9000/869 448594332 two-user license" 3.23.42 & 4.0.0.alfa never worked, both subst & .sl version returned 0 */ -static const char *RCSId="$Id: parser3mysql.C,v 1.16 2004/01/26 15:09:02 paf Exp $"; +static const char *RCSId="$Id: parser3mysql.C,v 1.26 2004/12/23 16:54:52 paf Exp $"; #include "config_includes.h" @@ -46,10 +46,27 @@ static char *lsplit(char **string_ref, c return result; } +static char* rsplit(char* string, char delim) { + if(string) { + char* v=strrchr(string, delim); + if(v) { + *v=0; + return v+1; + } + } + return NULL; +} + +static void toupper_str(char *out, const char *in, size_t size) { + while(size--) + *out++=(char)toupper(*in++); +} + struct Connection { SQL_Driver_services* services; MYSQL* handle; + const char* cstrClientCharset; bool autocommit; }; @@ -70,7 +87,7 @@ public: dlink(dlopen_file_spec):"client library column is empty"; } /** connect - @param used_only_in_connect_url + @param url format: @b user:pass@host[:port]|[/unix/socket]/database? charset=cp1251_koi8& timeout=3& @@ -81,12 +98,12 @@ public: WARNING: must be used only to connect, for buffer doesn't live long */ void connect( - char *used_only_in_connect_url, + char *url, SQL_Driver_services& services, void **connection_ref ///< output: Connection* ) { - char *user=used_only_in_connect_url; - char *s=lsplit(user, '@'); + char *user=url; + char *s=rsplit(user, '@'); char *host=0; char *unix_socket=0; if(s && s[0]=='[') { // unix socket @@ -102,20 +119,24 @@ public: int port=port_cstr?strtol(port_cstr, &error_pos, 0):0; char *options=lsplit(db, '?'); - char *charset=0; + char *cstrBackwardCompAskServerToTranscode=0; - Connection& connection=*(Connection *)::calloc(sizeof(Connection), 1); - *connection_ref=&connection; + Connection& connection=*(Connection *)services.malloc(sizeof(Connection)); connection.services=&services; connection.handle=mysql_init(NULL); + connection.cstrClientCharset=0; connection.autocommit=true; + *connection_ref=&connection; while(options) { if(char *key=lsplit(&options, '&')) { if(*key) { if(char *value=lsplit(key, '=')) { - if(strcasecmp(key, "charset")==0) { - charset=value; + if(strcmp(key, "ClientCharset" ) == 0) { + toupper_str(value, value, strlen(value)); + connection.cstrClientCharset=value; + } else if(strcasecmp(key, "charset")==0) { // left for backward compatibility, consider using ClientCharset + cstrBackwardCompAskServerToTranscode=value; } else if(strcasecmp(key, "timeout")==0) { unsigned int timeout=(unsigned int)atoi(value); if(mysql_options(connection.handle, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&timeout)!=0) @@ -140,14 +161,18 @@ public: } } + if(connection.cstrClientCharset && cstrBackwardCompAskServerToTranscode) + services._throw("use 'ClientCharset' option only, " + "'charset' option is obsolete and should not be used with new 'ClientCharset' option"); + if(!mysql_real_connect(connection.handle, host, user, pwd, db, port?port:MYSQL_PORT, unix_socket, 0)) services._throw(mysql_error(connection.handle)); - if(charset) { + if(cstrBackwardCompAskServerToTranscode) { // set charset char statement[MAX_STRING]="set CHARACTER SET "; // cp1251_koi8 - strncat(statement, charset, MAX_STRING); + strncat(statement, cstrBackwardCompAskServerToTranscode, MAX_STRING); exec(connection, statement); } @@ -166,8 +191,10 @@ public: Connection& connection=*static_cast(aconnection); mysql_close(connection.handle); + connection.handle=0; } void commit(void *aconnection) { + //_asm int 3; Connection& connection=*static_cast(aconnection); if(!connection.autocommit) @@ -198,14 +225,28 @@ public: mysql_escape_string(result, from, length); return result; } - void query( - void *aconnection, - const char *astatement, unsigned long offset, unsigned long limit, + void query(void *aconnection, + const char *astatement, + size_t placeholders_count, Placeholder* placeholders, + unsigned long offset, unsigned long limit, SQL_Driver_query_event_handlers& handlers) { Connection& connection=*static_cast(aconnection); SQL_Driver_services& services=*connection.services; + const char* cstrClientCharset=connection.cstrClientCharset; MYSQL_RES *res=NULL; + if(placeholders_count>0) + services._throw("bind variables not supported (yet)"); + + // transcode from $request:charset to connect-string?client_charset + if(cstrClientCharset) { + size_t transcoded_statement_size; + services.transcode(astatement, strlen(astatement), + astatement, transcoded_statement_size, + services.request_charset(), + cstrClientCharset); + } + const char *statement; if(offset || limit) { size_t statement_size=strlen(astatement); @@ -248,10 +289,20 @@ public: for(int i=0; iname); - char* str=(char*)services.malloc_atomic(length+1); - memcpy(str, field->name, length+1); - CHECK(handlers.add_column(sql_error, str, length)); + size_t length=strlen(field->name); + char* strm=(char*)services.malloc_atomic(length+1); + memcpy(strm, field->name, length+1); + const char* str=strm; + + // transcode to $request:charset from connect-string?client_charset + if(cstrClientCharset) { + services.transcode(str, length, + str, length, + cstrClientCharset, + services.request_charset()); + } + + CHECK(handlers.add_column(sql_error, str, length)); } else { // seen some broken client, // which reported "44" for column count of response to "select 2+2" @@ -267,11 +318,19 @@ public: unsigned long *lengths=mysql_fetch_lengths(res); for(int i=0; i