Skip to content

GH-50852: [C++][FlightRPC][ODBC] Decode wide connection/descriptor string attributes with the wide decoder #50853

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

Open
vikrantpuppala wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −3
Open

GH-50852: [C++][FlightRPC][ODBC] Decode wide connection/descriptor string attributes with the wide decoder #50853

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
4 changes: 2 additions & 2 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_connection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,9 +465,9 @@ void ODBCConnection::SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
case SQL_ATTR_CURRENT_CATALOG: {
std::string catalog;
if (is_unicode) {
SetAttributeUTF8(value, string_length, catalog);
} else {
SetAttributeSQLWCHAR(value, string_length, catalog);
} else {
SetAttributeUTF8(value, string_length, catalog);
}
if (!spi_connection_->SetAttribute(Connection::CURRENT_CATALOG, catalog)) {
throw DriverException("Option value changed.", "01S02");
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_descriptor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ void ODBCDescriptor::SetField(SQLSMALLINT record_number, SQLSMALLINT field_ident
has_bindings_changed_ = true;
break;
case SQL_DESC_NAME:
SetAttributeUTF8(value, buffer_length, record.name);
SetAttributeSQLWCHAR(value, buffer_length, record.name);
has_bindings_changed_ = true;
break;
case SQL_DESC_OCTET_LENGTH:
Expand Down
19 changes: 19 additions & 0 deletions cpp/src/arrow/flight/sql/odbc/tests/connection_attr_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,4 +410,23 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrPacketSizeValid) {
#endif
}

// A multi-character catalog set through the wide entry point must round-trip
// intact.
TYPED_TEST(ConnectionAttributeTest, TestSQLSetGetConnectAttrCurrentCatalogWide) {
ASSIGN_SQLWCHAR_ARR_AND_LEN(catalog, L"my_catalog");

ASSERT_EQ(SQL_SUCCESS, SQLSetConnectAttr(this->conn, SQL_ATTR_CURRENT_CATALOG, catalog,
catalog_len * GetSqlWCharSize()));

SQLWCHAR out_str[kOdbcBufferSize];
SQLINTEGER out_str_len;
ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_CURRENT_CATALOG, out_str,
kOdbcBufferSize, &out_str_len));
// SQLGetConnectAttr returns the length in bytes; convert to characters.
out_str_len /= GetSqlWCharSize();
std::string out_catalog =
ODBC::SqlWcharToString(out_str, static_cast<SQLSMALLINT>(out_str_len));
EXPECT_EQ("my_catalog", out_catalog);
}

} // namespace arrow::flight::sql::odbc
Loading