Skip to content

Return nameLengthPtr value as length in characters #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rscales merged 2 commits into from
Aug 26, 2025
Merged

Return nameLengthPtr value as length in characters #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c846644
Change SQLDescribeCol to return nameLengthPtr value as length in char…
rscales Aug 25, 2025
fafe1f5
Empty commit to force running workflows
rscales Aug 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cpp/src/arrow/flight/sql/odbc/odbc_api.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1435,7 +1435,8 @@ SQLRETURN SQLDescribeCol(SQLHSTMT stmt, SQLUSMALLINT columnNumber, SQLWCHAR* col
ird->GetField(columnNumber, SQL_DESC_NAME, columnName, bufferLength,
&outputLengthInt);
if (nameLengthPtr) {
*nameLengthPtr = static_cast<SQLSMALLINT>(outputLengthInt);
// returned length should be in characters
*nameLengthPtr = static_cast<SQLSMALLINT>(outputLengthInt / GetSqlWCharSize());
}
}

Expand Down
48 changes: 16 additions & 32 deletions cpp/src/arrow/flight/sql/odbc/tests/columns_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2431,11 +2431,9 @@ TEST_F(FlightSQLODBCMockTestBase, SQLDescribeColQueryAllDataTypesMetadata) {

EXPECT_EQ(ret, SQL_SUCCESS);

EXPECT_GT(nameLength, 0);
EXPECT_EQ(nameLength, wcslen(columnNames[i]));

// Returned nameLength is in bytes so convert to length in characters
size_t charCount = static_cast<size_t>(nameLength) / ODBC::GetSqlWCharSize();
std::wstring returned(columnName, columnName + charCount);
std::wstring returned(columnName, columnName + nameLength);
EXPECT_EQ(returned, columnNames[i]);
EXPECT_EQ(columnDataType, columnDataTypes[i]);
EXPECT_EQ(columnSize, 1024);
Expand Down Expand Up @@ -2515,11 +2513,9 @@ TEST_F(FlightSQLODBCRemoteTestBase, SQLDescribeColQueryAllDataTypesMetadata) {

EXPECT_EQ(ret, SQL_SUCCESS);

EXPECT_GT(nameLength, 0);
EXPECT_EQ(nameLength, wcslen(columnNames[i]));

// Returned nameLength is in bytes so convert to length in characters
size_t charCount = static_cast<size_t>(nameLength) / ODBC::GetSqlWCharSize();
std::wstring returned(columnName, columnName + charCount);
std::wstring returned(columnName, columnName + nameLength);
EXPECT_EQ(returned, columnNames[i]);
EXPECT_EQ(columnDataType, columnDataTypes[i]);
EXPECT_EQ(columnSize, columnSizes[i]);
Expand Down Expand Up @@ -2579,11 +2575,9 @@ TEST_F(FlightSQLODBCRemoteTestBase, SQLDescribeColODBCTestTableMetadata) {

EXPECT_EQ(ret, SQL_SUCCESS);

EXPECT_GT(nameLength, 0);
EXPECT_EQ(nameLength, wcslen(columnNames[i]));

// Returned nameLength is in bytes so convert to length in characters
size_t charCount = static_cast<size_t>(nameLength) / ODBC::GetSqlWCharSize();
std::wstring returned(columnName, columnName + charCount);
std::wstring returned(columnName, columnName + nameLength);
EXPECT_EQ(returned, columnNames[i]);
EXPECT_EQ(columnDataType, columnDataTypes[i]);
EXPECT_EQ(columnSize, columnSizes[i]);
Expand Down Expand Up @@ -2643,11 +2637,9 @@ TEST_F(FlightSQLODBCRemoteTestBase, SQLDescribeColODBCTestTableMetadataODBC2) {

EXPECT_EQ(ret, SQL_SUCCESS);

EXPECT_GT(nameLength, 0);
EXPECT_EQ(nameLength, wcslen(columnNames[i]));

// Returned nameLength is in bytes so convert to length in characters
size_t charCount = static_cast<size_t>(nameLength) / ODBC::GetSqlWCharSize();
std::wstring returned(columnName, columnName + charCount);
std::wstring returned(columnName, columnName + nameLength);
EXPECT_EQ(returned, columnNames[i]);
EXPECT_EQ(columnDataType, columnDataTypes[i]);
EXPECT_EQ(columnSize, columnSizes[i]);
Expand Down Expand Up @@ -2701,11 +2693,9 @@ TEST_F(FlightSQLODBCMockTestBase, SQLDescribeColAllTypesTableMetadata) {

EXPECT_EQ(ret, SQL_SUCCESS);

EXPECT_GT(nameLength, 0);
EXPECT_EQ(nameLength, wcslen(columnNames[i]));

// Returned nameLength is in bytes so convert to length in characters
size_t charCount = static_cast<size_t>(nameLength) / ODBC::GetSqlWCharSize();
std::wstring returned(columnName, columnName + charCount);
std::wstring returned(columnName, columnName + nameLength);
EXPECT_EQ(returned, columnNames[i]);
EXPECT_EQ(columnDataType, columnDataTypes[i]);
EXPECT_EQ(columnSize, columnSizes[i]);
Expand Down Expand Up @@ -2755,11 +2745,9 @@ TEST_F(FlightSQLODBCMockTestBase, SQLDescribeColUnicodeTableMetadata) {

EXPECT_EQ(ret, SQL_SUCCESS);

EXPECT_GT(nameLength, 0);
EXPECT_EQ(nameLength, wcslen(expectedColumnName));

// Returned nameLength is in bytes so convert to length in characters
size_t charCount = static_cast<size_t>(nameLength) / ODBC::GetSqlWCharSize();
std::wstring returned(columnName, columnName + charCount);
std::wstring returned(columnName, columnName + nameLength);
EXPECT_EQ(returned, expectedColumnName);
EXPECT_EQ(columnDataType, expectedColumnDataType);
EXPECT_EQ(columnSize, expectedColumnSize);
Expand Down Expand Up @@ -2810,11 +2798,9 @@ TYPED_TEST(FlightSQLODBCTestBase, SQLColumnsGetMetadataBySQLDescribeCol) {

EXPECT_EQ(ret, SQL_SUCCESS);

EXPECT_GT(nameLength, 0);
EXPECT_EQ(nameLength, wcslen(columnNames[i]));

// Returned nameLength is in bytes so convert to length in characters
size_t charCount = static_cast<size_t>(nameLength) / ODBC::GetSqlWCharSize();
std::wstring returned(columnName, columnName + charCount);
std::wstring returned(columnName, columnName + nameLength);
EXPECT_EQ(returned, columnNames[i]);
EXPECT_EQ(columnDataType, columnDataTypes[i]);
EXPECT_EQ(columnSize, columnSizes[i]);
Expand Down Expand Up @@ -2880,11 +2866,9 @@ TYPED_TEST(FlightSQLODBCTestBase, SQLColumnsGetMetadataBySQLDescribeColODBC2) {

EXPECT_EQ(ret, SQL_SUCCESS);

EXPECT_GT(nameLength, 0);
EXPECT_EQ(nameLength, wcslen(columnNames[i]));

// Returned nameLength is in bytes so convert to length in characters
size_t charCount = static_cast<size_t>(nameLength) / ODBC::GetSqlWCharSize();
std::wstring returned(columnName, columnName + charCount);
std::wstring returned(columnName, columnName + nameLength);
EXPECT_EQ(returned, columnNames[i]);
EXPECT_EQ(columnDataType, columnDataTypes[i]);
EXPECT_EQ(columnSize, columnSizes[i]);
Expand Down
12 changes: 4 additions & 8 deletions cpp/src/arrow/flight/sql/odbc/tests/tables_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,11 +607,9 @@ TYPED_TEST(FlightSQLODBCTestBase, SQLTablesGetMetadataBySQLDescribeCol) {

EXPECT_EQ(ret, SQL_SUCCESS);

EXPECT_GT(nameLength, 0);
EXPECT_EQ(nameLength, wcslen(columnNames[i]));

// Returned nameLength is in bytes so convert to length in characters
size_t charCount = static_cast<size_t>(nameLength) / ODBC::GetSqlWCharSize();
std::wstring returned(columnName, columnName + charCount);
std::wstring returned(columnName, columnName + nameLength);
EXPECT_EQ(returned, columnNames[i]);
EXPECT_EQ(columnDataType, columnDataTypes[i]);
EXPECT_EQ(columnSize, columnSizes[i]);
Expand Down Expand Up @@ -660,11 +658,9 @@ TYPED_TEST(FlightSQLODBCTestBase, SQLTablesGetMetadataBySQLDescribeColODBC2) {

EXPECT_EQ(ret, SQL_SUCCESS);

EXPECT_GT(nameLength, 0);
EXPECT_EQ(nameLength, wcslen(columnNames[i]));

// Returned nameLength is in bytes so convert to length in characters
size_t charCount = static_cast<size_t>(nameLength) / ODBC::GetSqlWCharSize();
std::wstring returned(columnName, columnName + charCount);
std::wstring returned(columnName, columnName + nameLength);
EXPECT_EQ(returned, columnNames[i]);
EXPECT_EQ(columnDataType, columnDataTypes[i]);
EXPECT_EQ(columnSize, columnSizes[i]);
Expand Down
6 changes: 2 additions & 4 deletions cpp/src/arrow/flight/sql/odbc/tests/type_info_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,9 @@ void checkSQLDescribeCol(SQLHSTMT stmt, const SQLUSMALLINT columnIndex,

EXPECT_EQ(ret, SQL_SUCCESS);

EXPECT_GT(nameLength, 0);
EXPECT_EQ(nameLength, expectedName.size());

// returned nameLength is in bytes so convert to length in characters
size_t charCount = static_cast<size_t>(nameLength) / ODBC::GetSqlWCharSize();
std::wstring returned(columnName, columnName + charCount);
std::wstring returned(columnName, columnName + nameLength);
EXPECT_EQ(returned, expectedName);
EXPECT_EQ(columnDataType, expectedDataType);
EXPECT_EQ(columnSize, expectedColumnSize);
Expand Down
Loading