GH-47709: [C++][FlightRPC] Return ODBC and data source information #47762

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
jduo merged 1 commit into from
Dec 8, 2025
Merged

GH-47709: [C++][FlightRPC] Return ODBC and data source information #47762

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
6 changes: 2 additions & 4 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@@ -942,7 +942,6 @@ SQLRETURN SQLGetInfo(SQLHDBC conn, SQLUSMALLINT info_type, SQLPOINTER info_value
<< ", string_length_ptr: "
<< static_cast<const void*>(string_length_ptr);

// GH-47709 TODO: Update SQLGetInfo implementation and add tests for SQLGetInfo
using ODBC::ODBCConnection;

return ODBCConnection::ExecuteWithDiagnostics(conn, SQL_ERROR, [=]() {
Expand All@@ -955,9 +954,8 @@ SQLRETURN SQLGetInfo(SQLHDBC conn, SQLUSMALLINT info_type, SQLPOINTER info_value
return static_cast<SQLRETURN>(SQL_ERROR);
}

connection->GetInfo(info_type, info_value_ptr, buf_len, string_length_ptr,
is_unicode);
return static_cast<SQLRETURN>(SQL_SUCCESS);
return connection->GetInfo(info_type, info_value_ptr, buf_len, string_length_ptr,
is_unicode);
});
}

Expand Down
24 changes: 19 additions & 5 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/get_info_cache.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -918,21 +918,21 @@ bool GetInfoCache::LoadInfoFromServer() {
break;
}
case SqlInfoOptions::SQL_SUPPORTED_RESULT_SET_TYPES:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_UNSPECIFIED:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_FORWARD_ONLY:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::
SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_SCROLL_SENSITIVE:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::
SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_SCROLL_INSENSITIVE:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;

// List<string> properties
Expand DownExpand Up@@ -1132,6 +1132,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_CONVERT_DECIMAL, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_DOUBLE, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_FLOAT, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_FUNCTIONS, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_GUID, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_INTEGER, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_INTERVAL_YEAR_MONTH, static_cast<uint32_t>(0));
Expand DownExpand Up@@ -1210,6 +1211,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_MAX_COLUMNS_IN_ORDER_BY, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_COLUMNS_IN_SELECT, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_COLUMNS_IN_TABLE, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_CONCURRENT_ACTIVITIES, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_CURSOR_NAME_LEN, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_DRIVER_CONNECTIONS, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_IDENTIFIER_LEN, static_cast<uint16_t>(65535));
Expand All@@ -1229,6 +1231,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_OJ_CAPABILITIES,
static_cast<uint32_t>(SQL_OJ_LEFT | SQL_OJ_RIGHT | SQL_OJ_FULL));
SetDefaultIfMissing(info_, SQL_ORDER_BY_COLUMNS_IN_SELECT, "Y");
SetDefaultIfMissing(info_, SQL_OUTER_JOINS, "N");
SetDefaultIfMissing(info_, SQL_PROCEDURE_TERM, "");
SetDefaultIfMissing(info_, SQL_PROCEDURES, "N");
SetDefaultIfMissing(info_, SQL_QUOTED_IDENTIFIER_CASE,
Expand All@@ -1237,6 +1240,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_SCHEMA_USAGE,
static_cast<uint32_t>(SQL_SU_DML_STATEMENTS));
SetDefaultIfMissing(info_, SQL_SEARCH_PATTERN_ESCAPE, "\\");
SetDefaultIfMissing(info_, SQL_SPECIAL_CHARACTERS, "");
SetDefaultIfMissing(
info_, SQL_SERVER_NAME,
"Arrow Flight SQL Server"); // This might actually need to be the hostname.
Expand DownExpand Up@@ -1291,6 +1295,16 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SQL_FN_TSI_FRAC_SECOND | SQL_FN_TSI_SECOND | SQL_FN_TSI_MINUTE |
SQL_FN_TSI_HOUR | SQL_FN_TSI_DAY | SQL_FN_TSI_WEEK |
SQL_FN_TSI_MONTH | SQL_FN_TSI_QUARTER | SQL_FN_TSI_YEAR));
SetDefaultIfMissing(
info_, SQL_TIMEDATE_FUNCTIONS,
static_cast<uint32_t>(
SQL_FN_TD_CURRENT_DATE | SQL_FN_TD_CURRENT_TIME | SQL_FN_TD_CURRENT_TIMESTAMP |
SQL_FN_TD_CURDATE | SQL_FN_TD_CURTIME | SQL_FN_TD_DAYNAME |
SQL_FN_TD_DAYOFMONTH | SQL_FN_TD_DAYOFWEEK | SQL_FN_TD_DAYOFYEAR |
SQL_FN_TD_EXTRACT | SQL_FN_TD_HOUR | SQL_FN_TD_MINUTE | SQL_FN_TD_MONTH |
SQL_FN_TD_MONTHNAME | SQL_FN_TD_NOW | SQL_FN_TD_QUARTER | SQL_FN_TD_SECOND |
SQL_FN_TD_TIMESTAMPADD | SQL_FN_TD_TIMESTAMPDIFF | SQL_FN_TD_WEEK |
SQL_FN_TD_YEAR));
SetDefaultIfMissing(info_, SQL_UNION,
static_cast<uint32_t>(SQL_U_UNION | SQL_U_UNION_ALL));
SetDefaultIfMissing(info_, SQL_XOPEN_CLI_YEAR, "1995");
Expand Down
125 changes: 59 additions & 66 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@@ -87,152 +87,144 @@ void ODBCConnection::Connect(std::string dsn,
attribute_tracking_statement_ = std::make_shared<ODBCStatement>(*this, spi_statement);
}

void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
SQLSMALLINT buffer_length, SQLSMALLINT* output_length,
bool is_unicode) {
SQLRETURN ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
SQLSMALLINT buffer_length, SQLSMALLINT* output_length,
bool is_unicode) {
switch (info_type) {
case SQL_ACTIVE_ENVIRONMENTS:
GetAttribute(static_cast<SQLUSMALLINT>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
#ifdef SQL_ASYNC_DBC_FUNCTIONS
case SQL_ASYNC_DBC_FUNCTIONS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_ASYNC_DBC_NOT_CAPABLE), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
#endif
case SQL_ASYNC_MODE:
GetAttribute(static_cast<SQLUINTEGER>(SQL_AM_NONE), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
#ifdef SQL_ASYNC_NOTIFICATION
case SQL_ASYNC_NOTIFICATION:
GetAttribute(static_cast<SQLUINTEGER>(SQL_ASYNC_NOTIFICATION_NOT_CAPABLE), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
#endif
case SQL_BATCH_ROW_COUNT:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_BATCH_SUPPORT:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_DATA_SOURCE_NAME:
GetStringAttribute(is_unicode, dsn_, true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, dsn_, true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_DRIVER_ODBC_VER:
GetStringAttribute(is_unicode, "03.80", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "03.80", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_DYNAMIC_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_DYNAMIC_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(SQL_CA1_NEXT), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(SQL_CA2_READ_ONLY_CONCURRENCY), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_FILE_USAGE:
GetAttribute(static_cast<SQLUSMALLINT>(SQL_FILE_NOT_SUPPORTED), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_KEYSET_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_KEYSET_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_MAX_ASYNC_CONCURRENT_STATEMENTS:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_ODBC_INTERFACE_CONFORMANCE:
GetAttribute(static_cast<SQLUINTEGER>(SQL_OIC_CORE), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
// case SQL_ODBC_STANDARD_CLI_CONFORMANCE: - mentioned in SQLGetInfo spec with no
// description and there is no constant for this.
case SQL_PARAM_ARRAY_ROW_COUNTS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_PARC_NO_BATCH), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_PARAM_ARRAY_SELECTS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_PAS_NO_SELECT), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_ROW_UPDATES:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_SCROLL_OPTIONS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_SO_FORWARD_ONLY), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_STATIC_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_STATIC_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_BOOKMARK_PERSISTENCE:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_DESCRIBE_PARAMETER:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_MULT_RESULT_SETS:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_MULTIPLE_ACTIVE_TXN:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_NEED_LONG_DATA_LEN:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_TXN_CAPABLE:
GetAttribute(static_cast<SQLUSMALLINT>(SQL_TC_NONE), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_TXN_ISOLATION_OPTION:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_TABLE_TERM:
GetStringAttribute(is_unicode, "table", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "table", true, value, buffer_length,
output_length, GetDiagnostics());
// Deprecated ODBC 2.x fields required for backwards compatibility.
case SQL_ODBC_API_CONFORMANCE:
GetAttribute(static_cast<SQLUSMALLINT>(SQL_OAC_LEVEL1), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_FETCH_DIRECTION:
GetAttribute(static_cast<SQLINTEGER>(SQL_FETCH_NEXT), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_LOCK_TYPES:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_POS_OPERATIONS:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_POSITIONED_STATEMENTS:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_SCROLL_CONCURRENCY:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_STATIC_SENSITIVITY:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;

// Driver-level string properties.
case SQL_USER_NAME:
Expand DownExpand Up@@ -267,9 +259,8 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
case SQL_XOPEN_CLI_YEAR: {
const auto& info = spi_connection_->GetInfo(info_type);
const std::string& info_value = boost::get<std::string>(info);
GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
break;
return GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
}

// Driver-level 32-bit integer properties.
Expand DownExpand Up@@ -359,7 +350,7 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
const auto& info = spi_connection_->GetInfo(info_type);
uint32_t info_value = boost::get<uint32_t>(info);
GetAttribute(info_value, value, buffer_length, output_length);
break;
return SQL_SUCCESS;
}

// Driver-level 16-bit integer properties.
Expand DownExpand Up@@ -394,7 +385,7 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
const auto& info = spi_connection_->GetInfo(info_type);
uint16_t info_value = boost::get<uint16_t>(info);
GetAttribute(info_value, value, buffer_length, output_length);
break;
return SQL_SUCCESS;
}

// Special case - SQL_DATABASE_NAME is an alias for SQL_ATTR_CURRENT_CATALOG.
Expand All@@ -404,13 +395,15 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
throw DriverException("Optional feature not supported.", "HYC00");
}
const std::string& info_value = boost::get<std::string>(*attr);
GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
break;
return GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
}
default:
throw DriverException("Unknown SQLGetInfo type: " + std::to_string(info_type));
throw DriverException("Unknown SQLGetInfo type: " + std::to_string(info_type),
"HY096");
}

return SQL_ERROR;
}

void ODBCConnection::SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
Expand Down
4 changes: 2 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@@ -53,8 +53,8 @@ class ODBCConnection : public ODBCHandle<ODBCConnection> {
const arrow::flight::sql::odbc::Connection::ConnPropertyMap& properties,
std::vector<std::string_view>& missing_properties);

void GetInfo(SQLUSMALLINT info_type, SQLPOINTER value, SQLSMALLINT buffer_length,
SQLSMALLINT* output_length, bool is_unicode);
SQLRETURN GetInfo(SQLUSMALLINT info_type, SQLPOINTER value, SQLSMALLINT buffer_length,
SQLSMALLINT* output_length, bool is_unicode);
void SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value, SQLINTEGER string_length,
bool isUnicode);
SQLRETURN GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
Expand Down
1 change: 1 addition & 0 deletions cpp/src/arrow/flight/sql/odbc/tests/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ add_arrow_test(flight_sql_odbc_test
odbc_test_suite.cc
odbc_test_suite.h
connection_attr_test.cc
connection_info_test.cc
connection_test.cc
statement_attr_test.cc
# Enable Protobuf cleanup after test execution
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-47709: [C++][FlightRPC] Return ODBC and data source information #47762

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
jduo merged 1 commit into from
Dec 8, 2025
Merged

GH-47709: [C++][FlightRPC] Return ODBC and data source information #47762

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
6 changes: 2 additions & 4 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@@ -942,7 +942,6 @@ SQLRETURN SQLGetInfo(SQLHDBC conn, SQLUSMALLINT info_type, SQLPOINTER info_value
<< ", string_length_ptr: "
<< static_cast<const void*>(string_length_ptr);

// GH-47709 TODO: Update SQLGetInfo implementation and add tests for SQLGetInfo
using ODBC::ODBCConnection;

return ODBCConnection::ExecuteWithDiagnostics(conn, SQL_ERROR, [=]() {
Expand All@@ -955,9 +954,8 @@ SQLRETURN SQLGetInfo(SQLHDBC conn, SQLUSMALLINT info_type, SQLPOINTER info_value
return static_cast<SQLRETURN>(SQL_ERROR);
}

connection->GetInfo(info_type, info_value_ptr, buf_len, string_length_ptr,
is_unicode);
return static_cast<SQLRETURN>(SQL_SUCCESS);
return connection->GetInfo(info_type, info_value_ptr, buf_len, string_length_ptr,
is_unicode);
});
}

Expand Down
24 changes: 19 additions & 5 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/get_info_cache.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -918,21 +918,21 @@ bool GetInfoCache::LoadInfoFromServer() {
break;
}
case SqlInfoOptions::SQL_SUPPORTED_RESULT_SET_TYPES:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_UNSPECIFIED:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_FORWARD_ONLY:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::
SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_SCROLL_SENSITIVE:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::
SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_SCROLL_INSENSITIVE:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;

// List<string> properties
Expand DownExpand Up@@ -1132,6 +1132,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_CONVERT_DECIMAL, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_DOUBLE, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_FLOAT, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_FUNCTIONS, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_GUID, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_INTEGER, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_INTERVAL_YEAR_MONTH, static_cast<uint32_t>(0));
Expand DownExpand Up@@ -1210,6 +1211,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_MAX_COLUMNS_IN_ORDER_BY, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_COLUMNS_IN_SELECT, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_COLUMNS_IN_TABLE, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_CONCURRENT_ACTIVITIES, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_CURSOR_NAME_LEN, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_DRIVER_CONNECTIONS, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_IDENTIFIER_LEN, static_cast<uint16_t>(65535));
Expand All@@ -1229,6 +1231,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_OJ_CAPABILITIES,
static_cast<uint32_t>(SQL_OJ_LEFT | SQL_OJ_RIGHT | SQL_OJ_FULL));
SetDefaultIfMissing(info_, SQL_ORDER_BY_COLUMNS_IN_SELECT, "Y");
SetDefaultIfMissing(info_, SQL_OUTER_JOINS, "N");
SetDefaultIfMissing(info_, SQL_PROCEDURE_TERM, "");
SetDefaultIfMissing(info_, SQL_PROCEDURES, "N");
SetDefaultIfMissing(info_, SQL_QUOTED_IDENTIFIER_CASE,
Expand All@@ -1237,6 +1240,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_SCHEMA_USAGE,
static_cast<uint32_t>(SQL_SU_DML_STATEMENTS));
SetDefaultIfMissing(info_, SQL_SEARCH_PATTERN_ESCAPE, "\\");
SetDefaultIfMissing(info_, SQL_SPECIAL_CHARACTERS, "");
SetDefaultIfMissing(
info_, SQL_SERVER_NAME,
"Arrow Flight SQL Server"); // This might actually need to be the hostname.
Expand DownExpand Up@@ -1291,6 +1295,16 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SQL_FN_TSI_FRAC_SECOND | SQL_FN_TSI_SECOND | SQL_FN_TSI_MINUTE |
SQL_FN_TSI_HOUR | SQL_FN_TSI_DAY | SQL_FN_TSI_WEEK |
SQL_FN_TSI_MONTH | SQL_FN_TSI_QUARTER | SQL_FN_TSI_YEAR));
SetDefaultIfMissing(
info_, SQL_TIMEDATE_FUNCTIONS,
static_cast<uint32_t>(
SQL_FN_TD_CURRENT_DATE | SQL_FN_TD_CURRENT_TIME | SQL_FN_TD_CURRENT_TIMESTAMP |
SQL_FN_TD_CURDATE | SQL_FN_TD_CURTIME | SQL_FN_TD_DAYNAME |
SQL_FN_TD_DAYOFMONTH | SQL_FN_TD_DAYOFWEEK | SQL_FN_TD_DAYOFYEAR |
SQL_FN_TD_EXTRACT | SQL_FN_TD_HOUR | SQL_FN_TD_MINUTE | SQL_FN_TD_MONTH |
SQL_FN_TD_MONTHNAME | SQL_FN_TD_NOW | SQL_FN_TD_QUARTER | SQL_FN_TD_SECOND |
SQL_FN_TD_TIMESTAMPADD | SQL_FN_TD_TIMESTAMPDIFF | SQL_FN_TD_WEEK |
SQL_FN_TD_YEAR));
SetDefaultIfMissing(info_, SQL_UNION,
static_cast<uint32_t>(SQL_U_UNION | SQL_U_UNION_ALL));
SetDefaultIfMissing(info_, SQL_XOPEN_CLI_YEAR, "1995");
Expand Down
125 changes: 59 additions & 66 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@@ -87,152 +87,144 @@ void ODBCConnection::Connect(std::string dsn,
attribute_tracking_statement_ = std::make_shared<ODBCStatement>(*this, spi_statement);
}

