R/rmodb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some bug fixes in db_

Browse Source
This commit is contained in:
Craig Williams
2020-10-09 10:08:13 +01:00
parent 0fc012815b
commit 3b35c27811
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/db_query.c
View File

@@ -504,7 +504,7 @@ int64_t addIdMap(struct stored_conn_t *sconn, const char *table, size_t table_le
strbld_str(sb, "INSERT INTO ", 12); strbld_str(sb, "INSERT INTO ", 12);
escapeTableName_sb(sb, table, table_len); escapeTableName_sb(sb, table, table_len);
strbld_str(sb, table, 0); strbld_char(sb, ' ');
strbld_char(sb, '('); strbld_char(sb, '(');
escapeColumnName_sb(sb, 0, 0, primary_col, 0); escapeColumnName_sb(sb, 0, 0, primary_col, 0);
strbld_char(sb, ','); strbld_char(sb, ',');
@@ -528,7 +528,7 @@ int64_t addIdMap(struct stored_conn_t *sconn, const char *table, size_t table_le
return -1; return -1;
} }
return (qry_ret > 0); return qry_ret == 0;
} }
int64_t removeIdMap(struct stored_conn_t *sconn, const char *table, size_t table_len, int64_t removeIdMap(struct stored_conn_t *sconn, const char *table, size_t table_len,
const char *primary_col, const char *map_col, const char *primary_col, const char *map_col,

10
src/db_value.c
View File

@@ -77,12 +77,14 @@ void db_value_sbva(str_builder *sb, e_column_type type, uint32_t n_args, va_list
return; return;
} }
if (n_args == 1) { if (n_args == 2) {
tmp_len = strlen(tmp_str);
} else {
tmp_len = va_arg(args, size_t); tmp_len = va_arg(args, size_t);
} }
if (n_args == 1 || (tmp_str != 0 && tmp_len == 0)) {
tmp_len = strlen(tmp_str);
}
esc_str = (char *)malloc(tmp_len * 2 + 1 + 2); esc_str = (char *)malloc(tmp_len * 2 + 1 + 2);
if (esc_str == 0) { if (esc_str == 0) {
@@ -126,7 +128,7 @@ void db_value_sbva(str_builder *sb, e_column_type type, uint32_t n_args, va_list
esc_str[1] = 'x'; esc_str[1] = 'x';
esc_len = mysql_hex_string(esc_str + 2, tmp_str, tmp_len); esc_len = mysql_hex_string(esc_str + 2, tmp_str, tmp_len);
strbld_str(sb, esc_str, esc_len); strbld_str(sb, esc_str, esc_len + 2);
free(esc_str); free(esc_str);
return; return;