Skip to content

Add unsigned_long ES type support #304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 24, 2022
Merged

Add unsigned_long ES type support #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b01e173
Add unsigned_long ES type support
bpintea Jan 17, 2022
4af2108
Merge branch 'master' into enh/unsigned_long
bpintea Jan 20, 2022
36fe5aa
Merge branch 'master' into enh/unsigned_long
bpintea Feb 4, 2022
d2b8e54
Add unsigned long testing converage
bpintea Feb 7, 2022
469345c
Skip advancing parser at end of tag
bpintea Feb 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 28 additions & 4 deletions driver/connect.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@
#define TYPE_UNSUPPORTED "UNSUPPORTED"
/* 12 */
#define TYPE_SCALED_FLOAT "SCALED_FLOAT"
/* 13 */
#define TYPE_UNSIGNED_LONG "UNSIGNED_LONG"

/*
* intervals
Expand Down Expand Up @@ -1503,7 +1505,7 @@ SQLRETURN config_dbc(esodbc_dbc_st *dbc, esodbc_dsn_attrs_st *attrs)
INFOH(dbc, "early execution: %s.", dbc->early_exec ? "true" : "false");
/* default current catalog */
if (attrs->catalog.cnt &&
(! SQL_SUCCEEDED(set_current_catalog(dbc, &attrs->catalog)))) {
(! SQL_SUCCEEDED(set_current_catalog(dbc, &attrs->catalog)))) {
goto err;
}

Expand Down Expand Up @@ -2386,6 +2388,17 @@ static BOOL elastic_name2types(wstr_st *type_name,
return TRUE;
}
break;

/* 13: UNSIGNED_LONG */
case sizeof(TYPE_UNSIGNED_LONG) - 1:
if (! wmemncasecmp(type_name->str, MK_WPTR(TYPE_UNSIGNED_LONG),
type_name->cnt)) {
*c_sql = ES_ULONG_TO_CSQL;
*sql = ES_ULONG_TO_SQL;
return TRUE;
}
break;

}

return elastic_intervals_name2types(type_name, c_sql, sql);
Expand Down Expand Up @@ -2422,7 +2435,7 @@ static void set_display_size(esodbc_estype_st *es_type)
es_type->display_size ++;
}
break;
case SQL_BIGINT: /* LONG */
case SQL_BIGINT: /* LONG, UNSIGNED_LONG */
es_type->display_size = es_type->column_size;
if (es_type->unsigned_attribute) {
es_type->display_size ++;
Expand Down Expand Up @@ -2713,13 +2726,15 @@ static void set_es_types(esodbc_dbc_st *dbc, SQLULEN rows_fetched,
{
SQLULEN i;
SQLINTEGER max_float_size, max_varchar_size;
size_t lgst_name_len;

dbc->es_types = types;
dbc->no_types = rows_fetched;

assert(dbc->max_float_type == NULL);
assert(dbc->max_varchar_type == NULL);

lgst_name_len = 0;
for (i = 0; i < rows_fetched; i ++) {
switch (types[i].data_type) {
case SQL_DOUBLE:
Expand All @@ -2736,11 +2751,20 @@ static void set_es_types(esodbc_dbc_st *dbc, SQLULEN rows_fetched,
if (max_varchar_size < types[i].column_size) {
dbc->max_varchar_type = &types[i];
}
break;
}
if (types[i].c_concise_type == ES_ULONG_TO_CSQL) {
dbc->ulong = &types[i];
}
if (lgst_name_len < types[i].type_name.cnt) {
lgst_name_len = types[i].type_name.cnt;
dbc->lgst_name = &types[i];
}
}

assert(dbc->max_float_type);
assert(dbc->max_varchar_type);
assert(dbc->lgst_name);

DBGH(dbc, "%lu ES/SQL types available, maximum sizes supported for: "
"floats: %ld, varchar: %ld.", (unsigned long)rows_fetched,
Expand Down Expand Up @@ -3478,8 +3502,8 @@ SQLRETURN EsSQLGetConnectAttrW(
}
if (dbc->catalog.w.cnt) {
if (! SQL_SUCCEEDED(write_wstr(dbc, (SQLWCHAR *)ValuePtr,
&dbc->catalog.w, (SQLSMALLINT)BufferLength,
&used))) {
&dbc->catalog.w, (SQLSMALLINT)BufferLength,
&used))) {
ERRH(dbc, "failed to copy current catalog out.");
RET_STATE(dbc->hdr.diag.state);
}
Expand Down
Loading