void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
SQLSMALLINT buffer_length, SQLSMALLINT* output_length,
bool is_unicode) {
SQLRETURN ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
SQLSMALLINT buffer_length, SQLSMALLINT* output_length,
bool is_unicode) {
switch (info_type) {
case SQL_ACTIVE_ENVIRONMENTS:
GetAttribute(static_cast<SQLUSMALLINT>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
#ifdef SQL_ASYNC_DBC_FUNCTIONS
case SQL_ASYNC_DBC_FUNCTIONS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_ASYNC_DBC_NOT_CAPABLE), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
#endif
case SQL_ASYNC_MODE:
GetAttribute(static_cast<SQLUINTEGER>(SQL_AM_NONE), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
#ifdef SQL_ASYNC_NOTIFICATION
case SQL_ASYNC_NOTIFICATION:
GetAttribute(static_cast<SQLUINTEGER>(SQL_ASYNC_NOTIFICATION_NOT_CAPABLE), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
#endif
case SQL_BATCH_ROW_COUNT:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_BATCH_SUPPORT:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_DATA_SOURCE_NAME:
GetStringAttribute(is_unicode, dsn_, true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, dsn_, true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_DRIVER_ODBC_VER:
GetStringAttribute(is_unicode, "03.80", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "03.80", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_DYNAMIC_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_DYNAMIC_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(SQL_CA1_NEXT), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(SQL_CA2_READ_ONLY_CONCURRENCY), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_FILE_USAGE:
GetAttribute(static_cast<SQLUSMALLINT>(SQL_FILE_NOT_SUPPORTED), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_KEYSET_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_KEYSET_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_MAX_ASYNC_CONCURRENT_STATEMENTS:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_ODBC_INTERFACE_CONFORMANCE:
GetAttribute(static_cast<SQLUINTEGER>(SQL_OIC_CORE), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
// case SQL_ODBC_STANDARD_CLI_CONFORMANCE: - mentioned in SQLGetInfo spec with no
// description and there is no constant for this.
case SQL_PARAM_ARRAY_ROW_COUNTS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_PARC_NO_BATCH), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_PARAM_ARRAY_SELECTS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_PAS_NO_SELECT), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_ROW_UPDATES:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_SCROLL_OPTIONS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_SO_FORWARD_ONLY), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_STATIC_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_STATIC_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_BOOKMARK_PERSISTENCE:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_DESCRIBE_PARAMETER:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_MULT_RESULT_SETS:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_MULTIPLE_ACTIVE_TXN:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_NEED_LONG_DATA_LEN:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_TXN_CAPABLE:
GetAttribute(static_cast<SQLUSMALLINT>(SQL_TC_NONE), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_TXN_ISOLATION_OPTION:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_TABLE_TERM:
GetStringAttribute(is_unicode, "table", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "table", true, value, buffer_length,
output_length, GetDiagnostics());
// Deprecated ODBC 2.x fields required for backwards compatibility.
case SQL_ODBC_API_CONFORMANCE:
GetAttribute(static_cast<SQLUSMALLINT>(SQL_OAC_LEVEL1), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_FETCH_DIRECTION:
GetAttribute(static_cast<SQLINTEGER>(SQL_FETCH_NEXT), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_LOCK_TYPES:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_POS_OPERATIONS:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_POSITIONED_STATEMENTS:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_SCROLL_CONCURRENCY:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_STATIC_SENSITIVITY:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;

// Driver-level string properties.
case SQL_USER_NAME:
Expand DownExpand Up@@ -267,9 +259,8 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
case SQL_XOPEN_CLI_YEAR: {
const auto& info = spi_connection_->GetInfo(info_type);
const std::string& info_value = boost::get<std::string>(info);
GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
break;
return GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
}

// Driver-level 32-bit integer properties.
Expand DownExpand Up@@ -359,7 +350,7 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
const auto& info = spi_connection_->GetInfo(info_type);
uint32_t info_value = boost::get<uint32_t>(info);
GetAttribute(info_value, value, buffer_length, output_length);
break;
return SQL_SUCCESS;
}

// Driver-level 16-bit integer properties.
Expand DownExpand Up@@ -394,7 +385,7 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
const auto& info = spi_connection_->GetInfo(info_type);
uint16_t info_value = boost::get<uint16_t>(info);
GetAttribute(info_value, value, buffer_length, output_length);
break;
return SQL_SUCCESS;
}

// Special case - SQL_DATABASE_NAME is an alias for SQL_ATTR_CURRENT_CATALOG.
Expand All@@ -404,13 +395,15 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
throw DriverException("Optional feature not supported.", "HYC00");
}
const std::string& info_value = boost::get<std::string>(*attr);
GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
break;
return GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
}
default:
throw DriverException("Unknown SQLGetInfo type: " + std::to_string(info_type));
throw DriverException("Unknown SQLGetInfo type: " + std::to_string(info_type),
"HY096");
}

return SQL_ERROR;
}

void ODBCConnection::SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
Expand Down
4 changes: 2 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@@ -53,8 +53,8 @@ class ODBCConnection : public ODBCHandle<ODBCConnection> {
const arrow::flight::sql::odbc::Connection::ConnPropertyMap& properties,
std::vector<std::string_view>& missing_properties);

void GetInfo(SQLUSMALLINT info_type, SQLPOINTER value, SQLSMALLINT buffer_length,
SQLSMALLINT* output_length, bool is_unicode);
SQLRETURN GetInfo(SQLUSMALLINT info_type, SQLPOINTER value, SQLSMALLINT buffer_length,
SQLSMALLINT* output_length, bool is_unicode);
void SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value, SQLINTEGER string_length,
bool isUnicode);
SQLRETURN GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
Expand Down
1 change: 1 addition & 0 deletions cpp/src/arrow/flight/sql/odbc/tests/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ add_arrow_test(flight_sql_odbc_test
odbc_test_suite.cc
odbc_test_suite.h
connection_attr_test.cc
connection_info_test.cc
connection_test.cc
statement_attr_test.cc
# Enable Protobuf cleanup after test execution
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-47709: [C++][FlightRPC] Return ODBC and data source information #47762

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
jduo merged 1 commit into from
Dec 8, 2025
Merged

GH-47709: [C++][FlightRPC] Return ODBC and data source information #47762

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
6 changes: 2 additions & 4 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@@ -942,7 +942,6 @@ SQLRETURN SQLGetInfo(SQLHDBC conn, SQLUSMALLINT info_type, SQLPOINTER info_value
<< ", string_length_ptr: "
<< static_cast<const void*>(string_length_ptr);

// GH-47709 TODO: Update SQLGetInfo implementation and add tests for SQLGetInfo
using ODBC::ODBCConnection;

return ODBCConnection::ExecuteWithDiagnostics(conn, SQL_ERROR, [=]() {
Expand All@@ -955,9 +954,8 @@ SQLRETURN SQLGetInfo(SQLHDBC conn, SQLUSMALLINT info_type, SQLPOINTER info_value
return static_cast<SQLRETURN>(SQL_ERROR);
}

connection->GetInfo(info_type, info_value_ptr, buf_len, string_length_ptr,
is_unicode);
return static_cast<SQLRETURN>(SQL_SUCCESS);
return connection->GetInfo(info_type, info_value_ptr, buf_len, string_length_ptr,
is_unicode);
});
}

Expand Down
24 changes: 19 additions & 5 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/get_info_cache.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -918,21 +918,21 @@ bool GetInfoCache::LoadInfoFromServer() {
break;
}
case SqlInfoOptions::SQL_SUPPORTED_RESULT_SET_TYPES:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_UNSPECIFIED:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_FORWARD_ONLY:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::
SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_SCROLL_SENSITIVE:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::
SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_SCROLL_INSENSITIVE:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;

// List<string> properties
Expand DownExpand Up@@ -1132,6 +1132,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_CONVERT_DECIMAL, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_DOUBLE, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_FLOAT, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_FUNCTIONS, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_GUID, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_INTEGER, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_INTERVAL_YEAR_MONTH, static_cast<uint32_t>(0));
Expand DownExpand Up@@ -1210,6 +1211,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_MAX_COLUMNS_IN_ORDER_BY, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_COLUMNS_IN_SELECT, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_COLUMNS_IN_TABLE, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_CONCURRENT_ACTIVITIES, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_CURSOR_NAME_LEN, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_DRIVER_CONNECTIONS, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_IDENTIFIER_LEN, static_cast<uint16_t>(65535));
Expand All@@ -1229,6 +1231,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_OJ_CAPABILITIES,
static_cast<uint32_t>(SQL_OJ_LEFT | SQL_OJ_RIGHT | SQL_OJ_FULL));
SetDefaultIfMissing(info_, SQL_ORDER_BY_COLUMNS_IN_SELECT, "Y");
SetDefaultIfMissing(info_, SQL_OUTER_JOINS, "N");
SetDefaultIfMissing(info_, SQL_PROCEDURE_TERM, "");
SetDefaultIfMissing(info_, SQL_PROCEDURES, "N");
SetDefaultIfMissing(info_, SQL_QUOTED_IDENTIFIER_CASE,
Expand All@@ -1237,6 +1240,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_SCHEMA_USAGE,
static_cast<uint32_t>(SQL_SU_DML_STATEMENTS));
SetDefaultIfMissing(info_, SQL_SEARCH_PATTERN_ESCAPE, "\\");
SetDefaultIfMissing(info_, SQL_SPECIAL_CHARACTERS, "");
SetDefaultIfMissing(
info_, SQL_SERVER_NAME,
"Arrow Flight SQL Server"); // This might actually need to be the hostname.
Expand DownExpand Up@@ -1291,6 +1295,16 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SQL_FN_TSI_FRAC_SECOND | SQL_FN_TSI_SECOND | SQL_FN_TSI_MINUTE |
SQL_FN_TSI_HOUR | SQL_FN_TSI_DAY | SQL_FN_TSI_WEEK |
SQL_FN_TSI_MONTH | SQL_FN_TSI_QUARTER | SQL_FN_TSI_YEAR));
SetDefaultIfMissing(
info_, SQL_TIMEDATE_FUNCTIONS,
static_cast<uint32_t>(
SQL_FN_TD_CURRENT_DATE | SQL_FN_TD_CURRENT_TIME | SQL_FN_TD_CURRENT_TIMESTAMP |
SQL_FN_TD_CURDATE | SQL_FN_TD_CURTIME | SQL_FN_TD_DAYNAME |
SQL_FN_TD_DAYOFMONTH | SQL_FN_TD_DAYOFWEEK | SQL_FN_TD_DAYOFYEAR |
SQL_FN_TD_EXTRACT | SQL_FN_TD_HOUR | SQL_FN_TD_MINUTE | SQL_FN_TD_MONTH |
SQL_FN_TD_MONTHNAME | SQL_FN_TD_NOW | SQL_FN_TD_QUARTER | SQL_FN_TD_SECOND |
SQL_FN_TD_TIMESTAMPADD | SQL_FN_TD_TIMESTAMPDIFF | SQL_FN_TD_WEEK |
SQL_FN_TD_YEAR));
SetDefaultIfMissing(info_, SQL_UNION,
static_cast<uint32_t>(SQL_U_UNION | SQL_U_UNION_ALL));
SetDefaultIfMissing(info_, SQL_XOPEN_CLI_YEAR, "1995");
Expand Down
125 changes: 59 additions & 66 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@@ -87,152 +87,144 @@ void ODBCConnection::Connect(std::string dsn,
attribute_tracking_statement_ = std::make_shared<ODBCStatement>(*this, spi_statement);
}

