xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

1. bugFix: memory leakage 

2. satisfy CI
This commit is contained in:
freemine 2020-10-27 13:33:59 +08:00
parent e5a36038c9
commit 4e402502a2
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/connector/odbc/src/todbc.c
View File

@ -679,7 +679,9 @@ SQLRETURN SQL_API SQLExecDirectW(SQLHSTMT hstmt, SQLWCHAR *szSqlStr, SQLINTEGER
{ {
size_t bytes = 0; size_t bytes = 0;
SQLCHAR *utf8 = wchars_to_chars(szSqlStr, cbSqlStr, &bytes); SQLCHAR *utf8 = wchars_to_chars(szSqlStr, cbSqlStr, &bytes);
return SQLExecDirect(hstmt, utf8, bytes); SQLRETURN r = SQLExecDirect(hstmt, utf8, bytes);
if (utf8) free(utf8);
return r;
} }
static SQLRETURN doSQLNumResultCols(SQLHSTMT StatementHandle, static SQLRETURN doSQLNumResultCols(SQLHSTMT StatementHandle,
@ -2224,9 +2226,7 @@ static SQLRETURN doSQLDescribeCol(SQLHSTMT StatementHandle,
if (NameLength) { if (NameLength) {
*NameLength = strnlen(field->name, sizeof(field->name)); *NameLength = strnlen(field->name, sizeof(field->name));
} }
if (ColumnSize) { if (ColumnSize) *ColumnSize = field->bytes;
*ColumnSize = field->bytes;
}
if (DecimalDigits) *DecimalDigits = 0; if (DecimalDigits) *DecimalDigits = 0;
if (DataType) { if (DataType) {
@ -2260,12 +2260,9 @@ static SQLRETURN doSQLDescribeCol(SQLHSTMT StatementHandle,
} break; } break;
case TSDB_DATA_TYPE_TIMESTAMP: { case TSDB_DATA_TYPE_TIMESTAMP: {
// *DataType = SQL_TIMESTAMP;
// *ColumnSize = 30;
// *DecimalDigits = 3;
*DataType = SQL_TIMESTAMP; *DataType = SQL_TIMESTAMP;
*ColumnSize = sizeof(SQL_TIMESTAMP_STRUCT); if (ColumnSize) *ColumnSize = sizeof(SQL_TIMESTAMP_STRUCT);
*DecimalDigits = 0; if (DecimalDigits) *DecimalDigits = 0;
} break; } break;
case TSDB_DATA_TYPE_NCHAR: { case TSDB_DATA_TYPE_NCHAR: {