Skip to content

Use SqlWCharArrLen() for wide char array length on Linux #166

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
justing-bq merged 1 commit into from
Apr 2, 2026
Merged

Use SqlWCharArrLen() for wide char array length on Linux #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 12 additions & 1 deletion cpp/src/arrow/flight/sql/odbc/tests/odbc_test_suite.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,9 +510,20 @@ std::wstring GetStringColumnW(SQLHSTMT stmt, int col_id) {
return std::wstring(buf, buf + char_count);
}

size_t SqlWCharArrLen(const SQLWCHAR* str_val) {
if (!str_val) {
return 0;
}
const SQLWCHAR* p = str_val;
while (*p != 0) {
++p;
}
return static_cast<size_t>(p - str_val);
}

std::wstring ConvertToWString(const SQLWCHAR* str_val) {
#ifdef __linux__
size_t str_len = std::wcslen(reinterpret_cast<const wchar_t*>(str_val));
size_t str_len = SqlWCharArrLen(str_val);
#else
size_t str_len = std::wcslen(str_val);
#endif
Expand Down
7 changes: 6 additions & 1 deletion cpp/src/arrow/flight/sql/odbc/tests/odbc_test_suite.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
SQLWCHAR* name = name##_vec.data();
# define ASSIGN_SQLWCHAR_ARR_AND_LEN(name, wstring_var) \
ASSIGN_SQLWCHAR_ARR(name, wstring_var) \
size_t name##_len = std::wcslen(reinterpret_cast<const wchar_t*>(name));
size_t name##_len = SqlWCharArrLen(name);
#else
# define ASSIGN_SQLWCHAR_ARR(name, wstring_var) SQLWCHAR name[] = wstring_var;
# define ASSIGN_SQLWCHAR_ARR_AND_LEN(name, wstring_var) \
Expand Down Expand Up @@ -281,6 +281,11 @@ bool WriteDSN(Connection::ConnPropertyMap properties);
/// \return wstring
std::wstring GetStringColumnW(SQLHSTMT stmt, int col_id);

/// \brief Get length of wide char array.
/// \param[in] str_val Array of SQLWCHAR.
/// \return number of wide characters in array
size_t SqlWCharArrLen(const SQLWCHAR* str_val);

/// \brief Check wide char array and convert into wstring
/// \param[in] str_val Array of SQLWCHAR.
/// \return wstring
Expand Down
Loading