void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
SQLSMALLINT buffer_length, SQLSMALLINT* output_length,
bool is_unicode) {
SQLRETURN ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
SQLSMALLINT buffer_length, SQLSMALLINT* output_length,
bool is_unicode) {
switch (info_type) {
case SQL_ACTIVE_ENVIRONMENTS:
GetAttribute(static_cast<SQLUSMALLINT>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
#ifdef SQL_ASYNC_DBC_FUNCTIONS
case SQL_ASYNC_DBC_FUNCTIONS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_ASYNC_DBC_NOT_CAPABLE), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
#endif
case SQL_ASYNC_MODE:
GetAttribute(static_cast<SQLUINTEGER>(SQL_AM_NONE), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
#ifdef SQL_ASYNC_NOTIFICATION
case SQL_ASYNC_NOTIFICATION:
GetAttribute(static_cast<SQLUINTEGER>(SQL_ASYNC_NOTIFICATION_NOT_CAPABLE), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
#endif
case SQL_BATCH_ROW_COUNT:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_BATCH_SUPPORT:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_DATA_SOURCE_NAME:
GetStringAttribute(is_unicode, dsn_, true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, dsn_, true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_DRIVER_ODBC_VER:
GetStringAttribute(is_unicode, "03.80", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "03.80", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_DYNAMIC_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_DYNAMIC_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(SQL_CA1_NEXT), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(SQL_CA2_READ_ONLY_CONCURRENCY), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_FILE_USAGE:
GetAttribute(static_cast<SQLUSMALLINT>(SQL_FILE_NOT_SUPPORTED), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_KEYSET_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_KEYSET_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_MAX_ASYNC_CONCURRENT_STATEMENTS:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_ODBC_INTERFACE_CONFORMANCE:
GetAttribute(static_cast<SQLUINTEGER>(SQL_OIC_CORE), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
// case SQL_ODBC_STANDARD_CLI_CONFORMANCE: - mentioned in SQLGetInfo spec with no
// description and there is no constant for this.
case SQL_PARAM_ARRAY_ROW_COUNTS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_PARC_NO_BATCH), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_PARAM_ARRAY_SELECTS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_PAS_NO_SELECT), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_ROW_UPDATES:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_SCROLL_OPTIONS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_SO_FORWARD_ONLY), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_STATIC_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_STATIC_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_BOOKMARK_PERSISTENCE:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_DESCRIBE_PARAMETER:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_MULT_RESULT_SETS:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_MULTIPLE_ACTIVE_TXN:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_NEED_LONG_DATA_LEN:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_TXN_CAPABLE:
GetAttribute(static_cast<SQLUSMALLINT>(SQL_TC_NONE), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_TXN_ISOLATION_OPTION:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_TABLE_TERM:
GetStringAttribute(is_unicode, "table", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "table", true, value, buffer_length,
output_length, GetDiagnostics());
// Deprecated ODBC 2.x fields required for backwards compatibility.
case SQL_ODBC_API_CONFORMANCE:
GetAttribute(static_cast<SQLUSMALLINT>(SQL_OAC_LEVEL1), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_FETCH_DIRECTION:
GetAttribute(static_cast<SQLINTEGER>(SQL_FETCH_NEXT), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_LOCK_TYPES:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_POS_OPERATIONS:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_POSITIONED_STATEMENTS:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_SCROLL_CONCURRENCY:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_STATIC_SENSITIVITY:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;

// Driver-level string properties.
case SQL_USER_NAME:
Expand DownExpand Up@@ -267,9 +259,8 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
case SQL_XOPEN_CLI_YEAR: {
const auto& info = spi_connection_->GetInfo(info_type);
const std::string& info_value = boost::get<std::string>(info);
GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
break;
return GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
}

// Driver-level 32-bit integer properties.
Expand DownExpand Up@@ -359,7 +350,7 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
const auto& info = spi_connection_->GetInfo(info_type);
uint32_t info_value = boost::get<uint32_t>(info);
GetAttribute(info_value, value, buffer_length, output_length);
break;
return SQL_SUCCESS;
}

// Driver-level 16-bit integer properties.
Expand DownExpand Up@@ -394,7 +385,7 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
const auto& info = spi_connection_->GetInfo(info_type);
uint16_t info_value = boost::get<uint16_t>(info);
GetAttribute(info_value, value, buffer_length, output_length);
break;
return SQL_SUCCESS;
}

// Special case - SQL_DATABASE_NAME is an alias for SQL_ATTR_CURRENT_CATALOG.
Expand All@@ -404,13 +395,15 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
throw DriverException("Optional feature not supported.", "HYC00");
}
const std::string& info_value = boost::get<std::string>(*attr);
GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
break;
return GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
}
default:
throw DriverException("Unknown SQLGetInfo type: " + std::to_string(info_type));
throw DriverException("Unknown SQLGetInfo type: " + std::to_string(info_type),
"HY096");
}

return SQL_ERROR;
}

void ODBCConnection::SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
Expand Down
4 changes: 2 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@@ -53,8 +53,8 @@ class ODBCConnection : public ODBCHandle<ODBCConnection> {
const arrow::flight::sql::odbc::Connection::ConnPropertyMap& properties,
std::vector<std::string_view>& missing_properties);

void GetInfo(SQLUSMALLINT info_type, SQLPOINTER value, SQLSMALLINT buffer_length,
SQLSMALLINT* output_length, bool is_unicode);
SQLRETURN GetInfo(SQLUSMALLINT info_type, SQLPOINTER value, SQLSMALLINT buffer_length,
SQLSMALLINT* output_length, bool is_unicode);
void SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value, SQLINTEGER string_length,
bool isUnicode);
SQLRETURN GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
Expand Down
1 change: 1 addition & 0 deletions cpp/src/arrow/flight/sql/odbc/tests/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ add_arrow_test(flight_sql_odbc_test
odbc_test_suite.cc
odbc_test_suite.h
connection_attr_test.cc
connection_info_test.cc
connection_test.cc
statement_attr_test.cc
# Enable Protobuf cleanup after test execution
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-47709: [C++][FlightRPC] Return ODBC and data source information #47762

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
jduo merged 1 commit into from
Dec 8, 2025
Merged

GH-47709: [C++][FlightRPC] Return ODBC and data source information #47762

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
6 changes: 2 additions & 4 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@@ -942,7 +942,6 @@ SQLRETURN SQLGetInfo(SQLHDBC conn, SQLUSMALLINT info_type, SQLPOINTER info_value
<< ", string_length_ptr: "
<< static_cast<const void*>(string_length_ptr);

// GH-47709 TODO: Update SQLGetInfo implementation and add tests for SQLGetInfo
using ODBC::ODBCConnection;

return ODBCConnection::ExecuteWithDiagnostics(conn, SQL_ERROR, [=]() {
Expand All@@ -955,9 +954,8 @@ SQLRETURN SQLGetInfo(SQLHDBC conn, SQLUSMALLINT info_type, SQLPOINTER info_value
return static_cast<SQLRETURN>(SQL_ERROR);
}

connection->GetInfo(info_type, info_value_ptr, buf_len, string_length_ptr,
is_unicode);
return static_cast<SQLRETURN>(SQL_SUCCESS);
return connection->GetInfo(info_type, info_value_ptr, buf_len, string_length_ptr,
is_unicode);
});
}

Expand Down
24 changes: 19 additions & 5 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/get_info_cache.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -918,21 +918,21 @@ bool GetInfoCache::LoadInfoFromServer() {
break;
}
case SqlInfoOptions::SQL_SUPPORTED_RESULT_SET_TYPES:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_UNSPECIFIED:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_FORWARD_ONLY:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::
SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_SCROLL_SENSITIVE:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::
SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_SCROLL_INSENSITIVE:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;

// List<string> properties
Expand DownExpand Up@@ -1132,6 +1132,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_CONVERT_DECIMAL, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_DOUBLE, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_FLOAT, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_FUNCTIONS, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_GUID, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_INTEGER, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_INTERVAL_YEAR_MONTH, static_cast<uint32_t>(0));
Expand DownExpand Up@@ -1210,6 +1211,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_MAX_COLUMNS_IN_ORDER_BY, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_COLUMNS_IN_SELECT, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_COLUMNS_IN_TABLE, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_CONCURRENT_ACTIVITIES, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_CURSOR_NAME_LEN, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_DRIVER_CONNECTIONS, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_IDENTIFIER_LEN, static_cast<uint16_t>(65535));
Expand All@@ -1229,6 +1231,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_OJ_CAPABILITIES,
static_cast<uint32_t>(SQL_OJ_LEFT | SQL_OJ_RIGHT | SQL_OJ_FULL));
SetDefaultIfMissing(info_, SQL_ORDER_BY_COLUMNS_IN_SELECT, "Y");
SetDefaultIfMissing(info_, SQL_OUTER_JOINS, "N");
SetDefaultIfMissing(info_, SQL_PROCEDURE_TERM, "");
SetDefaultIfMissing(info_, SQL_PROCEDURES, "N");
SetDefaultIfMissing(info_, SQL_QUOTED_IDENTIFIER_CASE,
Expand All@@ -1237,6 +1240,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_SCHEMA_USAGE,
static_cast<uint32_t>(SQL_SU_DML_STATEMENTS));
SetDefaultIfMissing(info_, SQL_SEARCH_PATTERN_ESCAPE, "\\");
SetDefaultIfMissing(info_, SQL_SPECIAL_CHARACTERS, "");
SetDefaultIfMissing(
info_, SQL_SERVER_NAME,
"Arrow Flight SQL Server"); // This might actually need to be the hostname.
Expand DownExpand Up@@ -1291,6 +1295,16 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SQL_FN_TSI_FRAC_SECOND | SQL_FN_TSI_SECOND | SQL_FN_TSI_MINUTE |
SQL_FN_TSI_HOUR | SQL_FN_TSI_DAY | SQL_FN_TSI_WEEK |
SQL_FN_TSI_MONTH | SQL_FN_TSI_QUARTER | SQL_FN_TSI_YEAR));
SetDefaultIfMissing(
info_, SQL_TIMEDATE_FUNCTIONS,
static_cast<uint32_t>(
SQL_FN_TD_CURRENT_DATE | SQL_FN_TD_CURRENT_TIME | SQL_FN_TD_CURRENT_TIMESTAMP |
SQL_FN_TD_CURDATE | SQL_FN_TD_CURTIME | SQL_FN_TD_DAYNAME |
SQL_FN_TD_DAYOFMONTH | SQL_FN_TD_DAYOFWEEK | SQL_FN_TD_DAYOFYEAR |
SQL_FN_TD_EXTRACT | SQL_FN_TD_HOUR | SQL_FN_TD_MINUTE | SQL_FN_TD_MONTH |
SQL_FN_TD_MONTHNAME | SQL_FN_TD_NOW | SQL_FN_TD_QUARTER | SQL_FN_TD_SECOND |
SQL_FN_TD_TIMESTAMPADD | SQL_FN_TD_TIMESTAMPDIFF | SQL_FN_TD_WEEK |
SQL_FN_TD_YEAR));
SetDefaultIfMissing(info_, SQL_UNION,
static_cast<uint32_t>(SQL_U_UNION | SQL_U_UNION_ALL));
SetDefaultIfMissing(info_, SQL_XOPEN_CLI_YEAR, "1995");
Expand Down
125 changes: 59 additions & 66 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@@ -87,152 +87,144 @@ void ODBCConnection::Connect(std::string dsn,
attribute_tracking_statement_ = std::make_shared<ODBCStatement>(*this, spi_statement);
}

