Skip to content

Commit 5ecb4c9

Browse files
alinaliBQalinaliBQ
committed
Fix ODBC::GetSqlWCharSize() 
1 parent fcd2496 commit 5ecb4c9

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,7 +1244,7 @@ TYPED_TEST(ColumnsTest, SQLColAttributeGetCharacterLen) {
12441244
// Check length of character attribute
12451245
ASSERT_EQ(SQL_SUCCESS, SQLColAttribute(this->stmt, 1, SQL_DESC_BASE_COLUMN_NAME, 0, 0,
12461246
&character_attr_len, 0));
1247-
EXPECT_EQ(4 * ODBC::GetSqlWCharSize(), character_attr_len);
1247+
EXPECT_EQ(4 * GetSqlWCharSize(), character_attr_len);
12481248
}
12491249

12501250
TYPED_TEST(ColumnsTest, SQLColAttributeInvalidFieldId) {
@@ -2178,7 +2178,7 @@ TEST_F(ColumnsMockTest, TestSQLDescribeColValidateInput) {
21782178
SQLUSMALLINT negative_column = -1;
21792179
SQLWCHAR column_name[1024] = {0};
21802180
SQLSMALLINT buf_char_len =
2181-
static_cast<SQLSMALLINT>(sizeof(column_name) / ODBC::GetSqlWCharSize());
2181+
static_cast<SQLSMALLINT>(sizeof(column_name) / GetSqlWCharSize());
21822182
SQLSMALLINT name_length = 0;
21832183
SQLSMALLINT data_type = 0;
21842184
SQLULEN column_size = 0;
@@ -2219,7 +2219,7 @@ TEST_F(ColumnsMockTest, SQLDescribeColQueryAllDataTypesMetadata) {
22192219

22202220
SQLWCHAR column_name[1024];
22212221
SQLSMALLINT buf_char_len =
2222-
static_cast<SQLSMALLINT>(sizeof(column_name) / ODBC::GetSqlWCharSize());
2222+
static_cast<SQLSMALLINT>(sizeof(column_name) / GetSqlWCharSize());
22232223
SQLSMALLINT name_length = 0;
22242224
SQLSMALLINT column_data_type = 0;
22252225
SQLULEN column_size = 0;
@@ -2301,7 +2301,7 @@ TEST_F(ColumnsMockTest, SQLDescribeColQueryAllDataTypesMetadata) {
23012301
TEST_F(ColumnsRemoteTest, SQLDescribeColQueryAllDataTypesMetadata) {
23022302
SQLWCHAR column_name[1024];
23032303
SQLSMALLINT buf_char_len =
2304-
static_cast<SQLSMALLINT>(sizeof(column_name) / ODBC::GetSqlWCharSize());
2304+
static_cast<SQLSMALLINT>(sizeof(column_name) / GetSqlWCharSize());
23052305
SQLSMALLINT name_length = 0;
23062306
SQLSMALLINT column_data_type = 0;
23072307
SQLULEN column_size = 0;
@@ -2392,7 +2392,7 @@ TEST_F(ColumnsRemoteTest, SQLDescribeColODBCTestTableMetadata) {
23922392

23932393
SQLWCHAR column_name[1024];
23942394
SQLSMALLINT buf_char_len =
2395-
static_cast<SQLSMALLINT>(sizeof(column_name) / ODBC::GetSqlWCharSize());
2395+
static_cast<SQLSMALLINT>(sizeof(column_name) / GetSqlWCharSize());
23962396
SQLSMALLINT name_length = 0;
23972397
SQLSMALLINT column_data_type = 0;
23982398
SQLULEN column_size = 0;
@@ -2450,7 +2450,7 @@ TEST_F(ColumnsOdbcV2RemoteTest, SQLDescribeColODBCTestTableMetadataODBC2) {
24502450
// Test assumes there is a table $scratch.ODBCTest in remote server
24512451
SQLWCHAR column_name[1024];
24522452
SQLSMALLINT buf_char_len =
2453-
static_cast<SQLSMALLINT>(sizeof(column_name) / ODBC::GetSqlWCharSize());
2453+
static_cast<SQLSMALLINT>(sizeof(column_name) / GetSqlWCharSize());
24542454
SQLSMALLINT name_length = 0;
24552455
SQLSMALLINT column_data_type = 0;
24562456
SQLULEN column_size = 0;
@@ -2509,7 +2509,7 @@ TEST_F(ColumnsMockTest, SQLDescribeColAllTypesTableMetadata) {
25092509

25102510
SQLWCHAR column_name[1024];
25112511
SQLSMALLINT buf_char_len =
2512-
static_cast<SQLSMALLINT>(sizeof(column_name) / ODBC::GetSqlWCharSize());
2512+
static_cast<SQLSMALLINT>(sizeof(column_name) / GetSqlWCharSize());
25132513
SQLSMALLINT name_length = 0;
25142514
SQLSMALLINT column_data_type = 0;
25152515
SQLULEN column_size = 0;
@@ -2560,7 +2560,7 @@ TEST_F(ColumnsMockTest, SQLDescribeColUnicodeTableMetadata) {
25602560

25612561
SQLWCHAR column_name[1024];
25622562
SQLSMALLINT buf_char_len =
2563-
static_cast<SQLSMALLINT>(sizeof(column_name) / ODBC::GetSqlWCharSize());
2563+
static_cast<SQLSMALLINT>(sizeof(column_name) / GetSqlWCharSize());
25642564
SQLSMALLINT name_length = 0;
25652565
SQLSMALLINT column_data_type = 0;
25662566
SQLULEN column_size = 0;
@@ -2596,7 +2596,7 @@ TEST_F(ColumnsMockTest, SQLDescribeColUnicodeTableMetadata) {
25962596
TYPED_TEST(ColumnsTest, SQLColumnsGetMetadataBySQLDescribeCol) {
25972597
SQLWCHAR column_name[1024];
25982598
SQLSMALLINT buf_char_len =
2599-
static_cast<SQLSMALLINT>(sizeof(column_name) / ODBC::GetSqlWCharSize());
2599+
static_cast<SQLSMALLINT>(sizeof(column_name) / GetSqlWCharSize());
26002600
SQLSMALLINT name_length = 0;
26012601
SQLSMALLINT column_data_type = 0;
26022602
SQLULEN column_size = 0;
@@ -2659,7 +2659,7 @@ TYPED_TEST(ColumnsTest, SQLColumnsGetMetadataBySQLDescribeCol) {
26592659
TYPED_TEST(ColumnsOdbcV2Test, SQLColumnsGetMetadataBySQLDescribeColODBC2) {
26602660
SQLWCHAR column_name[1024];
26612661
SQLSMALLINT buf_char_len =
2662-
static_cast<SQLSMALLINT>(sizeof(column_name) / ODBC::GetSqlWCharSize());
2662+
static_cast<SQLSMALLINT>(sizeof(column_name) / GetSqlWCharSize());
26632663
SQLSMALLINT name_length = 0;
26642664
SQLSMALLINT column_data_type = 0;
26652665
SQLULEN column_size = 0;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1918,7 +1918,7 @@ TYPED_TEST(StatementTest, TestSQLMoreResultsInvalidFunctionSequence) {
19181918

19191919
TYPED_TEST(StatementTest, TestSQLNativeSqlReturnsInputString) {
19201920
SQLWCHAR buf[1024];
1921-
SQLINTEGER buf_char_len = sizeof(buf) / ODBC::GetSqlWCharSize();
1921+
SQLINTEGER buf_char_len = sizeof(buf) / GetSqlWCharSize();
19221922
SQLWCHAR input_str[] = L"SELECT * FROM mytable WHERE id == 1";
19231923
SQLINTEGER input_char_len = static_cast<SQLINTEGER>(wcslen(input_str));
19241924
SQLINTEGER output_char_len = 0;
@@ -1937,7 +1937,7 @@ TYPED_TEST(StatementTest, TestSQLNativeSqlReturnsInputString) {
19371937

19381938
TYPED_TEST(StatementTest, TestSQLNativeSqlReturnsNTSInputString) {
19391939
SQLWCHAR buf[1024];
1940-
SQLINTEGER buf_char_len = sizeof(buf) / ODBC::GetSqlWCharSize();
1940+
SQLINTEGER buf_char_len = sizeof(buf) / GetSqlWCharSize();
19411941
SQLWCHAR input_str[] = L"SELECT * FROM mytable WHERE id == 1";
19421942
SQLINTEGER input_char_len = static_cast<SQLINTEGER>(wcslen(input_str));
19431943
SQLINTEGER output_char_len = 0;
@@ -1974,7 +1974,7 @@ TYPED_TEST(StatementTest, TestSQLNativeSqlReturnsInputStringLength) {
19741974
TYPED_TEST(StatementTest, TestSQLNativeSqlReturnsTruncatedString) {
19751975
const SQLINTEGER small_buf_size_in_char = 11;
19761976
SQLWCHAR small_buf[small_buf_size_in_char];
1977-
SQLINTEGER small_buf_char_len = sizeof(small_buf) / ODBC::GetSqlWCharSize();
1977+
SQLINTEGER small_buf_char_len = sizeof(small_buf) / GetSqlWCharSize();
19781978
SQLWCHAR input_str[] = L"SELECT * FROM mytable WHERE id == 1";
19791979
SQLINTEGER input_char_len = static_cast<SQLINTEGER>(wcslen(input_str));
19801980
SQLINTEGER output_char_len = 0;
@@ -2001,7 +2001,7 @@ TYPED_TEST(StatementTest, TestSQLNativeSqlReturnsTruncatedString) {
20012001

20022002
TYPED_TEST(StatementTest, TestSQLNativeSqlReturnsErrorOnBadInputs) {
20032003
SQLWCHAR buf[1024];
2004-
SQLINTEGER buf_char_len = sizeof(buf) / ODBC::GetSqlWCharSize();
2004+
SQLINTEGER buf_char_len = sizeof(buf) / GetSqlWCharSize();
20052005
SQLWCHAR input_str[] = L"SELECT * FROM mytable WHERE id == 1";
20062006
SQLINTEGER input_char_len = static_cast<SQLINTEGER>(wcslen(input_str));
20072007
SQLINTEGER output_char_len = 0;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ std::wstring GetStringColumnW(SQLHSTMT stmt, int colId) {
5656
}
5757

5858
// indicator is in bytes, so convert to character count
59-
size_t char_count = static_cast<size_t>(len_indicator) / ODBC::GetSqlWCharSize();
59+
size_t char_count = static_cast<size_t>(len_indicator) / GetSqlWCharSize();
6060
return std::wstring(buf, buf + char_count);
6161
}
6262
} // namespace
@@ -509,7 +509,7 @@ TEST_F(TablesRemoteTest, SQLTablesGetSupportedTableTypes) {
509509
TYPED_TEST(TablesTest, SQLTablesGetMetadataBySQLDescribeCol) {
510510
SQLWCHAR column_name[1024];
511511
SQLSMALLINT buf_char_len =
512-
static_cast<SQLSMALLINT>(sizeof(column_name) / ODBC::GetSqlWCharSize());
512+
static_cast<SQLSMALLINT>(sizeof(column_name) / GetSqlWCharSize());
513513
SQLSMALLINT name_length = 0;
514514
SQLSMALLINT column_data_type = 0;
515515
SQLULEN column_size = 0;
@@ -556,7 +556,7 @@ TYPED_TEST(TablesTest, SQLTablesGetMetadataBySQLDescribeCol) {
556556
TYPED_TEST(TablesOdbcV2Test, SQLTablesGetMetadataBySQLDescribeColODBC2) {
557557
SQLWCHAR column_name[1024];
558558
SQLSMALLINT buf_char_len =
559-
static_cast<SQLSMALLINT>(sizeof(column_name) / ODBC::GetSqlWCharSize());
559+
static_cast<SQLSMALLINT>(sizeof(column_name) / GetSqlWCharSize());
560560
SQLSMALLINT name_length = 0;
561561
SQLSMALLINT column_data_type = 0;
562562
SQLULEN column_size = 0;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void CheckSQLDescribeCol(SQLHSTMT stmt, const SQLUSMALLINT column_index,
4848
const SQLSMALLINT& expected_nullable) {
4949
SQLWCHAR column_name[1024];
5050
SQLSMALLINT buf_char_len =
51-
static_cast<SQLSMALLINT>(sizeof(column_name) / ODBC::GetSqlWCharSize());
51+
static_cast<SQLSMALLINT>(sizeof(column_name) / GetSqlWCharSize());
5252
SQLSMALLINT name_length = 0;
5353
SQLSMALLINT column_data_type = 0;
5454
SQLULEN column_size = 0;

0 commit comments

Comments
 (0)