database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-08 14:02:17 +03:00
Code Activity

Test fixes:

Browse Source 
- For reconnection/and multi host tests specify also socket location,
since mtr doesn't use default socket for localhost connections

- parse_connection_string now returns NULL for empty password in
  curly braces
This commit is contained in:
Georg Richter
2022-01-04 10:37:12 +01:00
parent dae2d119a2
commit 141fb0d5fa
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libmariadb/mariadb_lib.c
View File

@@ -841,6 +841,7 @@ static int parse_connection_string(MYSQL *mysql, const char *unused __attribute_
{ {
pos++; pos++;
val= pos; val= pos;
continue;
} }
} }
break; break;

16
unittest/libmariadb/connection.c
View File

@@ -1988,10 +1988,10 @@ static int test_conn_str(MYSQL *my __attribute__((unused)))
char conn_str[1024]; char conn_str[1024];
int rc=OK; int rc=OK;
snprintf(conn_str, sizeof(conn_str)-1, "host=%s;user=%s;password={%s};db=%s;port=%d", snprintf(conn_str, sizeof(conn_str)-1, "host=%s;user=%s;password={%s};port=%d;socket=%s",
hostname ? hostname : "localhost", username ? username : "", hostname ? hostname : "localhost", username ? username : "",
password ? password : "", password ? password : "",
schema ? schema : "", port); port, socketname ? socketname : "");
/* SkySQL requires secure connection */ /* SkySQL requires secure connection */
if (IS_SKYSQL(hostname)) if (IS_SKYSQL(hostname))
@@ -2023,9 +2023,9 @@ static int test_conn_str_1(MYSQL *my __attribute__((unused)))
return FAIL; return FAIL;
fprintf(fp, "[client]\n"); fprintf(fp, "[client]\n");
fprintf(fp, "connection=host=%s;user=%s;password=%s;port=%d;ssl_enforce=1\n", fprintf(fp, "connection=host=%s;user=%s;password=%s;port=%d;ssl_enforce=1;socket=%s\n",
hostname ? hostname : "localhost", username ? username : "", hostname ? hostname : "localhost", username ? username : "",
password ? password : "", port); password ? password : "", port, socketname ? socketname : "");
fclose(fp); fclose(fp);
@@ -2059,9 +2059,9 @@ static int test_conc365(MYSQL *my __attribute__((unused)))
char tmp[1024]; char tmp[1024];
snprintf(tmp, sizeof(tmp) - 1, snprintf(tmp, sizeof(tmp) - 1,
"host=127.0.0.1:3300,%s;user=%s;password=%s;port=%d", "host=127.0.0.1:3300,%s;user=%s;password=%s;port=%d;socket=%s",
hostname ? hostname : "localhost", username ? username : "", password ? password : "", hostname ? hostname : "localhost", username ? username : "", password ? password : "",
port); port, socketname ? socketname : "");
if (IS_SKYSQL(hostname)) if (IS_SKYSQL(hostname))
strcat(tmp, ";ssl_enforce=1"); strcat(tmp, ";ssl_enforce=1");
@@ -2111,9 +2111,9 @@ static int test_conc365_reconnect(MYSQL *my)
mysql_options(mysql, MYSQL_OPT_RECONNECT, &reconnect); mysql_options(mysql, MYSQL_OPT_RECONNECT, &reconnect);
snprintf(tmp, sizeof(tmp) - 1, snprintf(tmp, sizeof(tmp) - 1,
"host=127.0.0.1:3300,%s;user=%s;password=%s;port=%d", "host=127.0.0.1:3300,%s;user=%s;password=%s;port=%d;socket=%s",
hostname ? hostname : "localhost", username ? username : "", password ? password : "", hostname ? hostname : "localhost", username ? username : "", password ? password : "",
port); port, socketname ? socketname : "");
if (IS_SKYSQL(hostname)) if (IS_SKYSQL(hostname))
strcat(tmp, ";ssl_enforce=1"); strcat(tmp, ";ssl_enforce=1");