void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
SQLSMALLINT buffer_length, SQLSMALLINT* output_length,
bool is_unicode) {
SQLRETURN ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
SQLSMALLINT buffer_length, SQLSMALLINT* output_length,
bool is_unicode) {
switch (info_type) {
case SQL_ACTIVE_ENVIRONMENTS:
GetAttribute(static_cast<SQLUSMALLINT>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
#ifdef SQL_ASYNC_DBC_FUNCTIONS
case SQL_ASYNC_DBC_FUNCTIONS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_ASYNC_DBC_NOT_CAPABLE), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
#endif
case SQL_ASYNC_MODE:
GetAttribute(static_cast<SQLUINTEGER>(SQL_AM_NONE), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
#ifdef SQL_ASYNC_NOTIFICATION
case SQL_ASYNC_NOTIFICATION:
GetAttribute(static_cast<SQLUINTEGER>(SQL_ASYNC_NOTIFICATION_NOT_CAPABLE), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
#endif
case SQL_BATCH_ROW_COUNT:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_BATCH_SUPPORT:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_DATA_SOURCE_NAME:
GetStringAttribute(is_unicode, dsn_, true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, dsn_, true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_DRIVER_ODBC_VER:
GetStringAttribute(is_unicode, "03.80", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "03.80", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_DYNAMIC_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_DYNAMIC_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(SQL_CA1_NEXT), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(SQL_CA2_READ_ONLY_CONCURRENCY), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_FILE_USAGE:
GetAttribute(static_cast<SQLUSMALLINT>(SQL_FILE_NOT_SUPPORTED), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_KEYSET_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_KEYSET_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_MAX_ASYNC_CONCURRENT_STATEMENTS:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_ODBC_INTERFACE_CONFORMANCE:
GetAttribute(static_cast<SQLUINTEGER>(SQL_OIC_CORE), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
// case SQL_ODBC_STANDARD_CLI_CONFORMANCE: - mentioned in SQLGetInfo spec with no
// description and there is no constant for this.
case SQL_PARAM_ARRAY_ROW_COUNTS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_PARC_NO_BATCH), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_PARAM_ARRAY_SELECTS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_PAS_NO_SELECT), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_ROW_UPDATES:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_SCROLL_OPTIONS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_SO_FORWARD_ONLY), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_STATIC_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_STATIC_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_BOOKMARK_PERSISTENCE:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_DESCRIBE_PARAMETER:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_MULT_RESULT_SETS:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_MULTIPLE_ACTIVE_TXN:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_NEED_LONG_DATA_LEN:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_TXN_CAPABLE:
GetAttribute(static_cast<SQLUSMALLINT>(SQL_TC_NONE), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_TXN_ISOLATION_OPTION:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_TABLE_TERM:
GetStringAttribute(is_unicode, "table", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "table", true, value, buffer_length,
output_length, GetDiagnostics());
// Deprecated ODBC 2.x fields required for backwards compatibility.
case SQL_ODBC_API_CONFORMANCE:
GetAttribute(static_cast<SQLUSMALLINT>(SQL_OAC_LEVEL1), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_FETCH_DIRECTION:
GetAttribute(static_cast<SQLINTEGER>(SQL_FETCH_NEXT), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_LOCK_TYPES:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_POS_OPERATIONS:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_POSITIONED_STATEMENTS:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_SCROLL_CONCURRENCY:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_STATIC_SENSITIVITY:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;

// Driver-level string properties.
case SQL_USER_NAME:
Expand DownExpand Up@@ -267,9 +259,8 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
case SQL_XOPEN_CLI_YEAR: {
const auto& info = spi_connection_->GetInfo(info_type);
const std::string& info_value = boost::get<std::string>(info);
GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
break;
return GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
}

// Driver-level 32-bit integer properties.
Expand DownExpand Up@@ -359,7 +350,7 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
const auto& info = spi_connection_->GetInfo(info_type);
uint32_t info_value = boost::get<uint32_t>(info);
GetAttribute(info_value, value, buffer_length, output_length);
break;
return SQL_SUCCESS;
}

// Driver-level 16-bit integer properties.
Expand DownExpand Up@@ -394,7 +385,7 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
const auto& info = spi_connection_->GetInfo(info_type);
uint16_t info_value = boost::get<uint16_t>(info);
GetAttribute(info_value, value, buffer_length, output_length);
break;
return SQL_SUCCESS;
}

// Special case - SQL_DATABASE_NAME is an alias for SQL_ATTR_CURRENT_CATALOG.
Expand All@@ -404,13 +395,15 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
throw DriverException("Optional feature not supported.", "HYC00");
}
const std::string& info_value = boost::get<std::string>(*attr);
GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
break;
return GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
}
default:
throw DriverException("Unknown SQLGetInfo type: " + std::to_string(info_type));
throw DriverException("Unknown SQLGetInfo type: " + std::to_string(info_type),
"HY096");
}

return SQL_ERROR;
}

void ODBCConnection::SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
Expand Down
4 changes: 2 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@@ -53,8 +53,8 @@ class ODBCConnection : public ODBCHandle<ODBCConnection> {
const arrow::flight::sql::odbc::Connection::ConnPropertyMap& properties,
std::vector<std::string_view>& missing_properties);

void GetInfo(SQLUSMALLINT info_type, SQLPOINTER value, SQLSMALLINT buffer_length,
SQLSMALLINT* output_length, bool is_unicode);
SQLRETURN GetInfo(SQLUSMALLINT info_type, SQLPOINTER value, SQLSMALLINT buffer_length,
SQLSMALLINT* output_length, bool is_unicode);
void SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value, SQLINTEGER string_length,
bool isUnicode);
SQLRETURN GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
Expand Down
1 change: 1 addition & 0 deletions cpp/src/arrow/flight/sql/odbc/tests/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ add_arrow_test(flight_sql_odbc_test
odbc_test_suite.cc
odbc_test_suite.h
connection_attr_test.cc
connection_info_test.cc
connection_test.cc
statement_attr_test.cc
# Enable Protobuf cleanup after test execution
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-47709: [C++][FlightRPC] Return ODBC and data source information #47762

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
jduo merged 1 commit into from
Dec 8, 2025
Merged

GH-47709: [C++][FlightRPC] Return ODBC and data source information #47762

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
6 changes: 2 additions & 4 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@@ -942,7 +942,6 @@ SQLRETURN SQLGetInfo(SQLHDBC conn, SQLUSMALLINT info_type, SQLPOINTER info_value
<< ", string_length_ptr: "
<< static_cast<const void*>(string_length_ptr);

// GH-47709 TODO: Update SQLGetInfo implementation and add tests for SQLGetInfo
using ODBC::ODBCConnection;

return ODBCConnection::ExecuteWithDiagnostics(conn, SQL_ERROR, [=]() {
Expand All@@ -955,9 +954,8 @@ SQLRETURN SQLGetInfo(SQLHDBC conn, SQLUSMALLINT info_type, SQLPOINTER info_value
return static_cast<SQLRETURN>(SQL_ERROR);
}

connection->GetInfo(info_type, info_value_ptr, buf_len, string_length_ptr,
is_unicode);
return static_cast<SQLRETURN>(SQL_SUCCESS);
return connection->GetInfo(info_type, info_value_ptr, buf_len, string_length_ptr,
is_unicode);
});
}

Expand Down
24 changes: 19 additions & 5 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/get_info_cache.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -918,21 +918,21 @@ bool GetInfoCache::LoadInfoFromServer() {
break;
}
case SqlInfoOptions::SQL_SUPPORTED_RESULT_SET_TYPES:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_UNSPECIFIED:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_FORWARD_ONLY:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::
SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_SCROLL_SENSITIVE:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::
SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_SCROLL_INSENSITIVE:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;

// List<string> properties
Expand DownExpand Up@@ -1132,6 +1132,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_CONVERT_DECIMAL, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_DOUBLE, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_FLOAT, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_FUNCTIONS, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_GUID, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_INTEGER, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_INTERVAL_YEAR_MONTH, static_cast<uint32_t>(0));
Expand DownExpand Up@@ -1210,6 +1211,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_MAX_COLUMNS_IN_ORDER_BY, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_COLUMNS_IN_SELECT, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_COLUMNS_IN_TABLE, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_CONCURRENT_ACTIVITIES, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_CURSOR_NAME_LEN, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_DRIVER_CONNECTIONS, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_IDENTIFIER_LEN, static_cast<uint16_t>(65535));
Expand All@@ -1229,6 +1231,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_OJ_CAPABILITIES,
static_cast<uint32_t>(SQL_OJ_LEFT | SQL_OJ_RIGHT | SQL_OJ_FULL));
SetDefaultIfMissing(info_, SQL_ORDER_BY_COLUMNS_IN_SELECT, "Y");
SetDefaultIfMissing(info_, SQL_OUTER_JOINS, "N");
SetDefaultIfMissing(info_, SQL_PROCEDURE_TERM, "");
SetDefaultIfMissing(info_, SQL_PROCEDURES, "N");
SetDefaultIfMissing(info_, SQL_QUOTED_IDENTIFIER_CASE,
Expand All@@ -1237,6 +1240,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_SCHEMA_USAGE,
static_cast<uint32_t>(SQL_SU_DML_STATEMENTS));
SetDefaultIfMissing(info_, SQL_SEARCH_PATTERN_ESCAPE, "\\");
SetDefaultIfMissing(info_, SQL_SPECIAL_CHARACTERS, "");
SetDefaultIfMissing(
info_, SQL_SERVER_NAME,
"Arrow Flight SQL Server"); // This might actually need to be the hostname.
Expand DownExpand Up@@ -1291,6 +1295,16 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SQL_FN_TSI_FRAC_SECOND | SQL_FN_TSI_SECOND | SQL_FN_TSI_MINUTE |
SQL_FN_TSI_HOUR | SQL_FN_TSI_DAY | SQL_FN_TSI_WEEK |
SQL_FN_TSI_MONTH | SQL_FN_TSI_QUARTER | SQL_FN_TSI_YEAR));
SetDefaultIfMissing(
info_, SQL_TIMEDATE_FUNCTIONS,
static_cast<uint32_t>(
SQL_FN_TD_CURRENT_DATE | SQL_FN_TD_CURRENT_TIME | SQL_FN_TD_CURRENT_TIMESTAMP |
SQL_FN_TD_CURDATE | SQL_FN_TD_CURTIME | SQL_FN_TD_DAYNAME |
SQL_FN_TD_DAYOFMONTH | SQL_FN_TD_DAYOFWEEK | SQL_FN_TD_DAYOFYEAR |
SQL_FN_TD_EXTRACT | SQL_FN_TD_HOUR | SQL_FN_TD_MINUTE | SQL_FN_TD_MONTH |
SQL_FN_TD_MONTHNAME | SQL_FN_TD_NOW | SQL_FN_TD_QUARTER | SQL_FN_TD_SECOND |
SQL_FN_TD_TIMESTAMPADD | SQL_FN_TD_TIMESTAMPDIFF | SQL_FN_TD_WEEK |
SQL_FN_TD_YEAR));
SetDefaultIfMissing(info_, SQL_UNION,
static_cast<uint32_t>(SQL_U_UNION | SQL_U_UNION_ALL));
SetDefaultIfMissing(info_, SQL_XOPEN_CLI_YEAR, "1995");
Expand Down
125 changes: 59 additions & 66 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@@ -87,152 +87,144 @@ void ODBCConnection::Connect(std::string dsn,
attribute_tracking_statement_ = std::make_shared<ODBCStatement>(*this, spi_statement);
}

