GH-47708: [C++][FlightRPC] Connection Attribute Support for ODBC#47772

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
lidavidm merged 1 commit into from
Nov 30, 2025
Merged

GH-47708: [C++][FlightRPC] Connection Attribute Support for ODBC #47772

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: 10 additions & 3 deletions cpp/src/arrow/flight/sql/odbc/odbc_api.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -714,16 +714,23 @@ SQLRETURN SQLGetConnectAttr(SQLHDBC conn, SQLINTEGER attribute, SQLPOINTER value
<< ", attribute: " << attribute << ", value_ptr: " << value_ptr
<< ", buffer_length: " << buffer_length << ", string_length_ptr: "
<< static_cast<const void*>(string_length_ptr);
// GH-47708 TODO: Implement SQLGetConnectAttr
return SQL_INVALID_HANDLE;

using ODBC::ODBCConnection;

return ODBCConnection::ExecuteWithDiagnostics(conn, SQL_ERROR, [=]() {
const bool is_unicode = true;
ODBCConnection* connection = reinterpret_cast<ODBCConnection*>(conn);
return connection->GetConnectAttr(attribute, value_ptr, buffer_length,
string_length_ptr, is_unicode);
});
}

SQLRETURN SQLSetConnectAttr(SQLHDBC conn, SQLINTEGER attr, SQLPOINTER value_ptr,
SQLINTEGER value_len) {
ARROW_LOG(DEBUG) << "SQLSetConnectAttrW called with conn: " << conn
<< ", attr: " << attr << ", value_ptr: " << value_ptr
<< ", value_len: " << value_len;
// GH-47708 TODO: Add tests for SQLSetConnectAttr

using ODBC::ODBCConnection;

return ODBCConnection::ExecuteWithDiagnostics(conn, SQL_ERROR, [=]() {
Expand Down
36 changes: 18 additions & 18 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_connection.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -528,58 +528,58 @@ void ODBCConnection::SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
}
}

void ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
SQLINTEGER buffer_length, SQLINTEGER* output_length,
bool is_unicode) {
SQLRETURN ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
SQLINTEGER buffer_length,
SQLINTEGER* output_length, bool is_unicode) {
boost::optional<Connection::Attribute> spi_attribute;

switch (attribute) {
// Internal connection attributes
#ifdef SQL_ATR_ASYNC_DBC_EVENT
#ifdef SQL_ATTR_ASYNC_DBC_EVENT
case SQL_ATTR_ASYNC_DBC_EVENT:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
#ifdef SQL_ATTR_ASYNC_DBC_FUNCTIONS_ENABLE
case SQL_ATTR_ASYNC_DBC_FUNCTIONS_ENABLE:
GetAttribute(static_cast<SQLUINTEGER>(SQL_ASYNC_DBC_ENABLE_OFF), value,
buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
#ifdef SQL_ATTR_ASYNC_PCALLBACK
#ifdef SQL_ATTR_ASYNC_DBC_PCALLBACK
case SQL_ATTR_ASYNC_DBC_PCALLBACK:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
#ifdef SQL_ATTR_ASYNC_DBC_PCONTEXT
case SQL_ATTR_ASYNC_DBC_PCONTEXT:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
case SQL_ATTR_ASYNC_ENABLE:
GetAttribute(static_cast<SQLULEN>(SQL_ASYNC_ENABLE_OFF), value, buffer_length,
output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_AUTO_IPD:
GetAttribute(static_cast<SQLUINTEGER>(SQL_FALSE), value, buffer_length,
output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_AUTOCOMMIT:
GetAttribute(static_cast<SQLUINTEGER>(SQL_AUTOCOMMIT_ON), value, buffer_length,
output_length);
return;
return SQL_SUCCESS;
#ifdef SQL_ATTR_DBC_INFO_TOKEN
case SQL_ATTR_DBC_INFO_TOKEN:
throw DriverException("Cannot read set-only attribute", "HY092");
#endif
case SQL_ATTR_ENLIST_IN_DTC:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_ODBC_CURSORS: // DM-only.
throw DriverException("Invalid attribute", "HY092");
case SQL_ATTR_QUIET_MODE:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_TRACE: // DM-only
throw DriverException("Invalid attribute", "HY092");
case SQL_ATTR_TRACEFILE:
Expand All@@ -589,17 +589,16 @@ void ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
case SQL_ATTR_TRANSLATE_OPTION:
throw DriverException("Optional feature not supported.", "HYC00");
case SQL_ATTR_TXN_ISOLATION:
throw DriverException("Optional feature not supported.", "HCY00");
throw DriverException("Optional feature not supported.", "HYC00");

case SQL_ATTR_CURRENT_CATALOG: {
const auto& catalog = spi_connection_->GetAttribute(Connection::CURRENT_CATALOG);
if (!catalog) {
throw DriverException("Optional feature not supported.", "HYC00");
}
const std::string& info_value = boost::get<std::string>(*catalog);
GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
return;
return GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
}

// These all are uint32_t attributes.
Expand DownExpand Up@@ -628,6 +627,7 @@ void ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,

GetAttribute(static_cast<SQLUINTEGER>(boost::get<uint32_t>(*spi_attribute)), value,
buffer_length, output_length);
return SQL_SUCCESS;
}

void ODBCConnection::Disconnect() {
Expand Down
5 changes: 3 additions & 2 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_connection.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,8 +57,9 @@ class ODBCConnection : public ODBCHandle<ODBCConnection> {
SQLSMALLINT* output_length, bool is_unicode);
void SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value, SQLINTEGER string_length,
bool isUnicode);
void GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value, SQLINTEGER buffer_length,
SQLINTEGER* output_length, bool is_unicode);
SQLRETURN GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
SQLINTEGER buffer_length, SQLINTEGER* output_length,
bool is_unicode);

~ODBCConnection() = default;

Expand Down
3 changes: 2 additions & 1 deletion cpp/src/arrow/flight/sql/odbc/tests/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,8 +34,9 @@ add_arrow_test(flight_sql_odbc_test
SOURCES
odbc_test_suite.cc
odbc_test_suite.h
statement_attr_test.cc
connection_attr_test.cc
connection_test.cc
statement_attr_test.cc
# Enable Protobuf cleanup after test execution
# GH-46889: move protobuf_test_util to a more common location
../../../../engine/substrait/protobuf_test_util.cc
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

GH-47708: [C++][FlightRPC] Connection Attribute Support for ODBC#47772

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
lidavidm merged 1 commit into from
Nov 30, 2025
Merged

GH-47708: [C++][FlightRPC] Connection Attribute Support for ODBC #47772

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: 10 additions & 3 deletions cpp/src/arrow/flight/sql/odbc/odbc_api.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -714,16 +714,23 @@ SQLRETURN SQLGetConnectAttr(SQLHDBC conn, SQLINTEGER attribute, SQLPOINTER value
<< ", attribute: " << attribute << ", value_ptr: " << value_ptr
<< ", buffer_length: " << buffer_length << ", string_length_ptr: "
<< static_cast<const void*>(string_length_ptr);
// GH-47708 TODO: Implement SQLGetConnectAttr
return SQL_INVALID_HANDLE;

using ODBC::ODBCConnection;

return ODBCConnection::ExecuteWithDiagnostics(conn, SQL_ERROR, [=]() {
const bool is_unicode = true;
ODBCConnection* connection = reinterpret_cast<ODBCConnection*>(conn);
return connection->GetConnectAttr(attribute, value_ptr, buffer_length,
string_length_ptr, is_unicode);
});
}

SQLRETURN SQLSetConnectAttr(SQLHDBC conn, SQLINTEGER attr, SQLPOINTER value_ptr,
SQLINTEGER value_len) {
ARROW_LOG(DEBUG) << "SQLSetConnectAttrW called with conn: " << conn
<< ", attr: " << attr << ", value_ptr: " << value_ptr
<< ", value_len: " << value_len;
// GH-47708 TODO: Add tests for SQLSetConnectAttr

using ODBC::ODBCConnection;

return ODBCConnection::ExecuteWithDiagnostics(conn, SQL_ERROR, [=]() {
Expand Down
36 changes: 18 additions & 18 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_connection.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -528,58 +528,58 @@ void ODBCConnection::SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
}
}

void ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
SQLINTEGER buffer_length, SQLINTEGER* output_length,
bool is_unicode) {
SQLRETURN ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
SQLINTEGER buffer_length,
SQLINTEGER* output_length, bool is_unicode) {
boost::optional<Connection::Attribute> spi_attribute;

switch (attribute) {
// Internal connection attributes
#ifdef SQL_ATR_ASYNC_DBC_EVENT
#ifdef SQL_ATTR_ASYNC_DBC_EVENT
case SQL_ATTR_ASYNC_DBC_EVENT:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
#ifdef SQL_ATTR_ASYNC_DBC_FUNCTIONS_ENABLE
case SQL_ATTR_ASYNC_DBC_FUNCTIONS_ENABLE:
GetAttribute(static_cast<SQLUINTEGER>(SQL_ASYNC_DBC_ENABLE_OFF), value,
buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
#ifdef SQL_ATTR_ASYNC_PCALLBACK
#ifdef SQL_ATTR_ASYNC_DBC_PCALLBACK
case SQL_ATTR_ASYNC_DBC_PCALLBACK:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
#ifdef SQL_ATTR_ASYNC_DBC_PCONTEXT
case SQL_ATTR_ASYNC_DBC_PCONTEXT:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
case SQL_ATTR_ASYNC_ENABLE:
GetAttribute(static_cast<SQLULEN>(SQL_ASYNC_ENABLE_OFF), value, buffer_length,
output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_AUTO_IPD:
GetAttribute(static_cast<SQLUINTEGER>(SQL_FALSE), value, buffer_length,
output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_AUTOCOMMIT:
GetAttribute(static_cast<SQLUINTEGER>(SQL_AUTOCOMMIT_ON), value, buffer_length,
output_length);
return;
return SQL_SUCCESS;
#ifdef SQL_ATTR_DBC_INFO_TOKEN
case SQL_ATTR_DBC_INFO_TOKEN:
throw DriverException("Cannot read set-only attribute", "HY092");
#endif
case SQL_ATTR_ENLIST_IN_DTC:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_ODBC_CURSORS: // DM-only.
throw DriverException("Invalid attribute", "HY092");
case SQL_ATTR_QUIET_MODE:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_TRACE: // DM-only
throw DriverException("Invalid attribute", "HY092");
case SQL_ATTR_TRACEFILE:
Expand All@@ -589,17 +589,16 @@ void ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
case SQL_ATTR_TRANSLATE_OPTION:
throw DriverException("Optional feature not supported.", "HYC00");
case SQL_ATTR_TXN_ISOLATION:
throw DriverException("Optional feature not supported.", "HCY00");
throw DriverException("Optional feature not supported.", "HYC00");

case SQL_ATTR_CURRENT_CATALOG: {
const auto& catalog = spi_connection_->GetAttribute(Connection::CURRENT_CATALOG);
if (!catalog) {
throw DriverException("Optional feature not supported.", "HYC00");
}
const std::string& info_value = boost::get<std::string>(*catalog);
GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
return;
return GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
}

// These all are uint32_t attributes.
Expand DownExpand Up@@ -628,6 +627,7 @@ void ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,

GetAttribute(static_cast<SQLUINTEGER>(boost::get<uint32_t>(*spi_attribute)), value,
buffer_length, output_length);
return SQL_SUCCESS;
}

void ODBCConnection::Disconnect() {
Expand Down
5 changes: 3 additions & 2 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_connection.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,8 +57,9 @@ class ODBCConnection : public ODBCHandle<ODBCConnection> {
SQLSMALLINT* output_length, bool is_unicode);
void SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value, SQLINTEGER string_length,
bool isUnicode);
void GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value, SQLINTEGER buffer_length,
SQLINTEGER* output_length, bool is_unicode);
SQLRETURN GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
SQLINTEGER buffer_length, SQLINTEGER* output_length,
bool is_unicode);

~ODBCConnection() = default;

Expand Down
3 changes: 2 additions & 1 deletion cpp/src/arrow/flight/sql/odbc/tests/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,8 +34,9 @@ add_arrow_test(flight_sql_odbc_test
SOURCES
odbc_test_suite.cc
odbc_test_suite.h
statement_attr_test.cc
connection_attr_test.cc
connection_test.cc
statement_attr_test.cc
# Enable Protobuf cleanup after test execution
# GH-46889: move protobuf_test_util to a more common location
../../../../engine/substrait/protobuf_test_util.cc
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

GH-47708: [C++][FlightRPC] Connection Attribute Support for ODBC#47772

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
lidavidm merged 1 commit into from
Nov 30, 2025
Merged

GH-47708: [C++][FlightRPC] Connection Attribute Support for ODBC #47772

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: 10 additions & 3 deletions cpp/src/arrow/flight/sql/odbc/odbc_api.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -714,16 +714,23 @@ SQLRETURN SQLGetConnectAttr(SQLHDBC conn, SQLINTEGER attribute, SQLPOINTER value
<< ", attribute: " << attribute << ", value_ptr: " << value_ptr
<< ", buffer_length: " << buffer_length << ", string_length_ptr: "
<< static_cast<const void*>(string_length_ptr);
// GH-47708 TODO: Implement SQLGetConnectAttr
return SQL_INVALID_HANDLE;

using ODBC::ODBCConnection;

return ODBCConnection::ExecuteWithDiagnostics(conn, SQL_ERROR, [=]() {
const bool is_unicode = true;
ODBCConnection* connection = reinterpret_cast<ODBCConnection*>(conn);
return connection->GetConnectAttr(attribute, value_ptr, buffer_length,
string_length_ptr, is_unicode);
});
}

SQLRETURN SQLSetConnectAttr(SQLHDBC conn, SQLINTEGER attr, SQLPOINTER value_ptr,
SQLINTEGER value_len) {
ARROW_LOG(DEBUG) << "SQLSetConnectAttrW called with conn: " << conn
<< ", attr: " << attr << ", value_ptr: " << value_ptr
<< ", value_len: " << value_len;
// GH-47708 TODO: Add tests for SQLSetConnectAttr

using ODBC::ODBCConnection;

return ODBCConnection::ExecuteWithDiagnostics(conn, SQL_ERROR, [=]() {
Expand Down
36 changes: 18 additions & 18 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_connection.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -528,58 +528,58 @@ void ODBCConnection::SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
}
}

void ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
SQLINTEGER buffer_length, SQLINTEGER* output_length,
bool is_unicode) {
SQLRETURN ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
SQLINTEGER buffer_length,
SQLINTEGER* output_length, bool is_unicode) {
boost::optional<Connection::Attribute> spi_attribute;

switch (attribute) {
// Internal connection attributes
#ifdef SQL_ATR_ASYNC_DBC_EVENT
#ifdef SQL_ATTR_ASYNC_DBC_EVENT
case SQL_ATTR_ASYNC_DBC_EVENT:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
#ifdef SQL_ATTR_ASYNC_DBC_FUNCTIONS_ENABLE
case SQL_ATTR_ASYNC_DBC_FUNCTIONS_ENABLE:
GetAttribute(static_cast<SQLUINTEGER>(SQL_ASYNC_DBC_ENABLE_OFF), value,
buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
#ifdef SQL_ATTR_ASYNC_PCALLBACK
#ifdef SQL_ATTR_ASYNC_DBC_PCALLBACK
case SQL_ATTR_ASYNC_DBC_PCALLBACK:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
#ifdef SQL_ATTR_ASYNC_DBC_PCONTEXT
case SQL_ATTR_ASYNC_DBC_PCONTEXT:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
case SQL_ATTR_ASYNC_ENABLE:
GetAttribute(static_cast<SQLULEN>(SQL_ASYNC_ENABLE_OFF), value, buffer_length,
output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_AUTO_IPD:
GetAttribute(static_cast<SQLUINTEGER>(SQL_FALSE), value, buffer_length,
output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_AUTOCOMMIT:
GetAttribute(static_cast<SQLUINTEGER>(SQL_AUTOCOMMIT_ON), value, buffer_length,
output_length);
return;
return SQL_SUCCESS;
#ifdef SQL_ATTR_DBC_INFO_TOKEN
case SQL_ATTR_DBC_INFO_TOKEN:
throw DriverException("Cannot read set-only attribute", "HY092");
#endif
case SQL_ATTR_ENLIST_IN_DTC:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_ODBC_CURSORS: // DM-only.
throw DriverException("Invalid attribute", "HY092");
case SQL_ATTR_QUIET_MODE:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_TRACE: // DM-only
throw DriverException("Invalid attribute", "HY092");
case SQL_ATTR_TRACEFILE:
Expand All@@ -589,17 +589,16 @@ void ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
case SQL_ATTR_TRANSLATE_OPTION:
throw DriverException("Optional feature not supported.", "HYC00");
case SQL_ATTR_TXN_ISOLATION:
throw DriverException("Optional feature not supported.", "HCY00");
throw DriverException("Optional feature not supported.", "HYC00");

case SQL_ATTR_CURRENT_CATALOG: {
const auto& catalog = spi_connection_->GetAttribute(Connection::CURRENT_CATALOG);
if (!catalog) {
throw DriverException("Optional feature not supported.", "HYC00");
}
const std::string& info_value = boost::get<std::string>(*catalog);
GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
return;
return GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
}

// These all are uint32_t attributes.
Expand DownExpand Up@@ -628,6 +627,7 @@ void ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,

GetAttribute(static_cast<SQLUINTEGER>(boost::get<uint32_t>(*spi_attribute)), value,
buffer_length, output_length);
return SQL_SUCCESS;
}

void ODBCConnection::Disconnect() {
Expand Down
5 changes: 3 additions & 2 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_connection.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,8 +57,9 @@ class ODBCConnection : public ODBCHandle<ODBCConnection> {
SQLSMALLINT* output_length, bool is_unicode);
void SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value, SQLINTEGER string_length,
bool isUnicode);
void GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value, SQLINTEGER buffer_length,
SQLINTEGER* output_length, bool is_unicode);
SQLRETURN GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
SQLINTEGER buffer_length, SQLINTEGER* output_length,
bool is_unicode);

~ODBCConnection() = default;

Expand Down
3 changes: 2 additions & 1 deletion cpp/src/arrow/flight/sql/odbc/tests/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,8 +34,9 @@ add_arrow_test(flight_sql_odbc_test
SOURCES
odbc_test_suite.cc
odbc_test_suite.h
statement_attr_test.cc
connection_attr_test.cc
connection_test.cc
statement_attr_test.cc
# Enable Protobuf cleanup after test execution
# GH-46889: move protobuf_test_util to a more common location
../../../../engine/substrait/protobuf_test_util.cc
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

GH-47708: [C++][FlightRPC] Connection Attribute Support for ODBC#47772

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
lidavidm merged 1 commit into from
Nov 30, 2025
Merged

GH-47708: [C++][FlightRPC] Connection Attribute Support for ODBC #47772

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: 10 additions & 3 deletions cpp/src/arrow/flight/sql/odbc/odbc_api.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -714,16 +714,23 @@ SQLRETURN SQLGetConnectAttr(SQLHDBC conn, SQLINTEGER attribute, SQLPOINTER value
<< ", attribute: " << attribute << ", value_ptr: " << value_ptr
<< ", buffer_length: " << buffer_length << ", string_length_ptr: "
<< static_cast<const void*>(string_length_ptr);
// GH-47708 TODO: Implement SQLGetConnectAttr
return SQL_INVALID_HANDLE;

using ODBC::ODBCConnection;

return ODBCConnection::ExecuteWithDiagnostics(conn, SQL_ERROR, [=]() {
const bool is_unicode = true;
ODBCConnection* connection = reinterpret_cast<ODBCConnection*>(conn);
return connection->GetConnectAttr(attribute, value_ptr, buffer_length,
string_length_ptr, is_unicode);
});
}

SQLRETURN SQLSetConnectAttr(SQLHDBC conn, SQLINTEGER attr, SQLPOINTER value_ptr,
SQLINTEGER value_len) {
ARROW_LOG(DEBUG) << "SQLSetConnectAttrW called with conn: " << conn
<< ", attr: " << attr << ", value_ptr: " << value_ptr
<< ", value_len: " << value_len;
// GH-47708 TODO: Add tests for SQLSetConnectAttr

using ODBC::ODBCConnection;

return ODBCConnection::ExecuteWithDiagnostics(conn, SQL_ERROR, [=]() {
Expand Down
36 changes: 18 additions & 18 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_connection.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -528,58 +528,58 @@ void ODBCConnection::SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
}
}

void ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
SQLINTEGER buffer_length, SQLINTEGER* output_length,
bool is_unicode) {
SQLRETURN ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
SQLINTEGER buffer_length,
SQLINTEGER* output_length, bool is_unicode) {
boost::optional<Connection::Attribute> spi_attribute;

switch (attribute) {
// Internal connection attributes
#ifdef SQL_ATR_ASYNC_DBC_EVENT
#ifdef SQL_ATTR_ASYNC_DBC_EVENT
case SQL_ATTR_ASYNC_DBC_EVENT:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
#ifdef SQL_ATTR_ASYNC_DBC_FUNCTIONS_ENABLE
case SQL_ATTR_ASYNC_DBC_FUNCTIONS_ENABLE:
GetAttribute(static_cast<SQLUINTEGER>(SQL_ASYNC_DBC_ENABLE_OFF), value,
buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
#ifdef SQL_ATTR_ASYNC_PCALLBACK
#ifdef SQL_ATTR_ASYNC_DBC_PCALLBACK
case SQL_ATTR_ASYNC_DBC_PCALLBACK:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
#ifdef SQL_ATTR_ASYNC_DBC_PCONTEXT
case SQL_ATTR_ASYNC_DBC_PCONTEXT:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
case SQL_ATTR_ASYNC_ENABLE:
GetAttribute(static_cast<SQLULEN>(SQL_ASYNC_ENABLE_OFF), value, buffer_length,
output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_AUTO_IPD:
GetAttribute(static_cast<SQLUINTEGER>(SQL_FALSE), value, buffer_length,
output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_AUTOCOMMIT:
GetAttribute(static_cast<SQLUINTEGER>(SQL_AUTOCOMMIT_ON), value, buffer_length,
output_length);
return;
return SQL_SUCCESS;
#ifdef SQL_ATTR_DBC_INFO_TOKEN
case SQL_ATTR_DBC_INFO_TOKEN:
throw DriverException("Cannot read set-only attribute", "HY092");
#endif
case SQL_ATTR_ENLIST_IN_DTC:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_ODBC_CURSORS: // DM-only.
throw DriverException("Invalid attribute", "HY092");
case SQL_ATTR_QUIET_MODE:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_TRACE: // DM-only
throw DriverException("Invalid attribute", "HY092");
case SQL_ATTR_TRACEFILE:
Expand All@@ -589,17 +589,16 @@ void ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
case SQL_ATTR_TRANSLATE_OPTION:
throw DriverException("Optional feature not supported.", "HYC00");
case SQL_ATTR_TXN_ISOLATION:
throw DriverException("Optional feature not supported.", "HCY00");
throw DriverException("Optional feature not supported.", "HYC00");

case SQL_ATTR_CURRENT_CATALOG: {
const auto& catalog = spi_connection_->GetAttribute(Connection::CURRENT_CATALOG);
if (!catalog) {
throw DriverException("Optional feature not supported.", "HYC00");
}
const std::string& info_value = boost::get<std::string>(*catalog);
GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
return;
return GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
}

// These all are uint32_t attributes.
Expand DownExpand Up@@ -628,6 +627,7 @@ void ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,

GetAttribute(static_cast<SQLUINTEGER>(boost::get<uint32_t>(*spi_attribute)), value,
buffer_length, output_length);
return SQL_SUCCESS;
}

void ODBCConnection::Disconnect() {
Expand Down
5 changes: 3 additions & 2 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_connection.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,8 +57,9 @@ class ODBCConnection : public ODBCHandle<ODBCConnection> {
SQLSMALLINT* output_length, bool is_unicode);
void SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value, SQLINTEGER string_length,
bool isUnicode);
void GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value, SQLINTEGER buffer_length,
SQLINTEGER* output_length, bool is_unicode);
SQLRETURN GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
SQLINTEGER buffer_length, SQLINTEGER* output_length,
bool is_unicode);

~ODBCConnection() = default;

Expand Down
3 changes: 2 additions & 1 deletion cpp/src/arrow/flight/sql/odbc/tests/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,8 +34,9 @@ add_arrow_test(flight_sql_odbc_test
SOURCES
odbc_test_suite.cc
odbc_test_suite.h
statement_attr_test.cc
connection_attr_test.cc
connection_test.cc
statement_attr_test.cc
# Enable Protobuf cleanup after test execution
# GH-46889: move protobuf_test_util to a more common location
../../../../engine/substrait/protobuf_test_util.cc
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

GH-47708: [C++][FlightRPC] Connection Attribute Support for ODBC#47772

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
lidavidm merged 1 commit into from
Nov 30, 2025
Merged

GH-47708: [C++][FlightRPC] Connection Attribute Support for ODBC #47772

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: 10 additions & 3 deletions cpp/src/arrow/flight/sql/odbc/odbc_api.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -714,16 +714,23 @@ SQLRETURN SQLGetConnectAttr(SQLHDBC conn, SQLINTEGER attribute, SQLPOINTER value
<< ", attribute: " << attribute << ", value_ptr: " << value_ptr
<< ", buffer_length: " << buffer_length << ", string_length_ptr: "
<< static_cast<const void*>(string_length_ptr);
// GH-47708 TODO: Implement SQLGetConnectAttr
return SQL_INVALID_HANDLE;

using ODBC::ODBCConnection;

return ODBCConnection::ExecuteWithDiagnostics(conn, SQL_ERROR, [=]() {
const bool is_unicode = true;
ODBCConnection* connection = reinterpret_cast<ODBCConnection*>(conn);
return connection->GetConnectAttr(attribute, value_ptr, buffer_length,
string_length_ptr, is_unicode);
});
}

SQLRETURN SQLSetConnectAttr(SQLHDBC conn, SQLINTEGER attr, SQLPOINTER value_ptr,
SQLINTEGER value_len) {
ARROW_LOG(DEBUG) << "SQLSetConnectAttrW called with conn: " << conn
<< ", attr: " << attr << ", value_ptr: " << value_ptr
<< ", value_len: " << value_len;
// GH-47708 TODO: Add tests for SQLSetConnectAttr

using ODBC::ODBCConnection;

return ODBCConnection::ExecuteWithDiagnostics(conn, SQL_ERROR, [=]() {
Expand Down
36 changes: 18 additions & 18 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_connection.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -528,58 +528,58 @@ void ODBCConnection::SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
}
}

void ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
SQLINTEGER buffer_length, SQLINTEGER* output_length,
bool is_unicode) {
SQLRETURN ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
SQLINTEGER buffer_length,
SQLINTEGER* output_length, bool is_unicode) {
boost::optional<Connection::Attribute> spi_attribute;

switch (attribute) {
// Internal connection attributes
#ifdef SQL_ATR_ASYNC_DBC_EVENT
#ifdef SQL_ATTR_ASYNC_DBC_EVENT
case SQL_ATTR_ASYNC_DBC_EVENT:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
#ifdef SQL_ATTR_ASYNC_DBC_FUNCTIONS_ENABLE
case SQL_ATTR_ASYNC_DBC_FUNCTIONS_ENABLE:
GetAttribute(static_cast<SQLUINTEGER>(SQL_ASYNC_DBC_ENABLE_OFF), value,
buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
#ifdef SQL_ATTR_ASYNC_PCALLBACK
#ifdef SQL_ATTR_ASYNC_DBC_PCALLBACK
case SQL_ATTR_ASYNC_DBC_PCALLBACK:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
#ifdef SQL_ATTR_ASYNC_DBC_PCONTEXT
case SQL_ATTR_ASYNC_DBC_PCONTEXT:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
case SQL_ATTR_ASYNC_ENABLE:
GetAttribute(static_cast<SQLULEN>(SQL_ASYNC_ENABLE_OFF), value, buffer_length,
output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_AUTO_IPD:
GetAttribute(static_cast<SQLUINTEGER>(SQL_FALSE), value, buffer_length,
output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_AUTOCOMMIT:
GetAttribute(static_cast<SQLUINTEGER>(SQL_AUTOCOMMIT_ON), value, buffer_length,
output_length);
return;
return SQL_SUCCESS;
#ifdef SQL_ATTR_DBC_INFO_TOKEN
case SQL_ATTR_DBC_INFO_TOKEN:
throw DriverException("Cannot read set-only attribute", "HY092");
#endif
case SQL_ATTR_ENLIST_IN_DTC:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_ODBC_CURSORS: // DM-only.
throw DriverException("Invalid attribute", "HY092");
case SQL_ATTR_QUIET_MODE:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_TRACE: // DM-only
throw DriverException("Invalid attribute", "HY092");
case SQL_ATTR_TRACEFILE:
Expand All@@ -589,17 +589,16 @@ void ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
case SQL_ATTR_TRANSLATE_OPTION:
throw DriverException("Optional feature not supported.", "HYC00");
case SQL_ATTR_TXN_ISOLATION:
throw DriverException("Optional feature not supported.", "HCY00");
throw DriverException("Optional feature not supported.", "HYC00");

case SQL_ATTR_CURRENT_CATALOG: {
const auto& catalog = spi_connection_->GetAttribute(Connection::CURRENT_CATALOG);
if (!catalog) {
throw DriverException("Optional feature not supported.", "HYC00");
}
const std::string& info_value = boost::get<std::string>(*catalog);
GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
return;
return GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
}

// These all are uint32_t attributes.
Expand DownExpand Up@@ -628,6 +627,7 @@ void ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,

GetAttribute(static_cast<SQLUINTEGER>(boost::get<uint32_t>(*spi_attribute)), value,
buffer_length, output_length);
return SQL_SUCCESS;
}

void ODBCConnection::Disconnect() {
Expand Down
5 changes: 3 additions & 2 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_connection.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,8 +57,9 @@ class ODBCConnection : public ODBCHandle<ODBCConnection> {
SQLSMALLINT* output_length, bool is_unicode);
void SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value, SQLINTEGER string_length,
bool isUnicode);
void GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value, SQLINTEGER buffer_length,
SQLINTEGER* output_length, bool is_unicode);
SQLRETURN GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
SQLINTEGER buffer_length, SQLINTEGER* output_length,
bool is_unicode);

~ODBCConnection() = default;

Expand Down
3 changes: 2 additions & 1 deletion cpp/src/arrow/flight/sql/odbc/tests/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,8 +34,9 @@ add_arrow_test(flight_sql_odbc_test
SOURCES
odbc_test_suite.cc
odbc_test_suite.h
statement_attr_test.cc
connection_attr_test.cc
connection_test.cc
statement_attr_test.cc
# Enable Protobuf cleanup after test execution
# GH-46889: move protobuf_test_util to a more common location
../../../../engine/substrait/protobuf_test_util.cc
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

GH-47708: [C++][FlightRPC] Connection Attribute Support for ODBC#47772

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
lidavidm merged 1 commit into from
Nov 30, 2025
Merged

GH-47708: [C++][FlightRPC] Connection Attribute Support for ODBC #47772

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: 10 additions & 3 deletions cpp/src/arrow/flight/sql/odbc/odbc_api.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -714,16 +714,23 @@ SQLRETURN SQLGetConnectAttr(SQLHDBC conn, SQLINTEGER attribute, SQLPOINTER value
<< ", attribute: " << attribute << ", value_ptr: " << value_ptr
<< ", buffer_length: " << buffer_length << ", string_length_ptr: "
<< static_cast<const void*>(string_length_ptr);
// GH-47708 TODO: Implement SQLGetConnectAttr
return SQL_INVALID_HANDLE;

using ODBC::ODBCConnection;

return ODBCConnection::ExecuteWithDiagnostics(conn, SQL_ERROR, [=]() {
const bool is_unicode = true;
ODBCConnection* connection = reinterpret_cast<ODBCConnection*>(conn);
return connection->GetConnectAttr(attribute, value_ptr, buffer_length,
string_length_ptr, is_unicode);
});
}

SQLRETURN SQLSetConnectAttr(SQLHDBC conn, SQLINTEGER attr, SQLPOINTER value_ptr,
SQLINTEGER value_len) {
ARROW_LOG(DEBUG) << "SQLSetConnectAttrW called with conn: " << conn
<< ", attr: " << attr << ", value_ptr: " << value_ptr
<< ", value_len: " << value_len;
// GH-47708 TODO: Add tests for SQLSetConnectAttr

using ODBC::ODBCConnection;

return ODBCConnection::ExecuteWithDiagnostics(conn, SQL_ERROR, [=]() {
Expand Down
36 changes: 18 additions & 18 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_connection.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -528,58 +528,58 @@ void ODBCConnection::SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
}
}

void ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
SQLINTEGER buffer_length, SQLINTEGER* output_length,
bool is_unicode) {
SQLRETURN ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
SQLINTEGER buffer_length,
SQLINTEGER* output_length, bool is_unicode) {
boost::optional<Connection::Attribute> spi_attribute;

switch (attribute) {
// Internal connection attributes
#ifdef SQL_ATR_ASYNC_DBC_EVENT
#ifdef SQL_ATTR_ASYNC_DBC_EVENT
case SQL_ATTR_ASYNC_DBC_EVENT:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
#ifdef SQL_ATTR_ASYNC_DBC_FUNCTIONS_ENABLE
case SQL_ATTR_ASYNC_DBC_FUNCTIONS_ENABLE:
GetAttribute(static_cast<SQLUINTEGER>(SQL_ASYNC_DBC_ENABLE_OFF), value,
buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
#ifdef SQL_ATTR_ASYNC_PCALLBACK
#ifdef SQL_ATTR_ASYNC_DBC_PCALLBACK
case SQL_ATTR_ASYNC_DBC_PCALLBACK:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
#ifdef SQL_ATTR_ASYNC_DBC_PCONTEXT
case SQL_ATTR_ASYNC_DBC_PCONTEXT:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
case SQL_ATTR_ASYNC_ENABLE:
GetAttribute(static_cast<SQLULEN>(SQL_ASYNC_ENABLE_OFF), value, buffer_length,
output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_AUTO_IPD:
GetAttribute(static_cast<SQLUINTEGER>(SQL_FALSE), value, buffer_length,
output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_AUTOCOMMIT:
GetAttribute(static_cast<SQLUINTEGER>(SQL_AUTOCOMMIT_ON), value, buffer_length,
output_length);
return;
return SQL_SUCCESS;
#ifdef SQL_ATTR_DBC_INFO_TOKEN
case SQL_ATTR_DBC_INFO_TOKEN:
throw DriverException("Cannot read set-only attribute", "HY092");
#endif
case SQL_ATTR_ENLIST_IN_DTC:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_ODBC_CURSORS: // DM-only.
throw DriverException("Invalid attribute", "HY092");
case SQL_ATTR_QUIET_MODE:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_TRACE: // DM-only
throw DriverException("Invalid attribute", "HY092");
case SQL_ATTR_TRACEFILE:
Expand All@@ -589,17 +589,16 @@ void ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
case SQL_ATTR_TRANSLATE_OPTION:
throw DriverException("Optional feature not supported.", "HYC00");
case SQL_ATTR_TXN_ISOLATION:
throw DriverException("Optional feature not supported.", "HCY00");
throw DriverException("Optional feature not supported.", "HYC00");

case SQL_ATTR_CURRENT_CATALOG: {
const auto& catalog = spi_connection_->GetAttribute(Connection::CURRENT_CATALOG);
if (!catalog) {
throw DriverException("Optional feature not supported.", "HYC00");
}
const std::string& info_value = boost::get<std::string>(*catalog);
GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
return;
return GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
}

// These all are uint32_t attributes.
Expand DownExpand Up@@ -628,6 +627,7 @@ void ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,

GetAttribute(static_cast<SQLUINTEGER>(boost::get<uint32_t>(*spi_attribute)), value,
buffer_length, output_length);
return SQL_SUCCESS;
}

void ODBCConnection::Disconnect() {
Expand Down
5 changes: 3 additions & 2 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_connection.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,8 +57,9 @@ class ODBCConnection : public ODBCHandle<ODBCConnection> {
SQLSMALLINT* output_length, bool is_unicode);
void SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value, SQLINTEGER string_length,
bool isUnicode);
void GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value, SQLINTEGER buffer_length,
SQLINTEGER* output_length, bool is_unicode);
SQLRETURN GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
SQLINTEGER buffer_length, SQLINTEGER* output_length,
bool is_unicode);

~ODBCConnection() = default;

Expand Down
3 changes: 2 additions & 1 deletion cpp/src/arrow/flight/sql/odbc/tests/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,8 +34,9 @@ add_arrow_test(flight_sql_odbc_test
SOURCES
odbc_test_suite.cc
odbc_test_suite.h
statement_attr_test.cc
connection_attr_test.cc
connection_test.cc
statement_attr_test.cc
# Enable Protobuf cleanup after test execution
# GH-46889: move protobuf_test_util to a more common location
../../../../engine/substrait/protobuf_test_util.cc
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

GH-47708: [C++][FlightRPC] Connection Attribute Support for ODBC#47772

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
lidavidm merged 1 commit into from
Nov 30, 2025
Merged

GH-47708: [C++][FlightRPC] Connection Attribute Support for ODBC #47772

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: 10 additions & 3 deletions cpp/src/arrow/flight/sql/odbc/odbc_api.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -714,16 +714,23 @@ SQLRETURN SQLGetConnectAttr(SQLHDBC conn, SQLINTEGER attribute, SQLPOINTER value
<< ", attribute: " << attribute << ", value_ptr: " << value_ptr
<< ", buffer_length: " << buffer_length << ", string_length_ptr: "
<< static_cast<const void*>(string_length_ptr);
// GH-47708 TODO: Implement SQLGetConnectAttr
return SQL_INVALID_HANDLE;

using ODBC::ODBCConnection;

return ODBCConnection::ExecuteWithDiagnostics(conn, SQL_ERROR, [=]() {
const bool is_unicode = true;
ODBCConnection* connection = reinterpret_cast<ODBCConnection*>(conn);
return connection->GetConnectAttr(attribute, value_ptr, buffer_length,
string_length_ptr, is_unicode);
});
}

SQLRETURN SQLSetConnectAttr(SQLHDBC conn, SQLINTEGER attr, SQLPOINTER value_ptr,
SQLINTEGER value_len) {
ARROW_LOG(DEBUG) << "SQLSetConnectAttrW called with conn: " << conn
<< ", attr: " << attr << ", value_ptr: " << value_ptr
<< ", value_len: " << value_len;
// GH-47708 TODO: Add tests for SQLSetConnectAttr

using ODBC::ODBCConnection;

return ODBCConnection::ExecuteWithDiagnostics(conn, SQL_ERROR, [=]() {
Expand Down
36 changes: 18 additions & 18 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_connection.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -528,58 +528,58 @@ void ODBCConnection::SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
}
}

void ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
SQLINTEGER buffer_length, SQLINTEGER* output_length,
bool is_unicode) {
SQLRETURN ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
SQLINTEGER buffer_length,
SQLINTEGER* output_length, bool is_unicode) {
boost::optional<Connection::Attribute> spi_attribute;

switch (attribute) {
// Internal connection attributes
#ifdef SQL_ATR_ASYNC_DBC_EVENT
#ifdef SQL_ATTR_ASYNC_DBC_EVENT
case SQL_ATTR_ASYNC_DBC_EVENT:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
#ifdef SQL_ATTR_ASYNC_DBC_FUNCTIONS_ENABLE
case SQL_ATTR_ASYNC_DBC_FUNCTIONS_ENABLE:
GetAttribute(static_cast<SQLUINTEGER>(SQL_ASYNC_DBC_ENABLE_OFF), value,
buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
#ifdef SQL_ATTR_ASYNC_PCALLBACK
#ifdef SQL_ATTR_ASYNC_DBC_PCALLBACK
case SQL_ATTR_ASYNC_DBC_PCALLBACK:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
#ifdef SQL_ATTR_ASYNC_DBC_PCONTEXT
case SQL_ATTR_ASYNC_DBC_PCONTEXT:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
case SQL_ATTR_ASYNC_ENABLE:
GetAttribute(static_cast<SQLULEN>(SQL_ASYNC_ENABLE_OFF), value, buffer_length,
output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_AUTO_IPD:
GetAttribute(static_cast<SQLUINTEGER>(SQL_FALSE), value, buffer_length,
output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_AUTOCOMMIT:
GetAttribute(static_cast<SQLUINTEGER>(SQL_AUTOCOMMIT_ON), value, buffer_length,
output_length);
return;
return SQL_SUCCESS;
#ifdef SQL_ATTR_DBC_INFO_TOKEN
case SQL_ATTR_DBC_INFO_TOKEN:
throw DriverException("Cannot read set-only attribute", "HY092");
#endif
case SQL_ATTR_ENLIST_IN_DTC:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_ODBC_CURSORS: // DM-only.
throw DriverException("Invalid attribute", "HY092");
case SQL_ATTR_QUIET_MODE:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_TRACE: // DM-only
throw DriverException("Invalid attribute", "HY092");
case SQL_ATTR_TRACEFILE:
Expand All@@ -589,17 +589,16 @@ void ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
case SQL_ATTR_TRANSLATE_OPTION:
throw DriverException("Optional feature not supported.", "HYC00");
case SQL_ATTR_TXN_ISOLATION:
throw DriverException("Optional feature not supported.", "HCY00");
throw DriverException("Optional feature not supported.", "HYC00");

case SQL_ATTR_CURRENT_CATALOG: {
const auto& catalog = spi_connection_->GetAttribute(Connection::CURRENT_CATALOG);
if (!catalog) {
throw DriverException("Optional feature not supported.", "HYC00");
}
const std::string& info_value = boost::get<std::string>(*catalog);
GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
return;
return GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
}

// These all are uint32_t attributes.
Expand DownExpand Up@@ -628,6 +627,7 @@ void ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,

GetAttribute(static_cast<SQLUINTEGER>(boost::get<uint32_t>(*spi_attribute)), value,
buffer_length, output_length);
return SQL_SUCCESS;
}

void ODBCConnection::Disconnect() {
Expand Down
5 changes: 3 additions & 2 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_connection.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,8 +57,9 @@ class ODBCConnection : public ODBCHandle<ODBCConnection> {
SQLSMALLINT* output_length, bool is_unicode);
void SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value, SQLINTEGER string_length,
bool isUnicode);
void GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value, SQLINTEGER buffer_length,
SQLINTEGER* output_length, bool is_unicode);
SQLRETURN GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
SQLINTEGER buffer_length, SQLINTEGER* output_length,
bool is_unicode);

~ODBCConnection() = default;

Expand Down
3 changes: 2 additions & 1 deletion cpp/src/arrow/flight/sql/odbc/tests/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,8 +34,9 @@ add_arrow_test(flight_sql_odbc_test
SOURCES
odbc_test_suite.cc
odbc_test_suite.h
statement_attr_test.cc
connection_attr_test.cc
connection_test.cc
statement_attr_test.cc
# Enable Protobuf cleanup after test execution
# GH-46889: move protobuf_test_util to a more common location
../../../../engine/substrait/protobuf_test_util.cc
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

GH-47708: [C++][FlightRPC] Connection Attribute Support for ODBC#47772

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
lidavidm merged 1 commit into from
Nov 30, 2025
Merged

GH-47708: [C++][FlightRPC] Connection Attribute Support for ODBC #47772

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: 10 additions & 3 deletions cpp/src/arrow/flight/sql/odbc/odbc_api.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -714,16 +714,23 @@ SQLRETURN SQLGetConnectAttr(SQLHDBC conn, SQLINTEGER attribute, SQLPOINTER value
<< ", attribute: " << attribute << ", value_ptr: " << value_ptr
<< ", buffer_length: " << buffer_length << ", string_length_ptr: "
<< static_cast<const void*>(string_length_ptr);
// GH-47708 TODO: Implement SQLGetConnectAttr
return SQL_INVALID_HANDLE;

using ODBC::ODBCConnection;

return ODBCConnection::ExecuteWithDiagnostics(conn, SQL_ERROR, [=]() {
const bool is_unicode = true;
ODBCConnection* connection = reinterpret_cast<ODBCConnection*>(conn);
return connection->GetConnectAttr(attribute, value_ptr, buffer_length,
string_length_ptr, is_unicode);
});
}

SQLRETURN SQLSetConnectAttr(SQLHDBC conn, SQLINTEGER attr, SQLPOINTER value_ptr,
SQLINTEGER value_len) {
ARROW_LOG(DEBUG) << "SQLSetConnectAttrW called with conn: " << conn
<< ", attr: " << attr << ", value_ptr: " << value_ptr
<< ", value_len: " << value_len;
// GH-47708 TODO: Add tests for SQLSetConnectAttr

using ODBC::ODBCConnection;

return ODBCConnection::ExecuteWithDiagnostics(conn, SQL_ERROR, [=]() {
Expand Down
36 changes: 18 additions & 18 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_connection.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -528,58 +528,58 @@ void ODBCConnection::SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
}
}

void ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
SQLINTEGER buffer_length, SQLINTEGER* output_length,
bool is_unicode) {
SQLRETURN ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
SQLINTEGER buffer_length,
SQLINTEGER* output_length, bool is_unicode) {
boost::optional<Connection::Attribute> spi_attribute;

switch (attribute) {
// Internal connection attributes
#ifdef SQL_ATR_ASYNC_DBC_EVENT
#ifdef SQL_ATTR_ASYNC_DBC_EVENT
case SQL_ATTR_ASYNC_DBC_EVENT:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
#ifdef SQL_ATTR_ASYNC_DBC_FUNCTIONS_ENABLE
case SQL_ATTR_ASYNC_DBC_FUNCTIONS_ENABLE:
GetAttribute(static_cast<SQLUINTEGER>(SQL_ASYNC_DBC_ENABLE_OFF), value,
buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
#ifdef SQL_ATTR_ASYNC_PCALLBACK
#ifdef SQL_ATTR_ASYNC_DBC_PCALLBACK
case SQL_ATTR_ASYNC_DBC_PCALLBACK:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
#ifdef SQL_ATTR_ASYNC_DBC_PCONTEXT
case SQL_ATTR_ASYNC_DBC_PCONTEXT:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
#endif
case SQL_ATTR_ASYNC_ENABLE:
GetAttribute(static_cast<SQLULEN>(SQL_ASYNC_ENABLE_OFF), value, buffer_length,
output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_AUTO_IPD:
GetAttribute(static_cast<SQLUINTEGER>(SQL_FALSE), value, buffer_length,
output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_AUTOCOMMIT:
GetAttribute(static_cast<SQLUINTEGER>(SQL_AUTOCOMMIT_ON), value, buffer_length,
output_length);
return;
return SQL_SUCCESS;
#ifdef SQL_ATTR_DBC_INFO_TOKEN
case SQL_ATTR_DBC_INFO_TOKEN:
throw DriverException("Cannot read set-only attribute", "HY092");
#endif
case SQL_ATTR_ENLIST_IN_DTC:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_ODBC_CURSORS: // DM-only.
throw DriverException("Invalid attribute", "HY092");
case SQL_ATTR_QUIET_MODE:
GetAttribute(static_cast<SQLPOINTER>(NULL), value, buffer_length, output_length);
return;
return SQL_SUCCESS;
case SQL_ATTR_TRACE: // DM-only
throw DriverException("Invalid attribute", "HY092");
case SQL_ATTR_TRACEFILE:
Expand All@@ -589,17 +589,16 @@ void ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
case SQL_ATTR_TRANSLATE_OPTION:
throw DriverException("Optional feature not supported.", "HYC00");
case SQL_ATTR_TXN_ISOLATION:
throw DriverException("Optional feature not supported.", "HCY00");
throw DriverException("Optional feature not supported.", "HYC00");

case SQL_ATTR_CURRENT_CATALOG: {
const auto& catalog = spi_connection_->GetAttribute(Connection::CURRENT_CATALOG);
if (!catalog) {
throw DriverException("Optional feature not supported.", "HYC00");
}
const std::string& info_value = boost::get<std::string>(*catalog);
GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
return;
return GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
}

// These all are uint32_t attributes.
Expand DownExpand Up@@ -628,6 +627,7 @@ void ODBCConnection::GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,

GetAttribute(static_cast<SQLUINTEGER>(boost::get<uint32_t>(*spi_attribute)), value,
buffer_length, output_length);
return SQL_SUCCESS;
}

void ODBCConnection::Disconnect() {
Expand Down
5 changes: 3 additions & 2 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_connection.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,8 +57,9 @@ class ODBCConnection : public ODBCHandle<ODBCConnection> {
SQLSMALLINT* output_length, bool is_unicode);
void SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value, SQLINTEGER string_length,
bool isUnicode);
void GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value, SQLINTEGER buffer_length,
SQLINTEGER* output_length, bool is_unicode);
SQLRETURN GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
SQLINTEGER buffer_length, SQLINTEGER* output_length,
bool is_unicode);

~ODBCConnection() = default;

Expand Down
3 changes: 2 additions & 1 deletion cpp/src/arrow/flight/sql/odbc/tests/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,8 +34,9 @@ add_arrow_test(flight_sql_odbc_test
SOURCES
odbc_test_suite.cc
odbc_test_suite.h
statement_attr_test.cc
connection_attr_test.cc
connection_test.cc
statement_attr_test.cc
# Enable Protobuf cleanup after test execution
# GH-46889: move protobuf_test_util to a more common location
../../../../engine/substrait/protobuf_test_util.cc
Expand Down
Loading
Loading