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

Some changes to db

Browse Source 
- Generic ScalarQuery is no longer used so removed
- Handle the case where the column length is > 0 but the number of rows is 0
This commit is contained in:
Craig Williams
2020-09-15 17:31:51 +01:00
parent b3ae6035d2
commit 02d11c75b2
2 changed files with 62 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/db_column.c
View File

@@ -154,6 +154,10 @@ struct column_data_t *columnFromResult(struct stored_conn_t *sconn, MYSQL_RES *r
col->isBlob = (field->flags & BLOB_FLAG) > 0;
col->isTimestamp = (field->flags & TIMESTAMP_FLAG) > 0;
if (num_rows == 0) {
return col;
}
col->data.vptr = malloc(col->type_bytes * num_rows);
if (col->data.vptr == NULL) {
fprintf(stderr, "[%d]malloc: (%d) %s\n", __LINE__, errno, strerror(errno));
@@ -163,7 +167,6 @@ struct column_data_t *columnFromResult(struct stored_conn_t *sconn, MYSQL_RES *r
}
memset(col->data.vptr, 0, col->type_bytes * num_rows);
col->data_sizes = 0;
if (col->hasPointers) {
col->data_sizes = (size_t *)malloc(sizeof(size_t) * num_rows);
if (col->data_sizes == NULL) {
@@ -176,7 +179,6 @@ struct column_data_t *columnFromResult(struct stored_conn_t *sconn, MYSQL_RES *r
memset(col->data_sizes, 0, sizeof(size_t) * num_rows);
}
col->nulls = 0;
if (col->isNullable) {
col->nulls = malloc(num_rows / 8 + 1);
if (col->nulls == NULL) {