void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
SQLSMALLINT buffer_length, SQLSMALLINT* output_length,
bool is_unicode) {
SQLRETURN ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
SQLSMALLINT buffer_length, SQLSMALLINT* output_length,
bool is_unicode) {
switch (info_type) {
case SQL_ACTIVE_ENVIRONMENTS:
GetAttribute(static_cast<SQLUSMALLINT>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
#ifdef SQL_ASYNC_DBC_FUNCTIONS
case SQL_ASYNC_DBC_FUNCTIONS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_ASYNC_DBC_NOT_CAPABLE), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
#endif
case SQL_ASYNC_MODE:
GetAttribute(static_cast<SQLUINTEGER>(SQL_AM_NONE), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
#ifdef SQL_ASYNC_NOTIFICATION
case SQL_ASYNC_NOTIFICATION:
GetAttribute(static_cast<SQLUINTEGER>(SQL_ASYNC_NOTIFICATION_NOT_CAPABLE), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
#endif
case SQL_BATCH_ROW_COUNT:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_BATCH_SUPPORT:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_DATA_SOURCE_NAME:
GetStringAttribute(is_unicode, dsn_, true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, dsn_, true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_DRIVER_ODBC_VER:
GetStringAttribute(is_unicode, "03.80", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "03.80", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_DYNAMIC_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_DYNAMIC_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(SQL_CA1_NEXT), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(SQL_CA2_READ_ONLY_CONCURRENCY), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_FILE_USAGE:
GetAttribute(static_cast<SQLUSMALLINT>(SQL_FILE_NOT_SUPPORTED), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_KEYSET_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_KEYSET_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_MAX_ASYNC_CONCURRENT_STATEMENTS:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_ODBC_INTERFACE_CONFORMANCE:
GetAttribute(static_cast<SQLUINTEGER>(SQL_OIC_CORE), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
// case SQL_ODBC_STANDARD_CLI_CONFORMANCE: - mentioned in SQLGetInfo spec with no
// description and there is no constant for this.
case SQL_PARAM_ARRAY_ROW_COUNTS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_PARC_NO_BATCH), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_PARAM_ARRAY_SELECTS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_PAS_NO_SELECT), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_ROW_UPDATES:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_SCROLL_OPTIONS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_SO_FORWARD_ONLY), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_STATIC_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_STATIC_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_BOOKMARK_PERSISTENCE:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_DESCRIBE_PARAMETER:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_MULT_RESULT_SETS:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_MULTIPLE_ACTIVE_TXN:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_NEED_LONG_DATA_LEN:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_TXN_CAPABLE:
GetAttribute(static_cast<SQLUSMALLINT>(SQL_TC_NONE), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_TXN_ISOLATION_OPTION:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_TABLE_TERM:
GetStringAttribute(is_unicode, "table", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "table", true, value, buffer_length,
output_length, GetDiagnostics());
// Deprecated ODBC 2.x fields required for backwards compatibility.
case SQL_ODBC_API_CONFORMANCE:
GetAttribute(static_cast<SQLUSMALLINT>(SQL_OAC_LEVEL1), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_FETCH_DIRECTION:
GetAttribute(static_cast<SQLINTEGER>(SQL_FETCH_NEXT), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_LOCK_TYPES:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_POS_OPERATIONS:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_POSITIONED_STATEMENTS:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_SCROLL_CONCURRENCY:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_STATIC_SENSITIVITY:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;

// Driver-level string properties.
case SQL_USER_NAME:
Expand DownExpand Up@@ -267,9 +259,8 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
case SQL_XOPEN_CLI_YEAR: {
const auto& info = spi_connection_->GetInfo(info_type);
const std::string& info_value = boost::get<std::string>(info);
GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
break;
return GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
}

// Driver-level 32-bit integer properties.
Expand DownExpand Up@@ -359,7 +350,7 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
const auto& info = spi_connection_->GetInfo(info_type);
uint32_t info_value = boost::get<uint32_t>(info);
GetAttribute(info_value, value, buffer_length, output_length);
break;
return SQL_SUCCESS;
}

// Driver-level 16-bit integer properties.
Expand DownExpand Up@@ -394,7 +385,7 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
const auto& info = spi_connection_->GetInfo(info_type);
uint16_t info_value = boost::get<uint16_t>(info);
GetAttribute(info_value, value, buffer_length, output_length);
break;
return SQL_SUCCESS;
}

// Special case - SQL_DATABASE_NAME is an alias for SQL_ATTR_CURRENT_CATALOG.
Expand All@@ -404,13 +395,15 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
throw DriverException("Optional feature not supported.", "HYC00");
}
const std::string& info_value = boost::get<std::string>(*attr);
GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
break;
return GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
}
default:
throw DriverException("Unknown SQLGetInfo type: " + std::to_string(info_type));
throw DriverException("Unknown SQLGetInfo type: " + std::to_string(info_type),
"HY096");
}

return SQL_ERROR;
}

void ODBCConnection::SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
Expand Down
4 changes: 2 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@@ -53,8 +53,8 @@ class ODBCConnection : public ODBCHandle<ODBCConnection> {
const arrow::flight::sql::odbc::Connection::ConnPropertyMap& properties,
std::vector<std::string_view>& missing_properties);

void GetInfo(SQLUSMALLINT info_type, SQLPOINTER value, SQLSMALLINT buffer_length,
SQLSMALLINT* output_length, bool is_unicode);
SQLRETURN GetInfo(SQLUSMALLINT info_type, SQLPOINTER value, SQLSMALLINT buffer_length,
SQLSMALLINT* output_length, bool is_unicode);
void SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value, SQLINTEGER string_length,
bool isUnicode);
SQLRETURN GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
Expand Down
1 change: 1 addition & 0 deletions cpp/src/arrow/flight/sql/odbc/tests/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ add_arrow_test(flight_sql_odbc_test
odbc_test_suite.cc
odbc_test_suite.h
connection_attr_test.cc
connection_info_test.cc
connection_test.cc
statement_attr_test.cc
# Enable Protobuf cleanup after test execution
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-47709: [C++][FlightRPC] Return ODBC and data source information #47762

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
jduo merged 1 commit into from
Dec 8, 2025
Merged

GH-47709: [C++][FlightRPC] Return ODBC and data source information #47762

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
6 changes: 2 additions & 4 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@@ -942,7 +942,6 @@ SQLRETURN SQLGetInfo(SQLHDBC conn, SQLUSMALLINT info_type, SQLPOINTER info_value
<< ", string_length_ptr: "
<< static_cast<const void*>(string_length_ptr);

// GH-47709 TODO: Update SQLGetInfo implementation and add tests for SQLGetInfo
using ODBC::ODBCConnection;

return ODBCConnection::ExecuteWithDiagnostics(conn, SQL_ERROR, [=]() {
Expand All@@ -955,9 +954,8 @@ SQLRETURN SQLGetInfo(SQLHDBC conn, SQLUSMALLINT info_type, SQLPOINTER info_value
return static_cast<SQLRETURN>(SQL_ERROR);
}

connection->GetInfo(info_type, info_value_ptr, buf_len, string_length_ptr,
is_unicode);
return static_cast<SQLRETURN>(SQL_SUCCESS);
return connection->GetInfo(info_type, info_value_ptr, buf_len, string_length_ptr,
is_unicode);
});
}

Expand Down
24 changes: 19 additions & 5 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/get_info_cache.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -918,21 +918,21 @@ bool GetInfoCache::LoadInfoFromServer() {
break;
}
case SqlInfoOptions::SQL_SUPPORTED_RESULT_SET_TYPES:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_UNSPECIFIED:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_FORWARD_ONLY:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::
SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_SCROLL_SENSITIVE:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::
SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_SCROLL_INSENSITIVE:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;

// List<string> properties
Expand DownExpand Up@@ -1132,6 +1132,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_CONVERT_DECIMAL, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_DOUBLE, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_FLOAT, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_FUNCTIONS, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_GUID, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_INTEGER, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_INTERVAL_YEAR_MONTH, static_cast<uint32_t>(0));
Expand DownExpand Up@@ -1210,6 +1211,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_MAX_COLUMNS_IN_ORDER_BY, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_COLUMNS_IN_SELECT, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_COLUMNS_IN_TABLE, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_CONCURRENT_ACTIVITIES, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_CURSOR_NAME_LEN, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_DRIVER_CONNECTIONS, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_IDENTIFIER_LEN, static_cast<uint16_t>(65535));
Expand All@@ -1229,6 +1231,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_OJ_CAPABILITIES,
static_cast<uint32_t>(SQL_OJ_LEFT | SQL_OJ_RIGHT | SQL_OJ_FULL));
SetDefaultIfMissing(info_, SQL_ORDER_BY_COLUMNS_IN_SELECT, "Y");
SetDefaultIfMissing(info_, SQL_OUTER_JOINS, "N");
SetDefaultIfMissing(info_, SQL_PROCEDURE_TERM, "");
SetDefaultIfMissing(info_, SQL_PROCEDURES, "N");
SetDefaultIfMissing(info_, SQL_QUOTED_IDENTIFIER_CASE,
Expand All@@ -1237,6 +1240,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_SCHEMA_USAGE,
static_cast<uint32_t>(SQL_SU_DML_STATEMENTS));
SetDefaultIfMissing(info_, SQL_SEARCH_PATTERN_ESCAPE, "\\");
SetDefaultIfMissing(info_, SQL_SPECIAL_CHARACTERS, "");
SetDefaultIfMissing(
info_, SQL_SERVER_NAME,
"Arrow Flight SQL Server"); // This might actually need to be the hostname.
Expand DownExpand Up@@ -1291,6 +1295,16 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SQL_FN_TSI_FRAC_SECOND | SQL_FN_TSI_SECOND | SQL_FN_TSI_MINUTE |
SQL_FN_TSI_HOUR | SQL_FN_TSI_DAY | SQL_FN_TSI_WEEK |
SQL_FN_TSI_MONTH | SQL_FN_TSI_QUARTER | SQL_FN_TSI_YEAR));
SetDefaultIfMissing(
info_, SQL_TIMEDATE_FUNCTIONS,
static_cast<uint32_t>(
SQL_FN_TD_CURRENT_DATE | SQL_FN_TD_CURRENT_TIME | SQL_FN_TD_CURRENT_TIMESTAMP |
SQL_FN_TD_CURDATE | SQL_FN_TD_CURTIME | SQL_FN_TD_DAYNAME |
SQL_FN_TD_DAYOFMONTH | SQL_FN_TD_DAYOFWEEK | SQL_FN_TD_DAYOFYEAR |
SQL_FN_TD_EXTRACT | SQL_FN_TD_HOUR | SQL_FN_TD_MINUTE | SQL_FN_TD_MONTH |
SQL_FN_TD_MONTHNAME | SQL_FN_TD_NOW | SQL_FN_TD_QUARTER | SQL_FN_TD_SECOND |
SQL_FN_TD_TIMESTAMPADD | SQL_FN_TD_TIMESTAMPDIFF | SQL_FN_TD_WEEK |
SQL_FN_TD_YEAR));
SetDefaultIfMissing(info_, SQL_UNION,
static_cast<uint32_t>(SQL_U_UNION | SQL_U_UNION_ALL));
SetDefaultIfMissing(info_, SQL_XOPEN_CLI_YEAR, "1995");
Expand Down
125 changes: 59 additions & 66 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@@ -87,152 +87,144 @@ void ODBCConnection::Connect(std::string dsn,
attribute_tracking_statement_ = std::make_shared<ODBCStatement>(*this, spi_statement);
}

