Skip to content

Commit 3e4e82f

Browse files
eventdlidongsjtu
authored andcommitted
KYLIN-2132 Fix missing type check of BIGINT; Add follow-up fix of KYLIN-2121
Signed-off-by: lidongsjtu <[email protected]>
1 parent 2cca348 commit 3e4e82f

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

odbc/Driver/KO_DTYPE.CPP

+1
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ eGoodBad _SQLCheckDataType ( Word pDataType )
8282
case SQL_TYPE_TIMESTAMP :
8383
case SQL_BIT :
8484
case SQL_DEFAULT :
85+
case SQL_BIGINT :
8586
case SQL_C_SBIGINT :
8687
case SQL_C_UBIGINT :
8788
case SQL_C_TINYINT :

odbc/Driver/KO_FETCH.CPP

+5-4
Original file line numberDiff line numberDiff line change
@@ -696,12 +696,13 @@ RETCODE SQL_API SQLPutData ( SQLHSTMT pStmt,
696696

697697
RETCODE SQL_API SQLMoreResults ( HSTMT pStmt )
698698
{
699-
__ODBCLOG ( _ODBCLogMsg ( LogLevel_DEBUG, "SQLMoreResults called" ) );
700-
701699
pODBCStmt odbcStmt = ( pODBCStmt )pStmt;
702-
700+
701+
__ODBCLOG ( _ODBCLogMsg ( LogLevel_DEBUG, "SQLMoreResults called, stmt handle %d with start-row %d and end-row %d, next handle is %d",
702+
(long) odbcStmt, odbcStmt->CurRowsetStartRowPos, odbcStmt->CurRowsetEndRowPos, (long) odbcStmt -> Next) );
703+
703704
// check if stmt been released already
704-
if ( ! odbcStmt -> Prepared )
705+
if (( ! odbcStmt -> Prepared) || ( ! odbcStmt -> Next ))
705706
{
706707
return SQL_NO_DATA;
707708
}

0 commit comments

Comments
 (0)