diff --git a/src/utils/dbi.c b/src/utils/dbi.c
index 3aef35e2213514839e9b12eb3d0625270e49b008..d7398de15821725af5420ce5e7de8a422bf24c1f 100644 (file)
--- a/src/utils/dbi.c
+++ b/src/utils/dbi.c
static int
sc_dbi_get_field(dbi_result res, unsigned int i,
- int type, sc_dbi_data_t *data)
+ int type, sc_data_t *data)
{
switch (type) {
- case DBI_TYPE_INTEGER:
+ case SC_TYPE_INTEGER:
data->data.integer = dbi_result_get_longlong_idx(res, i);
break;
- case DBI_TYPE_DECIMAL:
+ case SC_TYPE_DECIMAL:
data->data.decimal = dbi_result_get_double_idx(res, i);
break;
- case DBI_TYPE_STRING:
+ case SC_TYPE_STRING:
data->data.string = dbi_result_get_string_idx(res, i);
break;
- case DBI_TYPE_DATETIME:
+ case SC_TYPE_DATETIME:
{
/* libdbi does not provide any higher resolutions than that */
time_t datetime = dbi_result_get_datetime_idx(res, i);
data->data.datetime = SECS_TO_SC_TIME(datetime);
}
break;
- case DBI_TYPE_BINARY:
+ case SC_TYPE_BINARY:
{
size_t length = dbi_result_get_field_length_idx(res, i);
const unsigned char *datum = dbi_result_get_binary_idx(res, i);
static int
sc_dbi_get_data(sc_dbi_client_t *client, dbi_result res,
- unsigned int num_fields, sc_dbi_data_cb callback)
+ unsigned int num_fields, sc_dbi_data_cb callback,
+ sc_object_t *user_data)
{
- sc_dbi_data_t data[num_fields];
+ sc_data_t data[num_fields];
int types[num_fields];
unsigned int i;
sc_dbi_strerror(client->conn));
return -1;
}
+ types[i] = DBI_TYPE_TO_SC(types[i]);
}
num_rows = dbi_result_get_numrows(res);
types[i], &data[i]))
continue;
- if (callback(client, num_fields, data))
+ if (callback(client, num_fields, data, user_data))
continue;
++success;
int
sc_dbi_exec_query(sc_dbi_client_t *client, const char *query,
- sc_dbi_data_cb callback, int n, ...)
+ sc_dbi_data_cb callback, sc_object_t *user_data, int n, ...)
{
dbi_result res;
unsigned int num_fields;
unsigned int type = va_arg(types, unsigned int);
+ field_type = DBI_TYPE_TO_SC(field_type);
+
/* column count starts at 1 */
if ((unsigned int)field_type != type) {
fprintf(stderr, "dbi: type of column '%s' (%u) does not match "
return 0;
}
- status = sc_dbi_get_data(client, res, num_fields, callback);
+ status = sc_dbi_get_data(client, res, num_fields, callback, user_data);
dbi_result_free(res);
return status;