Skip to content

GH-47720: [C++][FlightRPC] ODBC Columns Metadata #48049

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 4 commits into from
Dec 15, 2025
+994 −13
Merged

GH-47720: [C++][FlightRPC] ODBC Columns Metadata #48049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff64608
Extract SQLColumns implementation
alinaliBQ Dec 3, 2025
b20b696
Use nullptr explicitly
alinaliBQ Dec 8, 2025
7c0e6c6
Add back missing checks for error handle tests
alinaliBQ Dec 9, 2025
e0cd3b8
Clean up old TODO comments
alinaliBQ Dec 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions cpp/src/arrow/flight/sql/odbc/odbc_api.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,7 @@ SQLRETURN SQLAllocHandle(SQLSMALLINT type, SQLHANDLE parent, SQLHANDLE* result)
ARROW_LOG(DEBUG) << "SQLAllocHandle called with type: " << type
<< ", parent: " << parent
<< ", result: " << static_cast<const void*>(result);
// GH-47706 TODO: Add tests for SQLAllocStmt, pre-requisite requires
// SQLDriverConnect implementation

*result = nullptr;

switch (type) {
case SQL_HANDLE_ENV: {
using ODBC::ODBCEnvironment;
Expand Down Expand Up @@ -141,9 +137,6 @@ SQLRETURN SQLAllocHandle(SQLSMALLINT type, SQLHANDLE parent, SQLHANDLE* result)
SQLRETURN SQLFreeHandle(SQLSMALLINT type, SQLHANDLE handle) {
ARROW_LOG(DEBUG) << "SQLFreeHandle called with type: " << type
<< ", handle: " << handle;
// GH-47706 TODO: Add tests for SQLFreeStmt, pre-requisite requires
// SQLAllocStmt tests

switch (type) {
case SQL_HANDLE_ENV: {
using ODBC::ODBCEnvironment;
Expand Down Expand Up @@ -234,7 +227,6 @@ SQLRETURN SQLFreeStmt(SQLHSTMT handle, SQLUSMALLINT option) {
}

case SQL_UNBIND: {
// GH-47716 TODO: Add tests for SQLBindCol unbinding
using ODBC::ODBCDescriptor;
using ODBC::ODBCStatement;
return ODBCStatement::ExecuteWithDiagnostics(handle, SQL_ERROR, [=]() {
Expand Down Expand Up @@ -280,7 +272,6 @@ SQLRETURN SQLGetDiagField(SQLSMALLINT handle_type, SQLHANDLE handle,
<< ", diag_info_ptr: " << diag_info_ptr
<< ", buffer_length: " << buffer_length << ", string_length_ptr: "
<< static_cast<const void*>(string_length_ptr);
// GH-46575 TODO: Add tests for SQLGetDiagField
using ODBC::GetStringAttribute;
using ODBC::ODBCConnection;
using ODBC::ODBCDescriptor;
Expand Down Expand Up @@ -545,7 +536,6 @@ SQLRETURN SQLGetDiagRec(SQLSMALLINT handle_type, SQLHANDLE handle, SQLSMALLINT r
<< ", message_text: " << static_cast<const void*>(message_text)
<< ", buffer_length: " << buffer_length
<< ", text_length_ptr: " << static_cast<const void*>(text_length_ptr);
// GH-46575 TODO: Add tests for SQLGetDiagRec
using arrow::flight::sql::odbc::Diagnostics;
using ODBC::GetStringAttribute;
using ODBC::ODBCConnection;
Expand Down Expand Up @@ -1221,8 +1211,24 @@ SQLRETURN SQLColumns(SQLHSTMT stmt, SQLWCHAR* catalog_name,
<< ", table_name_length: " << table_name_length
<< ", column_name: " << static_cast<const void*>(column_name)
<< ", column_name_length: " << column_name_length;
// GH-47720 TODO: Implement SQLColumns
return SQL_INVALID_HANDLE;

using ODBC::ODBCStatement;
using ODBC::SqlWcharToString;

return ODBCStatement::ExecuteWithDiagnostics(stmt, SQL_ERROR, [=]() {
ODBCStatement* statement = reinterpret_cast<ODBCStatement*>(stmt);

std::string catalog = SqlWcharToString(catalog_name, catalog_name_length);
std::string schema = SqlWcharToString(schema_name, schema_name_length);
std::string table = SqlWcharToString(table_name, table_name_length);
std::string column = SqlWcharToString(column_name, column_name_length);

statement->GetColumns(catalog_name ? &catalog : nullptr,
schema_name ? &schema : nullptr, table_name ? &table : nullptr,
column_name ? &column : nullptr);

return SQL_SUCCESS;
});
}

SQLRETURN SQLColAttribute(SQLHSTMT stmt, SQLUSMALLINT record_number,
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 number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ add_arrow_test(flight_sql_odbc_test
SOURCES
odbc_test_suite.cc
odbc_test_suite.h
columns_test.cc
connection_attr_test.cc
connection_info_test.cc
connection_test.cc
Expand Down
Loading
Loading