Skip to content

Commit 38f90ac

Browse files
alinaliBQalinaliBQ
committed
Fix build warnings treated as error
SQLDescribeCol expects `bufCharLen` to be of type `SQLSMALLINT`, so build warnings occur when `bufCharLen` is set to `SQLINTEGER`.
1 parent 8041b2b commit 38f90ac

3 files changed

Lines changed: 24 additions & 12 deletions

File tree

‎cpp/src/arrow/flight/sql/odbc/tests/columns_test.cc‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2333,7 +2333,8 @@ TEST_F(FlightSQLODBCMockTestBase, SQLDescribeColValidateInput) {
23332333
SQLUSMALLINT outOfRangeColumn = 4;
23342334
SQLUSMALLINT negativeColumn = -1;
23352335
SQLWCHAR columnName[1024];
2336-
SQLINTEGER bufCharLen = sizeof(columnName) / ODBC::GetSqlWCharSize();
2336+
SQLSMALLINT bufCharLen =
2337+
static_cast<SQLSMALLINT>(sizeof(columnName) / ODBC::GetSqlWCharSize());
23372338
SQLSMALLINT nameLength = 0;
23382339
SQLSMALLINT dataType = 0;
23392340
SQLULEN columnSize = 0;
@@ -2378,7 +2379,8 @@ TEST_F(FlightSQLODBCMockTestBase, SQLDescribeColQueryAllDataTypesMetadata) {
23782379
this->connect();
23792380

23802381
SQLWCHAR columnName[1024];
2381-
SQLINTEGER bufCharLen = sizeof(columnName) / ODBC::GetSqlWCharSize();
2382+
SQLSMALLINT bufCharLen =
2383+
static_cast<SQLSMALLINT>(sizeof(columnName) / ODBC::GetSqlWCharSize());
23822384
SQLSMALLINT nameLength = 0;
23832385
SQLSMALLINT columnDataType = 0;
23842386
SQLULEN columnSize = 0;
@@ -2454,7 +2456,8 @@ TEST_F(FlightSQLODBCRemoteTestBase, SQLDescribeColQueryAllDataTypesMetadata) {
24542456
this->connect();
24552457

24562458
SQLWCHAR columnName[1024];
2457-
SQLINTEGER bufCharLen = sizeof(columnName) / ODBC::GetSqlWCharSize();
2459+
SQLSMALLINT bufCharLen =
2460+
static_cast<SQLSMALLINT>(sizeof(columnName) / ODBC::GetSqlWCharSize());
24582461
SQLSMALLINT nameLength = 0;
24592462
SQLSMALLINT columnDataType = 0;
24602463
SQLULEN columnSize = 0;
@@ -2537,7 +2540,8 @@ TEST_F(FlightSQLODBCRemoteTestBase, SQLDescribeColODBCTestTableMetadata) {
25372540
this->connect();
25382541

25392542
SQLWCHAR columnName[1024];
2540-
SQLINTEGER bufCharLen = sizeof(columnName) / ODBC::GetSqlWCharSize();
2543+
SQLSMALLINT bufCharLen =
2544+
static_cast<SQLSMALLINT>(sizeof(columnName) / ODBC::GetSqlWCharSize());
25412545
SQLSMALLINT nameLength = 0;
25422546
SQLSMALLINT columnDataType = 0;
25432547
SQLULEN columnSize = 0;
@@ -2599,7 +2603,8 @@ TEST_F(FlightSQLODBCRemoteTestBase, SQLDescribeColODBCTestTableMetadataODBC2) {
25992603
this->connect(SQL_OV_ODBC2);
26002604

26012605
SQLWCHAR columnName[1024];
2602-
SQLINTEGER bufCharLen = sizeof(columnName) / ODBC::GetSqlWCharSize();
2606+
SQLSMALLINT bufCharLen =
2607+
static_cast<SQLSMALLINT>(sizeof(columnName) / ODBC::GetSqlWCharSize());
26032608
SQLSMALLINT nameLength = 0;
26042609
SQLSMALLINT columnDataType = 0;
26052610
SQLULEN columnSize = 0;
@@ -2661,7 +2666,8 @@ TEST_F(FlightSQLODBCMockTestBase, SQLDescribeColAllTypesTableMetadata) {
26612666
this->CreateTableAllDataType();
26622667

26632668
SQLWCHAR columnName[1024];
2664-
SQLINTEGER bufCharLen = sizeof(columnName) / ODBC::GetSqlWCharSize();
2669+
SQLSMALLINT bufCharLen =
2670+
static_cast<SQLSMALLINT>(sizeof(columnName) / ODBC::GetSqlWCharSize());
26652671
SQLSMALLINT nameLength = 0;
26662672
SQLSMALLINT columnDataType = 0;
26672673
SQLULEN columnSize = 0;
@@ -2717,7 +2723,8 @@ TEST_F(FlightSQLODBCMockTestBase, SQLDescribeColUnicodeTableMetadata) {
27172723
this->CreateUnicodeTable();
27182724

27192725
SQLWCHAR columnName[1024];
2720-
SQLINTEGER bufCharLen = sizeof(columnName) / ODBC::GetSqlWCharSize();
2726+
SQLSMALLINT bufCharLen =
2727+
static_cast<SQLSMALLINT>(sizeof(columnName) / ODBC::GetSqlWCharSize());
27212728
SQLSMALLINT nameLength = 0;
27222729
SQLSMALLINT columnDataType = 0;
27232730
SQLULEN columnSize = 0;
@@ -2761,7 +2768,8 @@ TYPED_TEST(FlightSQLODBCTestBase, SQLColumnsGetMetadataBySQLDescribeCol) {
27612768
this->connect();
27622769

27632770
SQLWCHAR columnName[1024];
2764-
SQLINTEGER bufCharLen = sizeof(columnName) / ODBC::GetSqlWCharSize();
2771+
SQLSMALLINT bufCharLen =
2772+
static_cast<SQLSMALLINT>(sizeof(columnName) / ODBC::GetSqlWCharSize());
27652773
SQLSMALLINT nameLength = 0;
27662774
SQLSMALLINT columnDataType = 0;
27672775
SQLULEN columnSize = 0;
@@ -2821,7 +2829,8 @@ TYPED_TEST(FlightSQLODBCTestBase, SQLColumnsGetMetadataBySQLDescribeColODBC2) {
28212829
this->connect(SQL_OV_ODBC2);
28222830

28232831
SQLWCHAR columnName[1024];
2824-
SQLINTEGER bufCharLen = sizeof(columnName) / ODBC::GetSqlWCharSize();
2832+
SQLSMALLINT bufCharLen =
2833+
static_cast<SQLSMALLINT>(sizeof(columnName) / ODBC::GetSqlWCharSize());
28252834
SQLSMALLINT nameLength = 0;
28262835
SQLSMALLINT columnDataType = 0;
28272836
SQLULEN columnSize = 0;

‎cpp/src/arrow/flight/sql/odbc/tests/tables_test.cc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,8 @@ TYPED_TEST(FlightSQLODBCTestBase, SQLTablesGetMetadataBySQLDescribeCol) {
579579
this->connect();
580580

581581
SQLWCHAR columnName[1024];
582-
SQLINTEGER bufCharLen = sizeof(columnName) / ODBC::GetSqlWCharSize();
582+
SQLSMALLINT bufCharLen =
583+
static_cast<SQLSMALLINT>(sizeof(columnName) / ODBC::GetSqlWCharSize());
583584
SQLSMALLINT nameLength = 0;
584585
SQLSMALLINT columnDataType = 0;
585586
SQLULEN columnSize = 0;
@@ -630,7 +631,8 @@ TYPED_TEST(FlightSQLODBCTestBase, SQLTablesGetMetadataBySQLDescribeColODBC2) {
630631
this->connect(SQL_OV_ODBC2);
631632

632633
SQLWCHAR columnName[1024];
633-
SQLINTEGER bufCharLen = sizeof(columnName) / ODBC::GetSqlWCharSize();
634+
SQLSMALLINT bufCharLen =
635+
static_cast<SQLSMALLINT>(sizeof(columnName) / ODBC::GetSqlWCharSize());
634636
SQLSMALLINT nameLength = 0;
635637
SQLSMALLINT columnDataType = 0;
636638
SQLULEN columnSize = 0;

‎cpp/src/arrow/flight/sql/odbc/tests/type_info_test.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ void checkSQLDescribeCol(SQLHSTMT stmt, const SQLUSMALLINT columnIndex,
3737
const SQLSMALLINT& expectedDecimalDigits,
3838
const SQLSMALLINT& expectedNullable) {
3939
SQLWCHAR columnName[1024];
40-
SQLINTEGER bufCharLen = sizeof(columnName) / ODBC::GetSqlWCharSize();
40+
SQLSMALLINT bufCharLen =
41+
static_cast<SQLSMALLINT>(sizeof(columnName) / ODBC::GetSqlWCharSize());
4142
SQLSMALLINT nameLength = 0;
4243
SQLSMALLINT columnDataType = 0;
4344
SQLULEN columnSize = 0;

0 commit comments

Comments
 (0)