void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
SQLSMALLINT buffer_length, SQLSMALLINT* output_length,
bool is_unicode) {
SQLRETURN ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
SQLSMALLINT buffer_length, SQLSMALLINT* output_length,
bool is_unicode) {
switch (info_type) {
case SQL_ACTIVE_ENVIRONMENTS:
GetAttribute(static_cast<SQLUSMALLINT>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
#ifdef SQL_ASYNC_DBC_FUNCTIONS
case SQL_ASYNC_DBC_FUNCTIONS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_ASYNC_DBC_NOT_CAPABLE), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
#endif
case SQL_ASYNC_MODE:
GetAttribute(static_cast<SQLUINTEGER>(SQL_AM_NONE), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
#ifdef SQL_ASYNC_NOTIFICATION
case SQL_ASYNC_NOTIFICATION:
GetAttribute(static_cast<SQLUINTEGER>(SQL_ASYNC_NOTIFICATION_NOT_CAPABLE), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
#endif
case SQL_BATCH_ROW_COUNT:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_BATCH_SUPPORT:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_DATA_SOURCE_NAME:
GetStringAttribute(is_unicode, dsn_, true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, dsn_, true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_DRIVER_ODBC_VER:
GetStringAttribute(is_unicode, "03.80", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "03.80", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_DYNAMIC_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_DYNAMIC_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(SQL_CA1_NEXT), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(SQL_CA2_READ_ONLY_CONCURRENCY), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_FILE_USAGE:
GetAttribute(static_cast<SQLUSMALLINT>(SQL_FILE_NOT_SUPPORTED), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_KEYSET_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_KEYSET_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_MAX_ASYNC_CONCURRENT_STATEMENTS:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_ODBC_INTERFACE_CONFORMANCE:
GetAttribute(static_cast<SQLUINTEGER>(SQL_OIC_CORE), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
// case SQL_ODBC_STANDARD_CLI_CONFORMANCE: - mentioned in SQLGetInfo spec with no
// description and there is no constant for this.
case SQL_PARAM_ARRAY_ROW_COUNTS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_PARC_NO_BATCH), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_PARAM_ARRAY_SELECTS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_PAS_NO_SELECT), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_ROW_UPDATES:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_SCROLL_OPTIONS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_SO_FORWARD_ONLY), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_STATIC_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_STATIC_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_BOOKMARK_PERSISTENCE:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_DESCRIBE_PARAMETER:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_MULT_RESULT_SETS:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_MULTIPLE_ACTIVE_TXN:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_NEED_LONG_DATA_LEN:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_TXN_CAPABLE:
GetAttribute(static_cast<SQLUSMALLINT>(SQL_TC_NONE), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_TXN_ISOLATION_OPTION:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_TABLE_TERM:
GetStringAttribute(is_unicode, "table", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "table", true, value, buffer_length,
output_length, GetDiagnostics());
// Deprecated ODBC 2.x fields required for backwards compatibility.
case SQL_ODBC_API_CONFORMANCE:
GetAttribute(static_cast<SQLUSMALLINT>(SQL_OAC_LEVEL1), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_FETCH_DIRECTION:
GetAttribute(static_cast<SQLINTEGER>(SQL_FETCH_NEXT), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_LOCK_TYPES:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_POS_OPERATIONS:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_POSITIONED_STATEMENTS:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_SCROLL_CONCURRENCY:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_STATIC_SENSITIVITY:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;

// Driver-level string properties.
case SQL_USER_NAME:
Expand DownExpand Up@@ -267,9 +259,8 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
case SQL_XOPEN_CLI_YEAR: {
const auto& info = spi_connection_->GetInfo(info_type);
const std::string& info_value = boost::get<std::string>(info);
GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
break;
return GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
}

// Driver-level 32-bit integer properties.
Expand DownExpand Up@@ -359,7 +350,7 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
const auto& info = spi_connection_->GetInfo(info_type);
uint32_t info_value = boost::get<uint32_t>(info);
GetAttribute(info_value, value, buffer_length, output_length);
break;
return SQL_SUCCESS;
}

// Driver-level 16-bit integer properties.
Expand DownExpand Up@@ -394,7 +385,7 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
const auto& info = spi_connection_->GetInfo(info_type);
uint16_t info_value = boost::get<uint16_t>(info);
GetAttribute(info_value, value, buffer_length, output_length);
break;
return SQL_SUCCESS;
}

// Special case - SQL_DATABASE_NAME is an alias for SQL_ATTR_CURRENT_CATALOG.
Expand All@@ -404,13 +395,15 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
throw DriverException("Optional feature not supported.", "HYC00");
}
const std::string& info_value = boost::get<std::string>(*attr);
GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
break;
return GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
}
default:
throw DriverException("Unknown SQLGetInfo type: " + std::to_string(info_type));
throw DriverException("Unknown SQLGetInfo type: " + std::to_string(info_type),
"HY096");
}

return SQL_ERROR;
}

void ODBCConnection::SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
Expand Down
4 changes: 2 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@@ -53,8 +53,8 @@ class ODBCConnection : public ODBCHandle<ODBCConnection> {
const arrow::flight::sql::odbc::Connection::ConnPropertyMap& properties,
std::vector<std::string_view>& missing_properties);

void GetInfo(SQLUSMALLINT info_type, SQLPOINTER value, SQLSMALLINT buffer_length,
SQLSMALLINT* output_length, bool is_unicode);
SQLRETURN GetInfo(SQLUSMALLINT info_type, SQLPOINTER value, SQLSMALLINT buffer_length,
SQLSMALLINT* output_length, bool is_unicode);
void SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value, SQLINTEGER string_length,
bool isUnicode);
SQLRETURN GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
Expand Down
1 change: 1 addition & 0 deletions cpp/src/arrow/flight/sql/odbc/tests/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ add_arrow_test(flight_sql_odbc_test
odbc_test_suite.cc
odbc_test_suite.h
connection_attr_test.cc
connection_info_test.cc
connection_test.cc
statement_attr_test.cc
# Enable Protobuf cleanup after test execution
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-47709: [C++][FlightRPC] Return ODBC and data source information #47762

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
jduo merged 1 commit into from
Dec 8, 2025
Merged

GH-47709: [C++][FlightRPC] Return ODBC and data source information #47762

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
6 changes: 2 additions & 4 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@@ -942,7 +942,6 @@ SQLRETURN SQLGetInfo(SQLHDBC conn, SQLUSMALLINT info_type, SQLPOINTER info_value
<< ", string_length_ptr: "
<< static_cast<const void*>(string_length_ptr);

// GH-47709 TODO: Update SQLGetInfo implementation and add tests for SQLGetInfo
using ODBC::ODBCConnection;

return ODBCConnection::ExecuteWithDiagnostics(conn, SQL_ERROR, [=]() {
Expand All@@ -955,9 +954,8 @@ SQLRETURN SQLGetInfo(SQLHDBC conn, SQLUSMALLINT info_type, SQLPOINTER info_value
return static_cast<SQLRETURN>(SQL_ERROR);
}

connection->GetInfo(info_type, info_value_ptr, buf_len, string_length_ptr,
is_unicode);
return static_cast<SQLRETURN>(SQL_SUCCESS);
return connection->GetInfo(info_type, info_value_ptr, buf_len, string_length_ptr,
is_unicode);
});
}

Expand Down
24 changes: 19 additions & 5 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/get_info_cache.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -918,21 +918,21 @@ bool GetInfoCache::LoadInfoFromServer() {
break;
}
case SqlInfoOptions::SQL_SUPPORTED_RESULT_SET_TYPES:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_UNSPECIFIED:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_FORWARD_ONLY:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::
SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_SCROLL_SENSITIVE:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::
SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_SCROLL_INSENSITIVE:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;

// List<string> properties
Expand DownExpand Up@@ -1132,6 +1132,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_CONVERT_DECIMAL, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_DOUBLE, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_FLOAT, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_FUNCTIONS, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_GUID, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_INTEGER, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_INTERVAL_YEAR_MONTH, static_cast<uint32_t>(0));
Expand DownExpand Up@@ -1210,6 +1211,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_MAX_COLUMNS_IN_ORDER_BY, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_COLUMNS_IN_SELECT, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_COLUMNS_IN_TABLE, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_CONCURRENT_ACTIVITIES, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_CURSOR_NAME_LEN, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_DRIVER_CONNECTIONS, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_IDENTIFIER_LEN, static_cast<uint16_t>(65535));
Expand All@@ -1229,6 +1231,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_OJ_CAPABILITIES,
static_cast<uint32_t>(SQL_OJ_LEFT | SQL_OJ_RIGHT | SQL_OJ_FULL));
SetDefaultIfMissing(info_, SQL_ORDER_BY_COLUMNS_IN_SELECT, "Y");
SetDefaultIfMissing(info_, SQL_OUTER_JOINS, "N");
SetDefaultIfMissing(info_, SQL_PROCEDURE_TERM, "");
SetDefaultIfMissing(info_, SQL_PROCEDURES, "N");
SetDefaultIfMissing(info_, SQL_QUOTED_IDENTIFIER_CASE,
Expand All@@ -1237,6 +1240,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_SCHEMA_USAGE,
static_cast<uint32_t>(SQL_SU_DML_STATEMENTS));
SetDefaultIfMissing(info_, SQL_SEARCH_PATTERN_ESCAPE, "\\");
SetDefaultIfMissing(info_, SQL_SPECIAL_CHARACTERS, "");
SetDefaultIfMissing(
info_, SQL_SERVER_NAME,
"Arrow Flight SQL Server"); // This might actually need to be the hostname.
Expand DownExpand Up@@ -1291,6 +1295,16 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SQL_FN_TSI_FRAC_SECOND | SQL_FN_TSI_SECOND | SQL_FN_TSI_MINUTE |
SQL_FN_TSI_HOUR | SQL_FN_TSI_DAY | SQL_FN_TSI_WEEK |
SQL_FN_TSI_MONTH | SQL_FN_TSI_QUARTER | SQL_FN_TSI_YEAR));
SetDefaultIfMissing(
info_, SQL_TIMEDATE_FUNCTIONS,
static_cast<uint32_t>(
SQL_FN_TD_CURRENT_DATE | SQL_FN_TD_CURRENT_TIME | SQL_FN_TD_CURRENT_TIMESTAMP |
SQL_FN_TD_CURDATE | SQL_FN_TD_CURTIME | SQL_FN_TD_DAYNAME |
SQL_FN_TD_DAYOFMONTH | SQL_FN_TD_DAYOFWEEK | SQL_FN_TD_DAYOFYEAR |
SQL_FN_TD_EXTRACT | SQL_FN_TD_HOUR | SQL_FN_TD_MINUTE | SQL_FN_TD_MONTH |
SQL_FN_TD_MONTHNAME | SQL_FN_TD_NOW | SQL_FN_TD_QUARTER | SQL_FN_TD_SECOND |
SQL_FN_TD_TIMESTAMPADD | SQL_FN_TD_TIMESTAMPDIFF | SQL_FN_TD_WEEK |
SQL_FN_TD_YEAR));
SetDefaultIfMissing(info_, SQL_UNION,
static_cast<uint32_t>(SQL_U_UNION | SQL_U_UNION_ALL));
SetDefaultIfMissing(info_, SQL_XOPEN_CLI_YEAR, "1995");
Expand Down
125 changes: 59 additions & 66 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@@ -87,152 +87,144 @@ void ODBCConnection::Connect(std::string dsn,
attribute_tracking_statement_ = std::make_shared<ODBCStatement>(*this, spi_statement);
}

