casenumber n_cases = CASENUMBER_MAX;
const char *encoding;
- struct psql_reader *r = xzalloc (sizeof *r);
+ struct psql_reader *r = XZALLOC (struct psql_reader);
struct string query ;
r->conn = PQconnectdb (info->conninfo);
}
}
- r->postgres_epoch = calendar_gregorian_to_offset (2000, 1, 1, NULL);
+ r->postgres_epoch = calendar_gregorian_to_offset (
+ 2000, 1, 1, settings_get_fmt_settings (), NULL);
{
const int enc = PQclientEncoding (r->conn);
for (i = 0 ; i < n_fields ; ++i)
{
struct variable *var;
- struct fmt_spec fmt = {FMT_F, 8, 2};
+ struct fmt_spec fmt = { .type = FMT_F, .w = 8, .d = 2 };
Oid type = PQftype (qres, i);
int width = 0;
int length ;
case INTERVALOID:
case TIMESTAMPTZOID:
case TIMETZOID:
- if (i < r->vmapsize && var_get_dict_index(v) + 1 < dict_get_var_cnt (r->dict))
+ if (i < r->vmapsize && var_get_dict_index(v) + 1 < dict_get_n_vars (r->dict))
{
const struct variable *v1 = NULL;
v1 = dict_get_var (r->dict, var_get_dict_index (v) + 1);