Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 18 additions & 2 deletions cpp/src/arrow/flight/sql/odbc/odbc_api.cc
Original file line number Diff line number Diff line change
Expand Up @@ -935,8 +935,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
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_test.cc
# Enable Protobuf cleanup after test execution
# GH-46889: move protobuf_test_util to a more common location
Expand Down
Loading
Loading