void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
SQLSMALLINT buffer_length, SQLSMALLINT* output_length,
bool is_unicode) {
SQLRETURN ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
SQLSMALLINT buffer_length, SQLSMALLINT* output_length,
bool is_unicode) {
switch (info_type) {
case SQL_ACTIVE_ENVIRONMENTS:
GetAttribute(static_cast<SQLUSMALLINT>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
#ifdef SQL_ASYNC_DBC_FUNCTIONS
case SQL_ASYNC_DBC_FUNCTIONS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_ASYNC_DBC_NOT_CAPABLE), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
#endif
case SQL_ASYNC_MODE:
GetAttribute(static_cast<SQLUINTEGER>(SQL_AM_NONE), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
#ifdef SQL_ASYNC_NOTIFICATION
case SQL_ASYNC_NOTIFICATION:
GetAttribute(static_cast<SQLUINTEGER>(SQL_ASYNC_NOTIFICATION_NOT_CAPABLE), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
#endif
case SQL_BATCH_ROW_COUNT:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_BATCH_SUPPORT:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_DATA_SOURCE_NAME:
GetStringAttribute(is_unicode, dsn_, true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, dsn_, true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_DRIVER_ODBC_VER:
GetStringAttribute(is_unicode, "03.80", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "03.80", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_DYNAMIC_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_DYNAMIC_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(SQL_CA1_NEXT), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(SQL_CA2_READ_ONLY_CONCURRENCY), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_FILE_USAGE:
GetAttribute(static_cast<SQLUSMALLINT>(SQL_FILE_NOT_SUPPORTED), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_KEYSET_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_KEYSET_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_MAX_ASYNC_CONCURRENT_STATEMENTS:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_ODBC_INTERFACE_CONFORMANCE:
GetAttribute(static_cast<SQLUINTEGER>(SQL_OIC_CORE), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
// case SQL_ODBC_STANDARD_CLI_CONFORMANCE: - mentioned in SQLGetInfo spec with no
// description and there is no constant for this.
case SQL_PARAM_ARRAY_ROW_COUNTS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_PARC_NO_BATCH), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_PARAM_ARRAY_SELECTS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_PAS_NO_SELECT), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_ROW_UPDATES:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_SCROLL_OPTIONS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_SO_FORWARD_ONLY), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_STATIC_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_STATIC_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_BOOKMARK_PERSISTENCE:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_DESCRIBE_PARAMETER:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_MULT_RESULT_SETS:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_MULTIPLE_ACTIVE_TXN:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_NEED_LONG_DATA_LEN:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_TXN_CAPABLE:
GetAttribute(static_cast<SQLUSMALLINT>(SQL_TC_NONE), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_TXN_ISOLATION_OPTION:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_TABLE_TERM:
GetStringAttribute(is_unicode, "table", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "table", true, value, buffer_length,
output_length, GetDiagnostics());
// Deprecated ODBC 2.x fields required for backwards compatibility.
case SQL_ODBC_API_CONFORMANCE:
GetAttribute(static_cast<SQLUSMALLINT>(SQL_OAC_LEVEL1), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_FETCH_DIRECTION:
GetAttribute(static_cast<SQLINTEGER>(SQL_FETCH_NEXT), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_LOCK_TYPES:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_POS_OPERATIONS:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_POSITIONED_STATEMENTS:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_SCROLL_CONCURRENCY:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_STATIC_SENSITIVITY:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;

// Driver-level string properties.
case SQL_USER_NAME:
Expand DownExpand Up@@ -267,9 +259,8 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
case SQL_XOPEN_CLI_YEAR: {
const auto& info = spi_connection_->GetInfo(info_type);
const std::string& info_value = boost::get<std::string>(info);
GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
break;
return GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
}

// Driver-level 32-bit integer properties.
Expand DownExpand Up@@ -359,7 +350,7 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
const auto& info = spi_connection_->GetInfo(info_type);
uint32_t info_value = boost::get<uint32_t>(info);
GetAttribute(info_value, value, buffer_length, output_length);
break;
return SQL_SUCCESS;
}

// Driver-level 16-bit integer properties.
Expand DownExpand Up@@ -394,7 +385,7 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
const auto& info = spi_connection_->GetInfo(info_type);
uint16_t info_value = boost::get<uint16_t>(info);
GetAttribute(info_value, value, buffer_length, output_length);
break;
return SQL_SUCCESS;
}

// Special case - SQL_DATABASE_NAME is an alias for SQL_ATTR_CURRENT_CATALOG.
Expand All@@ -404,13 +395,15 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
throw DriverException("Optional feature not supported.", "HYC00");
}
const std::string& info_value = boost::get<std::string>(*attr);
GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
break;
return GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
}
default:
throw DriverException("Unknown SQLGetInfo type: " + std::to_string(info_type));
throw DriverException("Unknown SQLGetInfo type: " + std::to_string(info_type),
"HY096");
}

return SQL_ERROR;
}

void ODBCConnection::SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
Expand Down
4 changes: 2 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@@ -53,8 +53,8 @@ class ODBCConnection : public ODBCHandle<ODBCConnection> {
const arrow::flight::sql::odbc::Connection::ConnPropertyMap& properties,
std::vector<std::string_view>& missing_properties);

void GetInfo(SQLUSMALLINT info_type, SQLPOINTER value, SQLSMALLINT buffer_length,
SQLSMALLINT* output_length, bool is_unicode);
SQLRETURN GetInfo(SQLUSMALLINT info_type, SQLPOINTER value, SQLSMALLINT buffer_length,
SQLSMALLINT* output_length, bool is_unicode);
void SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value, SQLINTEGER string_length,
bool isUnicode);
SQLRETURN GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
Expand Down
1 change: 1 addition & 0 deletions cpp/src/arrow/flight/sql/odbc/tests/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ add_arrow_test(flight_sql_odbc_test
odbc_test_suite.cc
odbc_test_suite.h
connection_attr_test.cc
connection_info_test.cc
connection_test.cc
statement_attr_test.cc
# Enable Protobuf cleanup after test execution
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-47709: [C++][FlightRPC] Return ODBC and data source information #47762

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
jduo merged 1 commit into from
Dec 8, 2025
Merged

GH-47709: [C++][FlightRPC] Return ODBC and data source information #47762

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
6 changes: 2 additions & 4 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@@ -942,7 +942,6 @@ SQLRETURN SQLGetInfo(SQLHDBC conn, SQLUSMALLINT info_type, SQLPOINTER info_value
<< ", string_length_ptr: "
<< static_cast<const void*>(string_length_ptr);

// GH-47709 TODO: Update SQLGetInfo implementation and add tests for SQLGetInfo
using ODBC::ODBCConnection;

return ODBCConnection::ExecuteWithDiagnostics(conn, SQL_ERROR, [=]() {
Expand All@@ -955,9 +954,8 @@ SQLRETURN SQLGetInfo(SQLHDBC conn, SQLUSMALLINT info_type, SQLPOINTER info_value
return static_cast<SQLRETURN>(SQL_ERROR);
}

connection->GetInfo(info_type, info_value_ptr, buf_len, string_length_ptr,
is_unicode);
return static_cast<SQLRETURN>(SQL_SUCCESS);
return connection->GetInfo(info_type, info_value_ptr, buf_len, string_length_ptr,
is_unicode);
});
}

Expand Down
24 changes: 19 additions & 5 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/get_info_cache.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -918,21 +918,21 @@ bool GetInfoCache::LoadInfoFromServer() {
break;
}
case SqlInfoOptions::SQL_SUPPORTED_RESULT_SET_TYPES:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_UNSPECIFIED:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_FORWARD_ONLY:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::
SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_SCROLL_SENSITIVE:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;
case SqlInfoOptions::
SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_SCROLL_INSENSITIVE:
// Ignored. Warpdrive supports forward-only only.
// Ignored. Arrow ODBC supports forward-only only.
break;

// List<string> properties
Expand DownExpand Up@@ -1132,6 +1132,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_CONVERT_DECIMAL, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_DOUBLE, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_FLOAT, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_FUNCTIONS, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_GUID, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_INTEGER, static_cast<uint32_t>(0));
SetDefaultIfMissing(info_, SQL_CONVERT_INTERVAL_YEAR_MONTH, static_cast<uint32_t>(0));
Expand DownExpand Up@@ -1210,6 +1211,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_MAX_COLUMNS_IN_ORDER_BY, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_COLUMNS_IN_SELECT, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_COLUMNS_IN_TABLE, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_CONCURRENT_ACTIVITIES, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_CURSOR_NAME_LEN, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_DRIVER_CONNECTIONS, static_cast<uint16_t>(0));
SetDefaultIfMissing(info_, SQL_MAX_IDENTIFIER_LEN, static_cast<uint16_t>(65535));
Expand All@@ -1229,6 +1231,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_OJ_CAPABILITIES,
static_cast<uint32_t>(SQL_OJ_LEFT | SQL_OJ_RIGHT | SQL_OJ_FULL));
SetDefaultIfMissing(info_, SQL_ORDER_BY_COLUMNS_IN_SELECT, "Y");
SetDefaultIfMissing(info_, SQL_OUTER_JOINS, "N");
SetDefaultIfMissing(info_, SQL_PROCEDURE_TERM, "");
SetDefaultIfMissing(info_, SQL_PROCEDURES, "N");
SetDefaultIfMissing(info_, SQL_QUOTED_IDENTIFIER_CASE,
Expand All@@ -1237,6 +1240,7 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SetDefaultIfMissing(info_, SQL_SCHEMA_USAGE,
static_cast<uint32_t>(SQL_SU_DML_STATEMENTS));
SetDefaultIfMissing(info_, SQL_SEARCH_PATTERN_ESCAPE, "\\");
SetDefaultIfMissing(info_, SQL_SPECIAL_CHARACTERS, "");
SetDefaultIfMissing(
info_, SQL_SERVER_NAME,
"Arrow Flight SQL Server"); // This might actually need to be the hostname.
Expand DownExpand Up@@ -1291,6 +1295,16 @@ void GetInfoCache::LoadDefaultsForMissingEntries() {
SQL_FN_TSI_FRAC_SECOND | SQL_FN_TSI_SECOND | SQL_FN_TSI_MINUTE |
SQL_FN_TSI_HOUR | SQL_FN_TSI_DAY | SQL_FN_TSI_WEEK |
SQL_FN_TSI_MONTH | SQL_FN_TSI_QUARTER | SQL_FN_TSI_YEAR));
SetDefaultIfMissing(
info_, SQL_TIMEDATE_FUNCTIONS,
static_cast<uint32_t>(
SQL_FN_TD_CURRENT_DATE | SQL_FN_TD_CURRENT_TIME | SQL_FN_TD_CURRENT_TIMESTAMP |
SQL_FN_TD_CURDATE | SQL_FN_TD_CURTIME | SQL_FN_TD_DAYNAME |
SQL_FN_TD_DAYOFMONTH | SQL_FN_TD_DAYOFWEEK | SQL_FN_TD_DAYOFYEAR |
SQL_FN_TD_EXTRACT | SQL_FN_TD_HOUR | SQL_FN_TD_MINUTE | SQL_FN_TD_MONTH |
SQL_FN_TD_MONTHNAME | SQL_FN_TD_NOW | SQL_FN_TD_QUARTER | SQL_FN_TD_SECOND |
SQL_FN_TD_TIMESTAMPADD | SQL_FN_TD_TIMESTAMPDIFF | SQL_FN_TD_WEEK |
SQL_FN_TD_YEAR));
SetDefaultIfMissing(info_, SQL_UNION,
static_cast<uint32_t>(SQL_U_UNION | SQL_U_UNION_ALL));
SetDefaultIfMissing(info_, SQL_XOPEN_CLI_YEAR, "1995");
Expand Down
125 changes: 59 additions & 66 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@@ -87,152 +87,144 @@ void ODBCConnection::Connect(std::string dsn,
attribute_tracking_statement_ = std::make_shared<ODBCStatement>(*this, spi_statement);
}

