|
|
| version 1.19, 2004/03/26 13:29:40 | version 1.21, 2004/05/25 07:07:48 |
|---|---|
| Line 58 static char *lsplit(char **string_ref, c | Line 58 static char *lsplit(char **string_ref, c |
| return result; | return result; |
| } | } |
| static void toupper(char *out, const char *in, size_t size) { | static void toupper_str(char *out, const char *in, size_t size) { |
| while(size--) | while(size--) |
| *out++=(char)toupper(*in++); | *out++=(char)toupper(*in++); |
| } | } |
| Line 95 public: | Line 95 public: |
| #define PQclear_throwPQerror PQclear_throw(PQerrorMessage(connection.conn)) | #define PQclear_throwPQerror PQclear_throw(PQerrorMessage(connection.conn)) |
| /** connect | /** connect |
| @param used_only_in_connect_url | @param url |
| format: @b user:pass@host[:port]|[local]/database | format: @b user:pass@host[:port]|[local]/database |
| */ | */ |
| void connect( | void connect( |
| char *used_only_in_connect_url, | char *url, |
| SQL_Driver_services& services, | SQL_Driver_services& services, |
| void **connection_ref ///< output: Connection* | void **connection_ref ///< output: Connection* |
| ) { | ) { |
| char *user=used_only_in_connect_url; | char *user=url; |
| char *host=lsplit(user, '@'); | char *host=lsplit(user, '@'); |
| char *db=lsplit(host, '/'); | char *db=lsplit(host, '/'); |
| char *pwd=lsplit(user, ':'); | char *pwd=lsplit(user, ':'); |
| Line 133 public: | Line 133 public: |
| if(*key) { | if(*key) { |
| if(char *value=lsplit(key, '=')) { | if(char *value=lsplit(key, '=')) { |
| if(strcmp(key, "ClientCharset" ) == 0) { | if(strcmp(key, "ClientCharset" ) == 0) { |
| toupper(value, value, strlen(value)); | toupper_str(value, value, strlen(value)); |
| connection.cstrClientCharset=value; | connection.cstrClientCharset=value; |
| } else if(strcasecmp(key, "charset")==0) { // left for backward compatibility, consider using ClientCharset | } else if(strcasecmp(key, "charset")==0) { // left for backward compatibility, consider using ClientCharset |
| cstrBackwardCompAskServerToTranscode=value; | cstrBackwardCompAskServerToTranscode=value; |