lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2026-03-10 00:20:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5 from nyalldawson/fix_SQL_COLUMN_TYPE_NAME

Browse Source 
Implement SQL_COLUMN_TYPE_NAME field identifier in SQLColAttributes
This commit is contained in:
Evan Miller
2020-08-06 23:57:15 -04:00
committed by GitHub
parent e7782f7821 3517b0eee6
commit 47724e50c9
1 changed files with 49 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/odbc/odbc.c
View File

@@ -35,6 +35,7 @@ static iconv_t iconv_in,iconv_out;
#endif //ENABLE_ODBC_W #endif //ENABLE_ODBC_W
static SQLSMALLINT _odbc_get_client_type(MdbColumn *col); static SQLSMALLINT _odbc_get_client_type(MdbColumn *col);
static const char * _odbc_get_client_type_name(MdbColumn *col);
static int _odbc_fix_literals(struct _hstmt *stmt); static int _odbc_fix_literals(struct _hstmt *stmt);
//static int _odbc_get_server_type(int clt_type); //static int _odbc_get_server_type(int clt_type);
static int _odbc_get_string_size(int size, SQLCHAR *str); static int _odbc_get_string_size(int size, SQLCHAR *str);
@@ -930,6 +931,13 @@ static SQLRETURN SQL_API _SQLColAttributes(
//*pfDesc = SQL_CHAR; //*pfDesc = SQL_CHAR;
*pfDesc = _odbc_get_client_type(col); *pfDesc = _odbc_get_client_type(col);
break; break;
case SQL_COLUMN_TYPE_NAME:
{
const char *type_name = _odbc_get_client_type_name(col);
if (type_name)
snprintf(rgbDesc, cbDescMax, "%s", type_name);
break;
}
case SQL_COLUMN_LENGTH: case SQL_COLUMN_LENGTH:
break; break;
case SQL_COLUMN_DISPLAY_SIZE: /* =SQL_DESC_DISPLAY_SIZE */ case SQL_COLUMN_DISPLAY_SIZE: /* =SQL_DESC_DISPLAY_SIZE */
@@ -2484,3 +2492,44 @@ static SQLSMALLINT _odbc_get_client_type(MdbColumn *col)
} }
return -1; return -1;
} }
static const char * _odbc_get_client_type_name(MdbColumn *col)
{
switch (col->col_type) {
case MDB_BOOL:
return "BOOL";
case MDB_BYTE:
return "BYTE";
case MDB_INT:
return "INT";
case MDB_LONGINT:
return "LONGINT";
case MDB_MONEY:
return "MONEY";
case MDB_FLOAT:
return "FLOAT";
case MDB_DOUBLE:
return "DOUBLE";
case MDB_DATETIME:
return "DATETIME";
case MDB_TEXT:
return "TEXT";
case MDB_BINARY:
return "BINARY";
case MDB_MEMO:
return "MEMO";
case MDB_OLE:
return "OLE";
case MDB_REPID:
return "REPID";
case MDB_NUMERIC:
return "NUMERIC";
case MDB_COMPLEX:
return "COMPLEX";
default:
// fprintf(stderr,"Unknown type %d\n",srv_type);
break;
}
return NULL;
}