Skip to content

Address general test code review comments #125

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
alinaliBQ merged 3 commits into from
Oct 28, 2025
Merged

Address general test code review comments #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf16a90
Use RAII helper for allocating and freeing env/conn handles
alinaliBQ Oct 21, 2025
b6f8be2
Address Justin's comments
alinaliBQ Oct 28, 2025
bad0aa7
Add fix for skipping the allocation of handles
alinaliBQ Oct 28, 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
4 changes: 2 additions & 2 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 @@ -31,7 +31,7 @@
#include "arrow/flight/sql/odbc/odbc_impl/spi/connection.h"
#include "arrow/util/logging.h"

#if defined _WIN32 || defined _WIN64
#if defined _WIN32
// For displaying DSN Window
# include "arrow/flight/sql/odbc/odbc_impl/system_dsn.h"
#endif
Expand Down Expand Up @@ -810,7 +810,7 @@ SQLRETURN SQLDriverConnect(SQLHDBC conn, SQLHWND window_handle,

// GH-46448 TODO: Implement SQL_DRIVER_COMPLETE_REQUIRED in SQLDriverConnect according
// to the spec
#if defined _WIN32 || defined _WIN64
#if defined _WIN32
// Load the DSN window according to driver_completion
if (driver_completion == SQL_DRIVER_PROMPT) {
// Load DSN window before first attempt to connect
Expand Down
166 changes: 91 additions & 75 deletions cpp/src/arrow/flight/sql/odbc/odbc_api_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,79 +27,95 @@
//
// Define internal ODBC API function headers.
namespace arrow::flight::sql::odbc {
SQLRETURN SQLAllocHandle(SQLSMALLINT type, SQLHANDLE parent, SQLHANDLE* result);
SQLRETURN SQLFreeHandle(SQLSMALLINT type, SQLHANDLE handle);
SQLRETURN SQLFreeStmt(SQLHSTMT stmt, SQLUSMALLINT option);
SQLRETURN SQLGetDiagField(SQLSMALLINT handle_type, SQLHANDLE handle,
SQLSMALLINT rec_number, SQLSMALLINT diag_identifier,
SQLPOINTER diag_info_ptr, SQLSMALLINT buffer_length,
SQLSMALLINT* string_length_ptr);
SQLRETURN SQLGetDiagRec(SQLSMALLINT handle_type, SQLHANDLE handle, SQLSMALLINT rec_number,
SQLWCHAR* sql_state, SQLINTEGER* native_error_ptr,
SQLWCHAR* message_text, SQLSMALLINT buffer_length,
SQLSMALLINT* text_length_ptr);
SQLRETURN SQLGetEnvAttr(SQLHENV env, SQLINTEGER attr, SQLPOINTER value_ptr,
SQLINTEGER buffer_len, SQLINTEGER* str_len_ptr);
SQLRETURN SQLSetEnvAttr(SQLHENV env, SQLINTEGER attr, SQLPOINTER value_ptr,
SQLINTEGER str_len);
SQLRETURN SQLGetConnectAttr(SQLHDBC conn, SQLINTEGER attribute, SQLPOINTER value_ptr,
SQLINTEGER buffer_length, SQLINTEGER* string_length_ptr);
SQLRETURN SQLSetConnectAttr(SQLHDBC conn, SQLINTEGER attr, SQLPOINTER value,
SQLINTEGER value_len);
SQLRETURN SQLDriverConnect(SQLHDBC conn, SQLHWND window_handle,
SQLWCHAR* in_connection_string,
SQLSMALLINT in_connection_string_len,
SQLWCHAR* out_connection_string,
SQLSMALLINT out_connection_string_buffer_len,
SQLSMALLINT* out_connection_string_len,
SQLUSMALLINT driver_completion);
SQLRETURN SQLConnect(SQLHDBC conn, SQLWCHAR* dsn_name, SQLSMALLINT dsn_name_len,
SQLWCHAR* user_name, SQLSMALLINT user_name_len, SQLWCHAR* password,
SQLSMALLINT password_len);
SQLRETURN SQLDisconnect(SQLHDBC conn);
SQLRETURN SQLGetInfo(SQLHDBC conn, SQLUSMALLINT info_type, SQLPOINTER info_value_ptr,
SQLSMALLINT buf_len, SQLSMALLINT* length);
SQLRETURN SQLGetStmtAttr(SQLHSTMT stmt, SQLINTEGER attribute, SQLPOINTER value_ptr,
SQLINTEGER buffer_length, SQLINTEGER* string_length_ptr);
SQLRETURN SQLSetStmtAttr(SQLHSTMT stmt, SQLINTEGER attribute, SQLPOINTER value_ptr,
SQLINTEGER stringLength);
SQLRETURN SQLExecDirect(SQLHSTMT stmt, SQLWCHAR* queryText, SQLINTEGER text_length);
SQLRETURN SQLPrepare(SQLHSTMT stmt, SQLWCHAR* queryText, SQLINTEGER text_length);
SQLRETURN SQLExecute(SQLHSTMT stmt);
SQLRETURN SQLFetch(SQLHSTMT stmt);
SQLRETURN SQLExtendedFetch(SQLHSTMT stmt, SQLUSMALLINT fetch_orientation,
SQLLEN fetch_offset, SQLULEN* row_count_ptr,
SQLUSMALLINT* row_status_array);
SQLRETURN SQLFetchScroll(SQLHSTMT stmt, SQLSMALLINT fetch_orientation,
SQLLEN fetch_offset);
SQLRETURN SQLBindCol(SQLHSTMT stmt, SQLUSMALLINT record_number, SQLSMALLINT c_type,
SQLPOINTER data_ptr, SQLLEN buffer_length, SQLLEN* indicator_ptr);
SQLRETURN SQLCloseCursor(SQLHSTMT stmt);
SQLRETURN SQLGetData(SQLHSTMT stmt, SQLUSMALLINT record_number, SQLSMALLINT c_type,
SQLPOINTER data_ptr, SQLLEN buffer_length, SQLLEN* indicator_ptr);
SQLRETURN SQLMoreResults(SQLHSTMT stmt);
SQLRETURN SQLNumResultCols(SQLHSTMT stmt, SQLSMALLINT* column_count_ptr);
SQLRETURN SQLRowCount(SQLHSTMT stmt, SQLLEN* row_count_ptr);
SQLRETURN SQLTables(SQLHSTMT stmt, SQLWCHAR* catalog_name,
SQLSMALLINT catalog_name_length, SQLWCHAR* schema_name,
SQLSMALLINT schema_name_length, SQLWCHAR* table_name,
SQLSMALLINT table_name_length, SQLWCHAR* table_type,
SQLSMALLINT table_type_length);
SQLRETURN SQLColumns(SQLHSTMT stmt, SQLWCHAR* catalog_name,
SQLSMALLINT catalog_name_length, SQLWCHAR* schema_name,
SQLSMALLINT schema_name_length, SQLWCHAR* table_name,
SQLSMALLINT table_name_length, SQLWCHAR* column_name,
SQLSMALLINT column_name_length);
SQLRETURN SQLColAttribute(SQLHSTMT stmt, SQLUSMALLINT record_number,
SQLUSMALLINT field_identifier,
SQLPOINTER character_attribute_ptr, SQLSMALLINT buffer_length,
SQLSMALLINT* output_length, SQLLEN* numeric_attribute_ptr);
SQLRETURN SQLGetTypeInfo(SQLHSTMT stmt, SQLSMALLINT dataType);
SQLRETURN SQLNativeSql(SQLHDBC conn, SQLWCHAR* in_statement_text,
SQLINTEGER in_statement_text_length, SQLWCHAR* out_statement_text,
SQLINTEGER buffer_length, SQLINTEGER* out_statement_text_length);
SQLRETURN SQLDescribeCol(SQLHSTMT stmt, SQLUSMALLINT column_number, SQLWCHAR* column_name,
SQLSMALLINT buffer_length, SQLSMALLINT* name_length_ptr,
SQLSMALLINT* data_type_ptr, SQLULEN* column_size_ptr,
SQLSMALLINT* decimal_digits_ptr, SQLSMALLINT* nullable_ptr);
[[nodiscard]] SQLRETURN SQLAllocHandle(SQLSMALLINT type, SQLHANDLE parent,
SQLHANDLE* result);
[[nodiscard]] SQLRETURN SQLFreeHandle(SQLSMALLINT type, SQLHANDLE handle);
[[nodiscard]] SQLRETURN SQLFreeStmt(SQLHSTMT stmt, SQLUSMALLINT option);
[[nodiscard]] SQLRETURN SQLGetDiagField(SQLSMALLINT handle_type, SQLHANDLE handle,
SQLSMALLINT rec_number,
SQLSMALLINT diag_identifier,
SQLPOINTER diag_info_ptr,
SQLSMALLINT buffer_length,
SQLSMALLINT* string_length_ptr);
[[nodiscard]] SQLRETURN SQLGetDiagRec(SQLSMALLINT handle_type, SQLHANDLE handle,
SQLSMALLINT rec_number, SQLWCHAR* sql_state,
SQLINTEGER* native_error_ptr,
SQLWCHAR* message_text, SQLSMALLINT buffer_length,
SQLSMALLINT* text_length_ptr);
[[nodiscard]] SQLRETURN SQLGetEnvAttr(SQLHENV env, SQLINTEGER attr, SQLPOINTER value_ptr,
SQLINTEGER buffer_len, SQLINTEGER* str_len_ptr);
[[nodiscard]] SQLRETURN SQLSetEnvAttr(SQLHENV env, SQLINTEGER attr, SQLPOINTER value_ptr,
SQLINTEGER str_len);
[[nodiscard]] SQLRETURN SQLGetConnectAttr(SQLHDBC conn, SQLINTEGER attribute,
SQLPOINTER value_ptr, SQLINTEGER buffer_length,
SQLINTEGER* string_length_ptr);
[[nodiscard]] SQLRETURN SQLSetConnectAttr(SQLHDBC conn, SQLINTEGER attr, SQLPOINTER value,
SQLINTEGER value_len);
[[nodiscard]] SQLRETURN SQLDriverConnect(SQLHDBC conn, SQLHWND window_handle,
SQLWCHAR* in_connection_string,
SQLSMALLINT in_connection_string_len,
SQLWCHAR* out_connection_string,
SQLSMALLINT out_connection_string_buffer_len,
SQLSMALLINT* out_connection_string_len,
SQLUSMALLINT driver_completion);
[[nodiscard]] SQLRETURN SQLConnect(SQLHDBC conn, SQLWCHAR* dsn_name,
SQLSMALLINT dsn_name_len, SQLWCHAR* user_name,
SQLSMALLINT user_name_len, SQLWCHAR* password,
SQLSMALLINT password_len);
[[nodiscard]] SQLRETURN SQLDisconnect(SQLHDBC conn);
[[nodiscard]] SQLRETURN SQLGetInfo(SQLHDBC conn, SQLUSMALLINT info_type,
SQLPOINTER info_value_ptr, SQLSMALLINT buf_len,
SQLSMALLINT* length);
[[nodiscard]] SQLRETURN SQLGetStmtAttr(SQLHSTMT stmt, SQLINTEGER attribute,
SQLPOINTER value_ptr, SQLINTEGER buffer_length,
SQLINTEGER* string_length_ptr);
[[nodiscard]] SQLRETURN SQLSetStmtAttr(SQLHSTMT stmt, SQLINTEGER attribute,
SQLPOINTER value_ptr, SQLINTEGER stringLength);
[[nodiscard]] SQLRETURN SQLExecDirect(SQLHSTMT stmt, SQLWCHAR* queryText,
SQLINTEGER text_length);
[[nodiscard]] SQLRETURN SQLPrepare(SQLHSTMT stmt, SQLWCHAR* queryText,
SQLINTEGER text_length);
[[nodiscard]] SQLRETURN SQLExecute(SQLHSTMT stmt);
[[nodiscard]] SQLRETURN SQLFetch(SQLHSTMT stmt);
[[nodiscard]] SQLRETURN SQLExtendedFetch(SQLHSTMT stmt, SQLUSMALLINT fetch_orientation,
SQLLEN fetch_offset, SQLULEN* row_count_ptr,
SQLUSMALLINT* row_status_array);
[[nodiscard]] SQLRETURN SQLFetchScroll(SQLHSTMT stmt, SQLSMALLINT fetch_orientation,
SQLLEN fetch_offset);
[[nodiscard]] SQLRETURN SQLBindCol(SQLHSTMT stmt, SQLUSMALLINT record_number,
SQLSMALLINT c_type, SQLPOINTER data_ptr,
SQLLEN buffer_length, SQLLEN* indicator_ptr);
[[nodiscard]] SQLRETURN SQLCloseCursor(SQLHSTMT stmt);
[[nodiscard]] SQLRETURN SQLGetData(SQLHSTMT stmt, SQLUSMALLINT record_number,
SQLSMALLINT c_type, SQLPOINTER data_ptr,
SQLLEN buffer_length, SQLLEN* indicator_ptr);
[[nodiscard]] SQLRETURN SQLMoreResults(SQLHSTMT stmt);
[[nodiscard]] SQLRETURN SQLNumResultCols(SQLHSTMT stmt, SQLSMALLINT* column_count_ptr);
[[nodiscard]] SQLRETURN SQLRowCount(SQLHSTMT stmt, SQLLEN* row_count_ptr);
[[nodiscard]] SQLRETURN SQLTables(SQLHSTMT stmt, SQLWCHAR* catalog_name,
SQLSMALLINT catalog_name_length, SQLWCHAR* schema_name,
SQLSMALLINT schema_name_length, SQLWCHAR* table_name,
SQLSMALLINT table_name_length, SQLWCHAR* table_type,
SQLSMALLINT table_type_length);
[[nodiscard]] SQLRETURN SQLColumns(SQLHSTMT stmt, SQLWCHAR* catalog_name,
SQLSMALLINT catalog_name_length, SQLWCHAR* schema_name,
SQLSMALLINT schema_name_length, SQLWCHAR* table_name,
SQLSMALLINT table_name_length, SQLWCHAR* column_name,
SQLSMALLINT column_name_length);
[[nodiscard]] SQLRETURN SQLColAttribute(SQLHSTMT stmt, SQLUSMALLINT record_number,
SQLUSMALLINT field_identifier,
SQLPOINTER character_attribute_ptr,
SQLSMALLINT buffer_length,
SQLSMALLINT* output_length,
SQLLEN* numeric_attribute_ptr);
[[nodiscard]] SQLRETURN SQLGetTypeInfo(SQLHSTMT stmt, SQLSMALLINT dataType);
[[nodiscard]] SQLRETURN SQLNativeSql(SQLHDBC conn, SQLWCHAR* in_statement_text,
SQLINTEGER in_statement_text_length,
SQLWCHAR* out_statement_text,
SQLINTEGER buffer_length,
SQLINTEGER* out_statement_text_length);
[[nodiscard]] SQLRETURN SQLDescribeCol(
SQLHSTMT stmt, SQLUSMALLINT column_number, SQLWCHAR* column_name,
SQLSMALLINT buffer_length, SQLSMALLINT* name_length_ptr, SQLSMALLINT* data_type_ptr,
SQLULEN* column_size_ptr, SQLSMALLINT* decimal_digits_ptr, SQLSMALLINT* nullable_ptr);
} // namespace arrow::flight::sql::odbc
Loading
Loading