void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
SQLSMALLINT buffer_length, SQLSMALLINT* output_length,
bool is_unicode) {
SQLRETURN ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
SQLSMALLINT buffer_length, SQLSMALLINT* output_length,
bool is_unicode) {
switch (info_type) {
case SQL_ACTIVE_ENVIRONMENTS:
GetAttribute(static_cast<SQLUSMALLINT>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
#ifdef SQL_ASYNC_DBC_FUNCTIONS
case SQL_ASYNC_DBC_FUNCTIONS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_ASYNC_DBC_NOT_CAPABLE), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
#endif
case SQL_ASYNC_MODE:
GetAttribute(static_cast<SQLUINTEGER>(SQL_AM_NONE), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
#ifdef SQL_ASYNC_NOTIFICATION
case SQL_ASYNC_NOTIFICATION:
GetAttribute(static_cast<SQLUINTEGER>(SQL_ASYNC_NOTIFICATION_NOT_CAPABLE), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
#endif
case SQL_BATCH_ROW_COUNT:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_BATCH_SUPPORT:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_DATA_SOURCE_NAME:
GetStringAttribute(is_unicode, dsn_, true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, dsn_, true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_DRIVER_ODBC_VER:
GetStringAttribute(is_unicode, "03.80", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "03.80", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_DYNAMIC_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_DYNAMIC_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(SQL_CA1_NEXT), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(SQL_CA2_READ_ONLY_CONCURRENCY), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_FILE_USAGE:
GetAttribute(static_cast<SQLUSMALLINT>(SQL_FILE_NOT_SUPPORTED), value,
buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_KEYSET_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_KEYSET_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_MAX_ASYNC_CONCURRENT_STATEMENTS:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_ODBC_INTERFACE_CONFORMANCE:
GetAttribute(static_cast<SQLUINTEGER>(SQL_OIC_CORE), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
// case SQL_ODBC_STANDARD_CLI_CONFORMANCE: - mentioned in SQLGetInfo spec with no
// description and there is no constant for this.
case SQL_PARAM_ARRAY_ROW_COUNTS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_PARC_NO_BATCH), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_PARAM_ARRAY_SELECTS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_PAS_NO_SELECT), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_ROW_UPDATES:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_SCROLL_OPTIONS:
GetAttribute(static_cast<SQLUINTEGER>(SQL_SO_FORWARD_ONLY), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_STATIC_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_STATIC_CURSOR_ATTRIBUTES2:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_BOOKMARK_PERSISTENCE:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_DESCRIBE_PARAMETER:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_MULT_RESULT_SETS:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_MULTIPLE_ACTIVE_TXN:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_NEED_LONG_DATA_LEN:
GetStringAttribute(is_unicode, "N", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "N", true, value, buffer_length,
output_length, GetDiagnostics());
case SQL_TXN_CAPABLE:
GetAttribute(static_cast<SQLUSMALLINT>(SQL_TC_NONE), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_TXN_ISOLATION_OPTION:
GetAttribute(static_cast<SQLUINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_TABLE_TERM:
GetStringAttribute(is_unicode, "table", true, value, buffer_length, output_length,
GetDiagnostics());
break;
return GetStringAttribute(is_unicode, "table", true, value, buffer_length,
output_length, GetDiagnostics());
// Deprecated ODBC 2.x fields required for backwards compatibility.
case SQL_ODBC_API_CONFORMANCE:
GetAttribute(static_cast<SQLUSMALLINT>(SQL_OAC_LEVEL1), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_FETCH_DIRECTION:
GetAttribute(static_cast<SQLINTEGER>(SQL_FETCH_NEXT), value, buffer_length,
output_length);
break;
return SQL_SUCCESS;
case SQL_LOCK_TYPES:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_POS_OPERATIONS:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_POSITIONED_STATEMENTS:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_SCROLL_CONCURRENCY:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;
case SQL_STATIC_SENSITIVITY:
GetAttribute(static_cast<SQLINTEGER>(0), value, buffer_length, output_length);
break;
return SQL_SUCCESS;

// Driver-level string properties.
case SQL_USER_NAME:
Expand DownExpand Up@@ -267,9 +259,8 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
case SQL_XOPEN_CLI_YEAR: {
const auto& info = spi_connection_->GetInfo(info_type);
const std::string& info_value = boost::get<std::string>(info);
GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
break;
return GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
}

// Driver-level 32-bit integer properties.
Expand DownExpand Up@@ -359,7 +350,7 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
const auto& info = spi_connection_->GetInfo(info_type);
uint32_t info_value = boost::get<uint32_t>(info);
GetAttribute(info_value, value, buffer_length, output_length);
break;
return SQL_SUCCESS;
}

// Driver-level 16-bit integer properties.
Expand DownExpand Up@@ -394,7 +385,7 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
const auto& info = spi_connection_->GetInfo(info_type);
uint16_t info_value = boost::get<uint16_t>(info);
GetAttribute(info_value, value, buffer_length, output_length);
break;
return SQL_SUCCESS;
}

// Special case - SQL_DATABASE_NAME is an alias for SQL_ATTR_CURRENT_CATALOG.
Expand All@@ -404,13 +395,15 @@ void ODBCConnection::GetInfo(SQLUSMALLINT info_type, SQLPOINTER value,
throw DriverException("Optional feature not supported.", "HYC00");
}
const std::string& info_value = boost::get<std::string>(*attr);
GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
break;
return GetStringAttribute(is_unicode, info_value, true, value, buffer_length,
output_length, GetDiagnostics());
}
default:
throw DriverException("Unknown SQLGetInfo type: " + std::to_string(info_type));
throw DriverException("Unknown SQLGetInfo type: " + std::to_string(info_type),
"HY096");
}

return SQL_ERROR;
}

void ODBCConnection::SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
Expand Down
4 changes: 2 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@@ -53,8 +53,8 @@ class ODBCConnection : public ODBCHandle<ODBCConnection> {
const arrow::flight::sql::odbc::Connection::ConnPropertyMap& properties,
std::vector<std::string_view>& missing_properties);

void GetInfo(SQLUSMALLINT info_type, SQLPOINTER value, SQLSMALLINT buffer_length,
SQLSMALLINT* output_length, bool is_unicode);
SQLRETURN GetInfo(SQLUSMALLINT info_type, SQLPOINTER value, SQLSMALLINT buffer_length,
SQLSMALLINT* output_length, bool is_unicode);
void SetConnectAttr(SQLINTEGER attribute, SQLPOINTER value, SQLINTEGER string_length,
bool isUnicode);
SQLRETURN GetConnectAttr(SQLINTEGER attribute, SQLPOINTER value,
Expand Down
1 change: 1 addition & 0 deletions cpp/src/arrow/flight/sql/odbc/tests/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ add_arrow_test(flight_sql_odbc_test
odbc_test_suite.cc
odbc_test_suite.h
connection_attr_test.cc
connection_info_test.cc
connection_test.cc
statement_attr_test.cc
# Enable Protobuf cleanup after test execution
Expand Down
Loading
Loading