GH-47707: [C++][FlightRPC] Add tests for descriptor handle allocation#48053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lidavidm merged 2 commits into from
Dec 9, 2025
Merged

GH-47707: [C++][FlightRPC] Add tests for descriptor handle allocation #48053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e80551c
Add tests for `SQL_HANDLE_DESC` handle allocation
alinaliBQ Dec 4, 2025
b6e87e2
Use nullptr explicitly
alinaliBQ Dec 8, 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
5 changes: 0 additions & 5 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@@ -44,9 +44,6 @@ SQLRETURN SQLAllocHandle(SQLSMALLINT type, SQLHANDLE parent, SQLHANDLE* result)
// GH-47706 TODO: Add tests for SQLAllocStmt, pre-requisite requires
// SQLDriverConnect implementation

// GH-47707 TODO: Add tests for SQL_HANDLE_DESC implementation for
Comment thread
alinaliBQ marked this conversation as resolved.
// descriptor handle, pre-requisite requires SQLAllocStmt

*result = nullptr;

switch (type) {
Expand DownExpand Up@@ -147,8 +144,6 @@ SQLRETURN SQLFreeHandle(SQLSMALLINT type, SQLHANDLE handle) {
// GH-47706 TODO: Add tests for SQLFreeStmt, pre-requisite requires
// SQLAllocStmt tests

// GH-47707 TODO: Add tests for SQL_HANDLE_DESC implementation for
// descriptor handle
switch (type) {
case SQL_HANDLE_ENV: {
using ODBC::ODBCEnvironment;
Expand Down
3 changes: 3 additions & 0 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_statement.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,9 @@ class ODBCStatement : public ODBCHandle<ODBCStatement> {
void SetStmtAttr(SQLINTEGER statement_attribute, SQLPOINTER value,
SQLINTEGER buffer_size, bool is_unicode);

/// \brief Revert back to implicitly allocated internal descriptors.
/// isApd as True indicates APD descritor is to be reverted.
/// isApd as False indicates ARD descritor is to be reverted.
void RevertAppDescriptor(bool is_apd);

inline ODBCDescriptor* GetIRD() { return ird_.get(); }
Expand Down
56 changes: 30 additions & 26 deletions cpp/src/arrow/flight/sql/odbc/tests/connection_attr_test.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,23 +146,25 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrTxnIsolationUnsupported
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrDbcInfoTokenSetOnly) {
// Verify that set-only attribute cannot be read
SQLPOINTER ptr = NULL;
ASSERT_EQ(SQL_ERROR, SQLGetConnectAttr(this->conn, SQL_ATTR_DBC_INFO_TOKEN, ptr, 0, 0));
ASSERT_EQ(SQL_ERROR,
SQLGetConnectAttr(this->conn, SQL_ATTR_DBC_INFO_TOKEN, ptr, 0, nullptr));
VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateHY092);
}
#endif

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrOdbcCursorsDMOnly) {
// Verify that DM-only attribute is handled by driver manager
SQLULEN cursor_attr;
ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_ODBC_CURSORS, &cursor_attr, 0, 0));
ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_ODBC_CURSORS,
&cursor_attr, 0, nullptr));
EXPECT_EQ(SQL_CUR_USE_DRIVER, cursor_attr);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTraceDMOnly) {
// Verify that DM-only attribute is handled by driver manager
SQLUINTEGER trace;
ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_TRACE, &trace, 0, 0));
ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_TRACE, &trace, 0, nullptr));
EXPECT_EQ(SQL_OPT_TRACE_OFF, trace);
}

Expand DownExpand Up@@ -190,15 +192,15 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTranslateLibUnsupported

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTranslateOptionUnsupported) {
SQLINTEGER option;
ASSERT_EQ(SQL_ERROR,
SQLGetConnectAttr(this->conn, SQL_ATTR_TRANSLATE_OPTION, &option, 0, 0));
ASSERT_EQ(SQL_ERROR, SQLGetConnectAttr(this->conn, SQL_ATTR_TRANSLATE_OPTION, &option,
0, nullptr));
VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateHYC00);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTxnIsolationUnsupported) {
SQLINTEGER isolation;
ASSERT_EQ(SQL_ERROR,
SQLGetConnectAttr(this->conn, SQL_ATTR_TXN_ISOLATION, &isolation, 0, 0));
ASSERT_EQ(SQL_ERROR, SQLGetConnectAttr(this->conn, SQL_ATTR_TXN_ISOLATION, &isolation,
0, nullptr));
VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateHYC00);
}

Expand All@@ -219,7 +221,7 @@ TYPED_TEST(ConnectionAttributeTest,
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcEventDefault) {
SQLPOINTER ptr = NULL;
ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_EVENT, ptr, 0, 0));
SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_EVENT, ptr, 0, nullptr));
EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}
#endif
Expand All@@ -228,7 +230,7 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcEventDefault) {
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcPcallbackDefault) {
SQLPOINTER ptr = NULL;
ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCALLBACK, ptr, 0, 0));
SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCALLBACK, ptr, 0, nullptr));
EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}
#endif
Expand All@@ -237,41 +239,43 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcPcallbackDefaul
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcPcontextDefault) {
SQLPOINTER ptr = NULL;
ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCONTEXT, ptr, 0, 0));
SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCONTEXT, ptr, 0, nullptr));
EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}
#endif

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncEnableDefault) {
SQLULEN enable;
ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_ENABLE, &enable, 0, 0));
SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_ENABLE, &enable, 0, nullptr));
EXPECT_EQ(SQL_ASYNC_ENABLE_OFF, enable);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAutoIpdDefault) {
SQLUINTEGER ipd;
ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_AUTO_IPD, &ipd, 0, 0));
ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_AUTO_IPD, &ipd, 0, nullptr));
EXPECT_EQ(static_cast<SQLUINTEGER>(SQL_FALSE), ipd);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAutocommitDefault) {
SQLUINTEGER auto_commit;
ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_AUTOCOMMIT, &auto_commit, 0, 0));
SQLGetConnectAttr(this->conn, SQL_ATTR_AUTOCOMMIT, &auto_commit, 0, nullptr));
EXPECT_EQ(SQL_AUTOCOMMIT_ON, auto_commit);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrEnlistInDtcDefault) {
SQLPOINTER ptr = NULL;
ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_ENLIST_IN_DTC, ptr, 0, 0));
SQLGetConnectAttr(this->conn, SQL_ATTR_ENLIST_IN_DTC, ptr, 0, nullptr));
EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrQuietModeDefault) {
HWND ptr = NULL;
ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_QUIET_MODE, ptr, 0, 0));
ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_QUIET_MODE, ptr, 0, nullptr));
EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}

Expand All@@ -281,7 +285,7 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrAccessModeValid) {
// Check default value first
SQLUINTEGER mode = -1;
ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, 0));
SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, nullptr));
EXPECT_EQ(SQL_MODE_READ_WRITE, mode);

ASSERT_EQ(SQL_SUCCESS,
Expand All@@ -290,7 +294,7 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrAccessModeValid) {

mode = -1;
ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, 0));
SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, nullptr));
EXPECT_EQ(SQL_MODE_READ_WRITE, mode);

// Attempt to set to SQL_MODE_READ_ONLY, driver should return warning and not error
Expand All@@ -305,32 +309,32 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrAccessModeValid) {
TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrConnectionTimeoutValid) {
// Check default value first
SQLUINTEGER timeout = -1;
ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT, &timeout, 0, 0));
ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT,
&timeout, 0, nullptr));
EXPECT_EQ(0, timeout);

ASSERT_EQ(SQL_SUCCESS, SQLSetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT,
reinterpret_cast<SQLPOINTER>(42), 0));

timeout = -1;
ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT, &timeout, 0, 0));
ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT,
&timeout, 0, nullptr));
EXPECT_EQ(42, timeout);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrLoginTimeoutValid) {
// Check default value first
SQLUINTEGER timeout = -1;
ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, 0));
SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, nullptr));
EXPECT_EQ(0, timeout);

ASSERT_EQ(SQL_SUCCESS, SQLSetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT,
reinterpret_cast<SQLPOINTER>(42), 0));

timeout = -1;
ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, 0));
SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, nullptr));
EXPECT_EQ(42, timeout);
}

Expand All@@ -340,15 +344,15 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrPacketSizeValid) {
// Check default value first
SQLUINTEGER size = -1;
ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, 0));
SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, nullptr));
EXPECT_EQ(0, size);

ASSERT_EQ(SQL_SUCCESS, SQLSetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE,
reinterpret_cast<SQLPOINTER>(0), 0));

size = -1;
ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, 0));
SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, nullptr));
EXPECT_EQ(0, size);

// Attempt to set to non-zero value, driver should return warning and not error
Expand Down
6 changes: 4 additions & 2 deletions cpp/src/arrow/flight/sql/odbc/tests/connection_info_test.cc
View file
Open in desktop
Comment thread
alinaliBQ marked this conversation as resolved.
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,8 @@ TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDriverHdesc) {

// Value returned from driver manager is the desc address
SQLHDESC local_desc = descriptor;
ASSERT_EQ(SQL_SUCCESS, SQLGetInfo(this->conn, SQL_HANDLE_DESC, &local_desc, 0, 0));
ASSERT_EQ(SQL_SUCCESS,
SQLGetInfo(this->conn, SQL_HANDLE_DESC, &local_desc, 0, nullptr));
EXPECT_GT(local_desc, static_cast<SQLHSTMT>(0));

// Free descriptor handle
Expand DownExpand Up@@ -194,7 +195,8 @@ TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDriverHlib) {
TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDriverHstmt) {
// Value returned from driver manager is the stmt address
SQLHSTMT local_stmt = this->stmt;
ASSERT_EQ(SQL_SUCCESS, SQLGetInfo(this->conn, SQL_DRIVER_HSTMT, &local_stmt, 0, 0));
ASSERT_EQ(SQL_SUCCESS,
SQLGetInfo(this->conn, SQL_DRIVER_HSTMT, &local_stmt, 0, nullptr));
EXPECT_GT(local_stmt, static_cast<SQLHSTMT>(0));
}

Expand Down
73 changes: 70 additions & 3 deletions cpp/src/arrow/flight/sql/odbc/tests/connection_test.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,7 @@ TEST(SQLGetEnvAttr, TestSQLGetEnvAttrODBCVersion) {
// Allocate an environment handle
ASSERT_EQ(SQL_SUCCESS, SQLAllocEnv(&env));

ASSERT_EQ(SQL_SUCCESS, SQLGetEnvAttr(env, SQL_ATTR_ODBC_VERSION, &version, 0, 0));
ASSERT_EQ(SQL_SUCCESS, SQLGetEnvAttr(env, SQL_ATTR_ODBC_VERSION, &version, 0, nullptr));

ASSERT_EQ(SQL_OV_ODBC2, version);

Expand DownExpand Up@@ -155,7 +155,7 @@ TYPED_TEST(ConnectionTest, TestSQLGetEnvAttrOutputNTS) {
SQLINTEGER output_nts;

ASSERT_EQ(SQL_SUCCESS,
SQLGetEnvAttr(this->env, SQL_ATTR_OUTPUT_NTS, &output_nts, 0, 0));
SQLGetEnvAttr(this->env, SQL_ATTR_OUTPUT_NTS, &output_nts, 0, nullptr));

ASSERT_EQ(SQL_TRUE, output_nts);
}
Expand DownExpand Up@@ -432,7 +432,7 @@ TEST_F(ConnectionRemoteTest, TestSQLConnectDSNPrecedence) {
<< GetOdbcErrorMessage(SQL_HANDLE_DBC, conn);
}

#endif
#endif // _WIN32

TEST_F(ConnectionRemoteTest, TestSQLDriverConnectInvalidUid) {
// Invalid connect string
Expand DownExpand Up@@ -508,4 +508,71 @@ TYPED_TEST(ConnectionHandleTest, TestCloseConnectionWithOpenStatement) {
ASSERT_EQ(SQL_SUCCESS, SQLDisconnect(this->conn));
}

TYPED_TEST(ConnectionTest, TestSQLAllocFreeDesc) {
SQLHDESC descriptor;

// Allocate a descriptor using alloc handle
ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_DESC, this->conn, &descriptor));

// Free descriptor handle
ASSERT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_DESC, descriptor));
}

TYPED_TEST(ConnectionTest, TestSQLSetStmtAttrDescriptor) {
SQLHDESC apd_descriptor, ard_descriptor;

// Allocate an APD descriptor using alloc handle
ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_DESC, this->conn, &apd_descriptor));

// Allocate an ARD descriptor using alloc handle
ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_DESC, this->conn, &ard_descriptor));

// Save implicitly allocated internal APD and ARD descriptor pointers
SQLPOINTER internal_apd, internal_ard = nullptr;

EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC,
&internal_apd, sizeof(internal_apd), 0));

EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC, &internal_ard,
sizeof(internal_ard), 0));

// Set APD descriptor to explicitly allocated handle
EXPECT_EQ(SQL_SUCCESS, SQLSetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC,
reinterpret_cast<SQLPOINTER>(apd_descriptor), 0));

// Set ARD descriptor to explicitly allocated handle
EXPECT_EQ(SQL_SUCCESS, SQLSetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC,
reinterpret_cast<SQLPOINTER>(ard_descriptor), 0));

// Verify APD and ARD descriptors are set to explicitly allocated pointers
SQLPOINTER value = nullptr;
EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC, &value,
sizeof(value), 0));

EXPECT_EQ(apd_descriptor, value);

EXPECT_EQ(SQL_SUCCESS,
SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC, &value, sizeof(value), 0));

EXPECT_EQ(ard_descriptor, value);

// Free explicitly allocated APD and ARD descriptor handles
ASSERT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_DESC, apd_descriptor));

ASSERT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_DESC, ard_descriptor));

// Verify APD and ARD descriptors has been reverted to implicit descriptors
value = nullptr;

EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC, &value,
sizeof(value), 0));

EXPECT_EQ(internal_apd, value);

EXPECT_EQ(SQL_SUCCESS,
SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC, &value, sizeof(value), 0));

EXPECT_EQ(internal_ard, value);
}

} // namespace arrow::flight::sql::odbc
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 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-47707: [C++][FlightRPC] Add tests for descriptor handle allocation#48053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lidavidm
merged 2 commits into

from

Dec 9, 2025
 Merged


GH-47707: [C++][FlightRPC] Add tests for descriptor handle allocation
#48053
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
e80551c

Add tests for `SQL_HANDLE_DESC` handle allocation


alinaliBQ Dec 4, 2025
b6e87e2

Use nullptr explicitly


alinaliBQ Dec 8, 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


5 changes: 0 additions & 5 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@@ -44,9 +44,6 @@ SQLRETURN SQLAllocHandle(SQLSMALLINT type, SQLHANDLE parent, SQLHANDLE* result)
 // GH-47706 TODO: Add tests for SQLAllocStmt, pre-requisite requires
 // SQLDriverConnect implementation

 // GH-47707 TODO: Add tests for SQL_HANDLE_DESC implementation for
Comment thread
alinaliBQ marked this conversation as resolved.

 // descriptor handle, pre-requisite requires SQLAllocStmt

 *result = nullptr;

 switch (type) {
Expand DownExpand Up@@ -147,8 +144,6 @@ SQLRETURN SQLFreeHandle(SQLSMALLINT type, SQLHANDLE handle) {
 // GH-47706 TODO: Add tests for SQLFreeStmt, pre-requisite requires
 // SQLAllocStmt tests

 // GH-47707 TODO: Add tests for SQL_HANDLE_DESC implementation for
 // descriptor handle
 switch (type) {
 case SQL_HANDLE_ENV: {
 using ODBC::ODBCEnvironment;
Expand Down

3 changes: 3 additions & 0 deletions
cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_statement.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,9 @@ class ODBCStatement : public ODBCHandle<ODBCStatement> {
 void SetStmtAttr(SQLINTEGER statement_attribute, SQLPOINTER value,
 SQLINTEGER buffer_size, bool is_unicode);

 /// \brief Revert back to implicitly allocated internal descriptors.
 /// isApd as True indicates APD descritor is to be reverted.
 /// isApd as False indicates ARD descritor is to be reverted.
 void RevertAppDescriptor(bool is_apd);

 inline ODBCDescriptor* GetIRD() { return ird_.get(); }
Expand Down

56 changes: 30 additions & 26 deletions
cpp/src/arrow/flight/sql/odbc/tests/connection_attr_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -146,23 +146,25 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrTxnIsolationUnsupported
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrDbcInfoTokenSetOnly) {
 // Verify that set-only attribute cannot be read
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_ERROR, SQLGetConnectAttr(this->conn, SQL_ATTR_DBC_INFO_TOKEN, ptr, 0, 0));
 ASSERT_EQ(SQL_ERROR,
 SQLGetConnectAttr(this->conn, SQL_ATTR_DBC_INFO_TOKEN, ptr, 0, nullptr));
 VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateHY092);
}
#endif

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrOdbcCursorsDMOnly) {
 // Verify that DM-only attribute is handled by driver manager
 SQLULEN cursor_attr;
 ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_ODBC_CURSORS, &cursor_attr, 0, 0));
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_ODBC_CURSORS,
&cursor_attr, 0, nullptr));
 EXPECT_EQ(SQL_CUR_USE_DRIVER, cursor_attr);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTraceDMOnly) {
 // Verify that DM-only attribute is handled by driver manager
 SQLUINTEGER trace;
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_TRACE, &trace, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_TRACE, &trace, 0, nullptr));
 EXPECT_EQ(SQL_OPT_TRACE_OFF, trace);
}

Expand DownExpand Up@@ -190,15 +192,15 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTranslateLibUnsupported

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTranslateOptionUnsupported) {
 SQLINTEGER option;
 ASSERT_EQ(SQL_ERROR,
SQLGetConnectAttr(this->conn, SQL_ATTR_TRANSLATE_OPTION, &option, 0, 0));
 ASSERT_EQ(SQL_ERROR, SQLGetConnectAttr(this->conn, SQL_ATTR_TRANSLATE_OPTION, &option,
0, nullptr));
 VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateHYC00);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTxnIsolationUnsupported) {
 SQLINTEGER isolation;
 ASSERT_EQ(SQL_ERROR,
SQLGetConnectAttr(this->conn, SQL_ATTR_TXN_ISOLATION, &isolation, 0, 0));
 ASSERT_EQ(SQL_ERROR, SQLGetConnectAttr(this->conn, SQL_ATTR_TXN_ISOLATION, &isolation,
0, nullptr));
 VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateHYC00);
}

Expand All@@ -219,7 +221,7 @@ TYPED_TEST(ConnectionAttributeTest,
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcEventDefault) {
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_EVENT, ptr, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_EVENT, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}
#endif
Expand All@@ -228,7 +230,7 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcEventDefault) {
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcPcallbackDefault) {
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCALLBACK, ptr, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCALLBACK, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}
#endif
Expand All@@ -237,41 +239,43 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcPcallbackDefaul
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcPcontextDefault) {
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCONTEXT, ptr, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCONTEXT, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}
#endif

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncEnableDefault) {
 SQLULEN enable;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_ENABLE, &enable, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_ENABLE, &enable, 0, nullptr));
 EXPECT_EQ(SQL_ASYNC_ENABLE_OFF, enable);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAutoIpdDefault) {
 SQLUINTEGER ipd;
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_AUTO_IPD, &ipd, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_AUTO_IPD, &ipd, 0, nullptr));
 EXPECT_EQ(static_cast<SQLUINTEGER>(SQL_FALSE), ipd);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAutocommitDefault) {
 SQLUINTEGER auto_commit;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_AUTOCOMMIT, &auto_commit, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_AUTOCOMMIT, &auto_commit, 0, nullptr));
 EXPECT_EQ(SQL_AUTOCOMMIT_ON, auto_commit);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrEnlistInDtcDefault) {
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ENLIST_IN_DTC, ptr, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ENLIST_IN_DTC, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrQuietModeDefault) {
 HWND ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_QUIET_MODE, ptr, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_QUIET_MODE, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}

Expand All@@ -281,7 +285,7 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrAccessModeValid) {
 // Check default value first
 SQLUINTEGER mode = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, nullptr));
 EXPECT_EQ(SQL_MODE_READ_WRITE, mode);

 ASSERT_EQ(SQL_SUCCESS,
Expand All@@ -290,7 +294,7 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrAccessModeValid) {

 mode = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, nullptr));
 EXPECT_EQ(SQL_MODE_READ_WRITE, mode);

 // Attempt to set to SQL_MODE_READ_ONLY, driver should return warning and not error
Expand All@@ -305,32 +309,32 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrAccessModeValid) {
TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrConnectionTimeoutValid) {
 // Check default value first
 SQLUINTEGER timeout = -1;
 ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT, &timeout, 0, 0));
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT,
&timeout, 0, nullptr));
 EXPECT_EQ(0, timeout);

 ASSERT_EQ(SQL_SUCCESS, SQLSetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT,
 reinterpret_cast<SQLPOINTER>(42), 0));

 timeout = -1;
 ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT, &timeout, 0, 0));
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT,
&timeout, 0, nullptr));
 EXPECT_EQ(42, timeout);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrLoginTimeoutValid) {
 // Check default value first
 SQLUINTEGER timeout = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, nullptr));
 EXPECT_EQ(0, timeout);

 ASSERT_EQ(SQL_SUCCESS, SQLSetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT,
 reinterpret_cast<SQLPOINTER>(42), 0));

 timeout = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, nullptr));
 EXPECT_EQ(42, timeout);
}

Expand All@@ -340,15 +344,15 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrPacketSizeValid) {
 // Check default value first
 SQLUINTEGER size = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, nullptr));
 EXPECT_EQ(0, size);

 ASSERT_EQ(SQL_SUCCESS, SQLSetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE,
 reinterpret_cast<SQLPOINTER>(0), 0));

 size = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, nullptr));
 EXPECT_EQ(0, size);

 // Attempt to set to non-zero value, driver should return warning and not error
Expand Down

6 changes: 4 additions & 2 deletions
cpp/src/arrow/flight/sql/odbc/tests/connection_info_test.cc

View file


Open in desktop

Comment thread
alinaliBQ marked this conversation as resolved.

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,8 @@ TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDriverHdesc) {

 // Value returned from driver manager is the desc address
 SQLHDESC local_desc = descriptor;
 ASSERT_EQ(SQL_SUCCESS, SQLGetInfo(this->conn, SQL_HANDLE_DESC, &local_desc, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetInfo(this->conn, SQL_HANDLE_DESC, &local_desc, 0, nullptr));
 EXPECT_GT(local_desc, static_cast<SQLHSTMT>(0));

 // Free descriptor handle
Expand DownExpand Up@@ -194,7 +195,8 @@ TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDriverHlib) {
TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDriverHstmt) {
 // Value returned from driver manager is the stmt address
 SQLHSTMT local_stmt = this->stmt;
 ASSERT_EQ(SQL_SUCCESS, SQLGetInfo(this->conn, SQL_DRIVER_HSTMT, &local_stmt, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetInfo(this->conn, SQL_DRIVER_HSTMT, &local_stmt, 0, nullptr));
 EXPECT_GT(local_stmt, static_cast<SQLHSTMT>(0));
}

Expand Down

73 changes: 70 additions & 3 deletions
cpp/src/arrow/flight/sql/odbc/tests/connection_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,7 @@ TEST(SQLGetEnvAttr, TestSQLGetEnvAttrODBCVersion) {
 // Allocate an environment handle
 ASSERT_EQ(SQL_SUCCESS, SQLAllocEnv(&env));

 ASSERT_EQ(SQL_SUCCESS, SQLGetEnvAttr(env, SQL_ATTR_ODBC_VERSION, &version, 0, 0));
 ASSERT_EQ(SQL_SUCCESS, SQLGetEnvAttr(env, SQL_ATTR_ODBC_VERSION, &version, 0, nullptr));

 ASSERT_EQ(SQL_OV_ODBC2, version);

Expand DownExpand Up@@ -155,7 +155,7 @@ TYPED_TEST(ConnectionTest, TestSQLGetEnvAttrOutputNTS) {
 SQLINTEGER output_nts;

 ASSERT_EQ(SQL_SUCCESS,
 SQLGetEnvAttr(this->env, SQL_ATTR_OUTPUT_NTS, &output_nts, 0, 0));
 SQLGetEnvAttr(this->env, SQL_ATTR_OUTPUT_NTS, &output_nts, 0, nullptr));

 ASSERT_EQ(SQL_TRUE, output_nts);
}
Expand DownExpand Up@@ -432,7 +432,7 @@ TEST_F(ConnectionRemoteTest, TestSQLConnectDSNPrecedence) {
 << GetOdbcErrorMessage(SQL_HANDLE_DBC, conn);
}

#endif
#endif // _WIN32

TEST_F(ConnectionRemoteTest, TestSQLDriverConnectInvalidUid) {
 // Invalid connect string
Expand DownExpand Up@@ -508,4 +508,71 @@ TYPED_TEST(ConnectionHandleTest, TestCloseConnectionWithOpenStatement) {
 ASSERT_EQ(SQL_SUCCESS, SQLDisconnect(this->conn));
}

TYPED_TEST(ConnectionTest, TestSQLAllocFreeDesc) {
 SQLHDESC descriptor;

 // Allocate a descriptor using alloc handle
 ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_DESC, this->conn, &descriptor));

 // Free descriptor handle
 ASSERT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_DESC, descriptor));
}

TYPED_TEST(ConnectionTest, TestSQLSetStmtAttrDescriptor) {
 SQLHDESC apd_descriptor, ard_descriptor;

 // Allocate an APD descriptor using alloc handle
 ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_DESC, this->conn, &apd_descriptor));

 // Allocate an ARD descriptor using alloc handle
 ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_DESC, this->conn, &ard_descriptor));

 // Save implicitly allocated internal APD and ARD descriptor pointers
 SQLPOINTER internal_apd, internal_ard = nullptr;

 EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC,
 &internal_apd, sizeof(internal_apd), 0));

 EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC, &internal_ard,
 sizeof(internal_ard), 0));

 // Set APD descriptor to explicitly allocated handle
 EXPECT_EQ(SQL_SUCCESS, SQLSetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC,
 reinterpret_cast<SQLPOINTER>(apd_descriptor), 0));

 // Set ARD descriptor to explicitly allocated handle
 EXPECT_EQ(SQL_SUCCESS, SQLSetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC,
 reinterpret_cast<SQLPOINTER>(ard_descriptor), 0));

 // Verify APD and ARD descriptors are set to explicitly allocated pointers
 SQLPOINTER value = nullptr;
 EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC, &value,
 sizeof(value), 0));

 EXPECT_EQ(apd_descriptor, value);

 EXPECT_EQ(SQL_SUCCESS,
 SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC, &value, sizeof(value), 0));

 EXPECT_EQ(ard_descriptor, value);

 // Free explicitly allocated APD and ARD descriptor handles
 ASSERT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_DESC, apd_descriptor));

 ASSERT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_DESC, ard_descriptor));

 // Verify APD and ARD descriptors has been reverted to implicit descriptors
 value = nullptr;

 EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC, &value,
 sizeof(value), 0));

 EXPECT_EQ(internal_apd, value);

 EXPECT_EQ(SQL_SUCCESS,
 SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC, &value, sizeof(value), 0));

 EXPECT_EQ(internal_ard, value);
}

} // namespace arrow::flight::sql::odbc
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-47707: [C++][FlightRPC] Add tests for descriptor handle allocation#48053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lidavidm
merged 2 commits into

from

Dec 9, 2025
 Merged


GH-47707: [C++][FlightRPC] Add tests for descriptor handle allocation
#48053
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
e80551c

Add tests for `SQL_HANDLE_DESC` handle allocation


alinaliBQ Dec 4, 2025
b6e87e2

Use nullptr explicitly


alinaliBQ Dec 8, 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


5 changes: 0 additions & 5 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@@ -44,9 +44,6 @@ SQLRETURN SQLAllocHandle(SQLSMALLINT type, SQLHANDLE parent, SQLHANDLE* result)
 // GH-47706 TODO: Add tests for SQLAllocStmt, pre-requisite requires
 // SQLDriverConnect implementation

 // GH-47707 TODO: Add tests for SQL_HANDLE_DESC implementation for
Comment thread
alinaliBQ marked this conversation as resolved.

 // descriptor handle, pre-requisite requires SQLAllocStmt

 *result = nullptr;

 switch (type) {
Expand DownExpand Up@@ -147,8 +144,6 @@ SQLRETURN SQLFreeHandle(SQLSMALLINT type, SQLHANDLE handle) {
 // GH-47706 TODO: Add tests for SQLFreeStmt, pre-requisite requires
 // SQLAllocStmt tests

 // GH-47707 TODO: Add tests for SQL_HANDLE_DESC implementation for
 // descriptor handle
 switch (type) {
 case SQL_HANDLE_ENV: {
 using ODBC::ODBCEnvironment;
Expand Down

3 changes: 3 additions & 0 deletions
cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_statement.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,9 @@ class ODBCStatement : public ODBCHandle<ODBCStatement> {
 void SetStmtAttr(SQLINTEGER statement_attribute, SQLPOINTER value,
 SQLINTEGER buffer_size, bool is_unicode);

 /// \brief Revert back to implicitly allocated internal descriptors.
 /// isApd as True indicates APD descritor is to be reverted.
 /// isApd as False indicates ARD descritor is to be reverted.
 void RevertAppDescriptor(bool is_apd);

 inline ODBCDescriptor* GetIRD() { return ird_.get(); }
Expand Down

56 changes: 30 additions & 26 deletions
cpp/src/arrow/flight/sql/odbc/tests/connection_attr_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -146,23 +146,25 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrTxnIsolationUnsupported
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrDbcInfoTokenSetOnly) {
 // Verify that set-only attribute cannot be read
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_ERROR, SQLGetConnectAttr(this->conn, SQL_ATTR_DBC_INFO_TOKEN, ptr, 0, 0));
 ASSERT_EQ(SQL_ERROR,
 SQLGetConnectAttr(this->conn, SQL_ATTR_DBC_INFO_TOKEN, ptr, 0, nullptr));
 VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateHY092);
}
#endif

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrOdbcCursorsDMOnly) {
 // Verify that DM-only attribute is handled by driver manager
 SQLULEN cursor_attr;
 ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_ODBC_CURSORS, &cursor_attr, 0, 0));
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_ODBC_CURSORS,
&cursor_attr, 0, nullptr));
 EXPECT_EQ(SQL_CUR_USE_DRIVER, cursor_attr);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTraceDMOnly) {
 // Verify that DM-only attribute is handled by driver manager
 SQLUINTEGER trace;
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_TRACE, &trace, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_TRACE, &trace, 0, nullptr));
 EXPECT_EQ(SQL_OPT_TRACE_OFF, trace);
}

Expand DownExpand Up@@ -190,15 +192,15 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTranslateLibUnsupported

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTranslateOptionUnsupported) {
 SQLINTEGER option;
 ASSERT_EQ(SQL_ERROR,
SQLGetConnectAttr(this->conn, SQL_ATTR_TRANSLATE_OPTION, &option, 0, 0));
 ASSERT_EQ(SQL_ERROR, SQLGetConnectAttr(this->conn, SQL_ATTR_TRANSLATE_OPTION, &option,
0, nullptr));
 VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateHYC00);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTxnIsolationUnsupported) {
 SQLINTEGER isolation;
 ASSERT_EQ(SQL_ERROR,
SQLGetConnectAttr(this->conn, SQL_ATTR_TXN_ISOLATION, &isolation, 0, 0));
 ASSERT_EQ(SQL_ERROR, SQLGetConnectAttr(this->conn, SQL_ATTR_TXN_ISOLATION, &isolation,
0, nullptr));
 VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateHYC00);
}

Expand All@@ -219,7 +221,7 @@ TYPED_TEST(ConnectionAttributeTest,
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcEventDefault) {
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_EVENT, ptr, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_EVENT, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}
#endif
Expand All@@ -228,7 +230,7 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcEventDefault) {
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcPcallbackDefault) {
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCALLBACK, ptr, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCALLBACK, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}
#endif
Expand All@@ -237,41 +239,43 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcPcallbackDefaul
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcPcontextDefault) {
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCONTEXT, ptr, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCONTEXT, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}
#endif

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncEnableDefault) {
 SQLULEN enable;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_ENABLE, &enable, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_ENABLE, &enable, 0, nullptr));
 EXPECT_EQ(SQL_ASYNC_ENABLE_OFF, enable);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAutoIpdDefault) {
 SQLUINTEGER ipd;
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_AUTO_IPD, &ipd, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_AUTO_IPD, &ipd, 0, nullptr));
 EXPECT_EQ(static_cast<SQLUINTEGER>(SQL_FALSE), ipd);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAutocommitDefault) {
 SQLUINTEGER auto_commit;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_AUTOCOMMIT, &auto_commit, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_AUTOCOMMIT, &auto_commit, 0, nullptr));
 EXPECT_EQ(SQL_AUTOCOMMIT_ON, auto_commit);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrEnlistInDtcDefault) {
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ENLIST_IN_DTC, ptr, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ENLIST_IN_DTC, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrQuietModeDefault) {
 HWND ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_QUIET_MODE, ptr, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_QUIET_MODE, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}

Expand All@@ -281,7 +285,7 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrAccessModeValid) {
 // Check default value first
 SQLUINTEGER mode = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, nullptr));
 EXPECT_EQ(SQL_MODE_READ_WRITE, mode);

 ASSERT_EQ(SQL_SUCCESS,
Expand All@@ -290,7 +294,7 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrAccessModeValid) {

 mode = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, nullptr));
 EXPECT_EQ(SQL_MODE_READ_WRITE, mode);

 // Attempt to set to SQL_MODE_READ_ONLY, driver should return warning and not error
Expand All@@ -305,32 +309,32 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrAccessModeValid) {
TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrConnectionTimeoutValid) {
 // Check default value first
 SQLUINTEGER timeout = -1;
 ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT, &timeout, 0, 0));
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT,
&timeout, 0, nullptr));
 EXPECT_EQ(0, timeout);

 ASSERT_EQ(SQL_SUCCESS, SQLSetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT,
 reinterpret_cast<SQLPOINTER>(42), 0));

 timeout = -1;
 ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT, &timeout, 0, 0));
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT,
&timeout, 0, nullptr));
 EXPECT_EQ(42, timeout);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrLoginTimeoutValid) {
 // Check default value first
 SQLUINTEGER timeout = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, nullptr));
 EXPECT_EQ(0, timeout);

 ASSERT_EQ(SQL_SUCCESS, SQLSetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT,
 reinterpret_cast<SQLPOINTER>(42), 0));

 timeout = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, nullptr));
 EXPECT_EQ(42, timeout);
}

Expand All@@ -340,15 +344,15 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrPacketSizeValid) {
 // Check default value first
 SQLUINTEGER size = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, nullptr));
 EXPECT_EQ(0, size);

 ASSERT_EQ(SQL_SUCCESS, SQLSetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE,
 reinterpret_cast<SQLPOINTER>(0), 0));

 size = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, nullptr));
 EXPECT_EQ(0, size);

 // Attempt to set to non-zero value, driver should return warning and not error
Expand Down

6 changes: 4 additions & 2 deletions
cpp/src/arrow/flight/sql/odbc/tests/connection_info_test.cc

View file


Open in desktop

Comment thread
alinaliBQ marked this conversation as resolved.

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,8 @@ TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDriverHdesc) {

 // Value returned from driver manager is the desc address
 SQLHDESC local_desc = descriptor;
 ASSERT_EQ(SQL_SUCCESS, SQLGetInfo(this->conn, SQL_HANDLE_DESC, &local_desc, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetInfo(this->conn, SQL_HANDLE_DESC, &local_desc, 0, nullptr));
 EXPECT_GT(local_desc, static_cast<SQLHSTMT>(0));

 // Free descriptor handle
Expand DownExpand Up@@ -194,7 +195,8 @@ TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDriverHlib) {
TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDriverHstmt) {
 // Value returned from driver manager is the stmt address
 SQLHSTMT local_stmt = this->stmt;
 ASSERT_EQ(SQL_SUCCESS, SQLGetInfo(this->conn, SQL_DRIVER_HSTMT, &local_stmt, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetInfo(this->conn, SQL_DRIVER_HSTMT, &local_stmt, 0, nullptr));
 EXPECT_GT(local_stmt, static_cast<SQLHSTMT>(0));
}

Expand Down

73 changes: 70 additions & 3 deletions
cpp/src/arrow/flight/sql/odbc/tests/connection_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,7 @@ TEST(SQLGetEnvAttr, TestSQLGetEnvAttrODBCVersion) {
 // Allocate an environment handle
 ASSERT_EQ(SQL_SUCCESS, SQLAllocEnv(&env));

 ASSERT_EQ(SQL_SUCCESS, SQLGetEnvAttr(env, SQL_ATTR_ODBC_VERSION, &version, 0, 0));
 ASSERT_EQ(SQL_SUCCESS, SQLGetEnvAttr(env, SQL_ATTR_ODBC_VERSION, &version, 0, nullptr));

 ASSERT_EQ(SQL_OV_ODBC2, version);

Expand DownExpand Up@@ -155,7 +155,7 @@ TYPED_TEST(ConnectionTest, TestSQLGetEnvAttrOutputNTS) {
 SQLINTEGER output_nts;

 ASSERT_EQ(SQL_SUCCESS,
 SQLGetEnvAttr(this->env, SQL_ATTR_OUTPUT_NTS, &output_nts, 0, 0));
 SQLGetEnvAttr(this->env, SQL_ATTR_OUTPUT_NTS, &output_nts, 0, nullptr));

 ASSERT_EQ(SQL_TRUE, output_nts);
}
Expand DownExpand Up@@ -432,7 +432,7 @@ TEST_F(ConnectionRemoteTest, TestSQLConnectDSNPrecedence) {
 << GetOdbcErrorMessage(SQL_HANDLE_DBC, conn);
}

#endif
#endif // _WIN32

TEST_F(ConnectionRemoteTest, TestSQLDriverConnectInvalidUid) {
 // Invalid connect string
Expand DownExpand Up@@ -508,4 +508,71 @@ TYPED_TEST(ConnectionHandleTest, TestCloseConnectionWithOpenStatement) {
 ASSERT_EQ(SQL_SUCCESS, SQLDisconnect(this->conn));
}

TYPED_TEST(ConnectionTest, TestSQLAllocFreeDesc) {
 SQLHDESC descriptor;

 // Allocate a descriptor using alloc handle
 ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_DESC, this->conn, &descriptor));

 // Free descriptor handle
 ASSERT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_DESC, descriptor));
}

TYPED_TEST(ConnectionTest, TestSQLSetStmtAttrDescriptor) {
 SQLHDESC apd_descriptor, ard_descriptor;

 // Allocate an APD descriptor using alloc handle
 ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_DESC, this->conn, &apd_descriptor));

 // Allocate an ARD descriptor using alloc handle
 ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_DESC, this->conn, &ard_descriptor));

 // Save implicitly allocated internal APD and ARD descriptor pointers
 SQLPOINTER internal_apd, internal_ard = nullptr;

 EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC,
 &internal_apd, sizeof(internal_apd), 0));

 EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC, &internal_ard,
 sizeof(internal_ard), 0));

 // Set APD descriptor to explicitly allocated handle
 EXPECT_EQ(SQL_SUCCESS, SQLSetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC,
 reinterpret_cast<SQLPOINTER>(apd_descriptor), 0));

 // Set ARD descriptor to explicitly allocated handle
 EXPECT_EQ(SQL_SUCCESS, SQLSetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC,
 reinterpret_cast<SQLPOINTER>(ard_descriptor), 0));

 // Verify APD and ARD descriptors are set to explicitly allocated pointers
 SQLPOINTER value = nullptr;
 EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC, &value,
 sizeof(value), 0));

 EXPECT_EQ(apd_descriptor, value);

 EXPECT_EQ(SQL_SUCCESS,
 SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC, &value, sizeof(value), 0));

 EXPECT_EQ(ard_descriptor, value);

 // Free explicitly allocated APD and ARD descriptor handles
 ASSERT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_DESC, apd_descriptor));

 ASSERT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_DESC, ard_descriptor));

 // Verify APD and ARD descriptors has been reverted to implicit descriptors
 value = nullptr;

 EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC, &value,
 sizeof(value), 0));

 EXPECT_EQ(internal_apd, value);

 EXPECT_EQ(SQL_SUCCESS,
 SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC, &value, sizeof(value), 0));

 EXPECT_EQ(internal_ard, value);
}

} // namespace arrow::flight::sql::odbc
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 > 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-47707: [C++][FlightRPC] Add tests for descriptor handle allocation#48053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lidavidm
merged 2 commits into

from

Dec 9, 2025
 Merged


GH-47707: [C++][FlightRPC] Add tests for descriptor handle allocation
#48053
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
e80551c

Add tests for `SQL_HANDLE_DESC` handle allocation


alinaliBQ Dec 4, 2025
b6e87e2

Use nullptr explicitly


alinaliBQ Dec 8, 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


5 changes: 0 additions & 5 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@@ -44,9 +44,6 @@ SQLRETURN SQLAllocHandle(SQLSMALLINT type, SQLHANDLE parent, SQLHANDLE* result)
 // GH-47706 TODO: Add tests for SQLAllocStmt, pre-requisite requires
 // SQLDriverConnect implementation

 // GH-47707 TODO: Add tests for SQL_HANDLE_DESC implementation for
Comment thread
alinaliBQ marked this conversation as resolved.

 // descriptor handle, pre-requisite requires SQLAllocStmt

 *result = nullptr;

 switch (type) {
Expand DownExpand Up@@ -147,8 +144,6 @@ SQLRETURN SQLFreeHandle(SQLSMALLINT type, SQLHANDLE handle) {
 // GH-47706 TODO: Add tests for SQLFreeStmt, pre-requisite requires
 // SQLAllocStmt tests

 // GH-47707 TODO: Add tests for SQL_HANDLE_DESC implementation for
 // descriptor handle
 switch (type) {
 case SQL_HANDLE_ENV: {
 using ODBC::ODBCEnvironment;
Expand Down

3 changes: 3 additions & 0 deletions
cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_statement.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,9 @@ class ODBCStatement : public ODBCHandle<ODBCStatement> {
 void SetStmtAttr(SQLINTEGER statement_attribute, SQLPOINTER value,
 SQLINTEGER buffer_size, bool is_unicode);

 /// \brief Revert back to implicitly allocated internal descriptors.
 /// isApd as True indicates APD descritor is to be reverted.
 /// isApd as False indicates ARD descritor is to be reverted.
 void RevertAppDescriptor(bool is_apd);

 inline ODBCDescriptor* GetIRD() { return ird_.get(); }
Expand Down

56 changes: 30 additions & 26 deletions
cpp/src/arrow/flight/sql/odbc/tests/connection_attr_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -146,23 +146,25 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrTxnIsolationUnsupported
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrDbcInfoTokenSetOnly) {
 // Verify that set-only attribute cannot be read
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_ERROR, SQLGetConnectAttr(this->conn, SQL_ATTR_DBC_INFO_TOKEN, ptr, 0, 0));
 ASSERT_EQ(SQL_ERROR,
 SQLGetConnectAttr(this->conn, SQL_ATTR_DBC_INFO_TOKEN, ptr, 0, nullptr));
 VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateHY092);
}
#endif

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrOdbcCursorsDMOnly) {
 // Verify that DM-only attribute is handled by driver manager
 SQLULEN cursor_attr;
 ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_ODBC_CURSORS, &cursor_attr, 0, 0));
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_ODBC_CURSORS,
&cursor_attr, 0, nullptr));
 EXPECT_EQ(SQL_CUR_USE_DRIVER, cursor_attr);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTraceDMOnly) {
 // Verify that DM-only attribute is handled by driver manager
 SQLUINTEGER trace;
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_TRACE, &trace, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_TRACE, &trace, 0, nullptr));
 EXPECT_EQ(SQL_OPT_TRACE_OFF, trace);
}

Expand DownExpand Up@@ -190,15 +192,15 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTranslateLibUnsupported

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTranslateOptionUnsupported) {
 SQLINTEGER option;
 ASSERT_EQ(SQL_ERROR,
SQLGetConnectAttr(this->conn, SQL_ATTR_TRANSLATE_OPTION, &option, 0, 0));
 ASSERT_EQ(SQL_ERROR, SQLGetConnectAttr(this->conn, SQL_ATTR_TRANSLATE_OPTION, &option,
0, nullptr));
 VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateHYC00);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTxnIsolationUnsupported) {
 SQLINTEGER isolation;
 ASSERT_EQ(SQL_ERROR,
SQLGetConnectAttr(this->conn, SQL_ATTR_TXN_ISOLATION, &isolation, 0, 0));
 ASSERT_EQ(SQL_ERROR, SQLGetConnectAttr(this->conn, SQL_ATTR_TXN_ISOLATION, &isolation,
0, nullptr));
 VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateHYC00);
}

Expand All@@ -219,7 +221,7 @@ TYPED_TEST(ConnectionAttributeTest,
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcEventDefault) {
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_EVENT, ptr, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_EVENT, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}
#endif
Expand All@@ -228,7 +230,7 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcEventDefault) {
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcPcallbackDefault) {
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCALLBACK, ptr, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCALLBACK, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}
#endif
Expand All@@ -237,41 +239,43 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcPcallbackDefaul
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcPcontextDefault) {
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCONTEXT, ptr, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCONTEXT, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}
#endif

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncEnableDefault) {
 SQLULEN enable;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_ENABLE, &enable, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_ENABLE, &enable, 0, nullptr));
 EXPECT_EQ(SQL_ASYNC_ENABLE_OFF, enable);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAutoIpdDefault) {
 SQLUINTEGER ipd;
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_AUTO_IPD, &ipd, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_AUTO_IPD, &ipd, 0, nullptr));
 EXPECT_EQ(static_cast<SQLUINTEGER>(SQL_FALSE), ipd);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAutocommitDefault) {
 SQLUINTEGER auto_commit;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_AUTOCOMMIT, &auto_commit, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_AUTOCOMMIT, &auto_commit, 0, nullptr));
 EXPECT_EQ(SQL_AUTOCOMMIT_ON, auto_commit);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrEnlistInDtcDefault) {
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ENLIST_IN_DTC, ptr, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ENLIST_IN_DTC, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrQuietModeDefault) {
 HWND ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_QUIET_MODE, ptr, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_QUIET_MODE, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}

Expand All@@ -281,7 +285,7 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrAccessModeValid) {
 // Check default value first
 SQLUINTEGER mode = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, nullptr));
 EXPECT_EQ(SQL_MODE_READ_WRITE, mode);

 ASSERT_EQ(SQL_SUCCESS,
Expand All@@ -290,7 +294,7 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrAccessModeValid) {

 mode = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, nullptr));
 EXPECT_EQ(SQL_MODE_READ_WRITE, mode);

 // Attempt to set to SQL_MODE_READ_ONLY, driver should return warning and not error
Expand All@@ -305,32 +309,32 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrAccessModeValid) {
TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrConnectionTimeoutValid) {
 // Check default value first
 SQLUINTEGER timeout = -1;
 ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT, &timeout, 0, 0));
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT,
&timeout, 0, nullptr));
 EXPECT_EQ(0, timeout);

 ASSERT_EQ(SQL_SUCCESS, SQLSetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT,
 reinterpret_cast<SQLPOINTER>(42), 0));

 timeout = -1;
 ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT, &timeout, 0, 0));
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT,
&timeout, 0, nullptr));
 EXPECT_EQ(42, timeout);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrLoginTimeoutValid) {
 // Check default value first
 SQLUINTEGER timeout = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, nullptr));
 EXPECT_EQ(0, timeout);

 ASSERT_EQ(SQL_SUCCESS, SQLSetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT,
 reinterpret_cast<SQLPOINTER>(42), 0));

 timeout = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, nullptr));
 EXPECT_EQ(42, timeout);
}

Expand All@@ -340,15 +344,15 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrPacketSizeValid) {
 // Check default value first
 SQLUINTEGER size = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, nullptr));
 EXPECT_EQ(0, size);

 ASSERT_EQ(SQL_SUCCESS, SQLSetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE,
 reinterpret_cast<SQLPOINTER>(0), 0));

 size = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, nullptr));
 EXPECT_EQ(0, size);

 // Attempt to set to non-zero value, driver should return warning and not error
Expand Down

6 changes: 4 additions & 2 deletions
cpp/src/arrow/flight/sql/odbc/tests/connection_info_test.cc

View file


Open in desktop

Comment thread
alinaliBQ marked this conversation as resolved.

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,8 @@ TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDriverHdesc) {

 // Value returned from driver manager is the desc address
 SQLHDESC local_desc = descriptor;
 ASSERT_EQ(SQL_SUCCESS, SQLGetInfo(this->conn, SQL_HANDLE_DESC, &local_desc, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetInfo(this->conn, SQL_HANDLE_DESC, &local_desc, 0, nullptr));
 EXPECT_GT(local_desc, static_cast<SQLHSTMT>(0));

 // Free descriptor handle
Expand DownExpand Up@@ -194,7 +195,8 @@ TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDriverHlib) {
TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDriverHstmt) {
 // Value returned from driver manager is the stmt address
 SQLHSTMT local_stmt = this->stmt;
 ASSERT_EQ(SQL_SUCCESS, SQLGetInfo(this->conn, SQL_DRIVER_HSTMT, &local_stmt, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetInfo(this->conn, SQL_DRIVER_HSTMT, &local_stmt, 0, nullptr));
 EXPECT_GT(local_stmt, static_cast<SQLHSTMT>(0));
}

Expand Down

73 changes: 70 additions & 3 deletions
cpp/src/arrow/flight/sql/odbc/tests/connection_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,7 @@ TEST(SQLGetEnvAttr, TestSQLGetEnvAttrODBCVersion) {
 // Allocate an environment handle
 ASSERT_EQ(SQL_SUCCESS, SQLAllocEnv(&env));

 ASSERT_EQ(SQL_SUCCESS, SQLGetEnvAttr(env, SQL_ATTR_ODBC_VERSION, &version, 0, 0));
 ASSERT_EQ(SQL_SUCCESS, SQLGetEnvAttr(env, SQL_ATTR_ODBC_VERSION, &version, 0, nullptr));

 ASSERT_EQ(SQL_OV_ODBC2, version);

Expand DownExpand Up@@ -155,7 +155,7 @@ TYPED_TEST(ConnectionTest, TestSQLGetEnvAttrOutputNTS) {
 SQLINTEGER output_nts;

 ASSERT_EQ(SQL_SUCCESS,
 SQLGetEnvAttr(this->env, SQL_ATTR_OUTPUT_NTS, &output_nts, 0, 0));
 SQLGetEnvAttr(this->env, SQL_ATTR_OUTPUT_NTS, &output_nts, 0, nullptr));

 ASSERT_EQ(SQL_TRUE, output_nts);
}
Expand DownExpand Up@@ -432,7 +432,7 @@ TEST_F(ConnectionRemoteTest, TestSQLConnectDSNPrecedence) {
 << GetOdbcErrorMessage(SQL_HANDLE_DBC, conn);
}

#endif
#endif // _WIN32

TEST_F(ConnectionRemoteTest, TestSQLDriverConnectInvalidUid) {
 // Invalid connect string
Expand DownExpand Up@@ -508,4 +508,71 @@ TYPED_TEST(ConnectionHandleTest, TestCloseConnectionWithOpenStatement) {
 ASSERT_EQ(SQL_SUCCESS, SQLDisconnect(this->conn));
}

TYPED_TEST(ConnectionTest, TestSQLAllocFreeDesc) {
 SQLHDESC descriptor;

 // Allocate a descriptor using alloc handle
 ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_DESC, this->conn, &descriptor));

 // Free descriptor handle
 ASSERT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_DESC, descriptor));
}

TYPED_TEST(ConnectionTest, TestSQLSetStmtAttrDescriptor) {
 SQLHDESC apd_descriptor, ard_descriptor;

 // Allocate an APD descriptor using alloc handle
 ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_DESC, this->conn, &apd_descriptor));

 // Allocate an ARD descriptor using alloc handle
 ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_DESC, this->conn, &ard_descriptor));

 // Save implicitly allocated internal APD and ARD descriptor pointers
 SQLPOINTER internal_apd, internal_ard = nullptr;

 EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC,
 &internal_apd, sizeof(internal_apd), 0));

 EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC, &internal_ard,
 sizeof(internal_ard), 0));

 // Set APD descriptor to explicitly allocated handle
 EXPECT_EQ(SQL_SUCCESS, SQLSetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC,
 reinterpret_cast<SQLPOINTER>(apd_descriptor), 0));

 // Set ARD descriptor to explicitly allocated handle
 EXPECT_EQ(SQL_SUCCESS, SQLSetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC,
 reinterpret_cast<SQLPOINTER>(ard_descriptor), 0));

 // Verify APD and ARD descriptors are set to explicitly allocated pointers
 SQLPOINTER value = nullptr;
 EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC, &value,
 sizeof(value), 0));

 EXPECT_EQ(apd_descriptor, value);

 EXPECT_EQ(SQL_SUCCESS,
 SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC, &value, sizeof(value), 0));

 EXPECT_EQ(ard_descriptor, value);

 // Free explicitly allocated APD and ARD descriptor handles
 ASSERT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_DESC, apd_descriptor));

 ASSERT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_DESC, ard_descriptor));

 // Verify APD and ARD descriptors has been reverted to implicit descriptors
 value = nullptr;

 EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC, &value,
 sizeof(value), 0));

 EXPECT_EQ(internal_apd, value);

 EXPECT_EQ(SQL_SUCCESS,
 SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC, &value, sizeof(value), 0));

 EXPECT_EQ(internal_ard, value);
}

} // namespace arrow::flight::sql::odbc
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-47707: [C++][FlightRPC] Add tests for descriptor handle allocation#48053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lidavidm
merged 2 commits into

from

Dec 9, 2025
 Merged


GH-47707: [C++][FlightRPC] Add tests for descriptor handle allocation
#48053
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
e80551c

Add tests for `SQL_HANDLE_DESC` handle allocation


alinaliBQ Dec 4, 2025
b6e87e2

Use nullptr explicitly


alinaliBQ Dec 8, 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


5 changes: 0 additions & 5 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@@ -44,9 +44,6 @@ SQLRETURN SQLAllocHandle(SQLSMALLINT type, SQLHANDLE parent, SQLHANDLE* result)
 // GH-47706 TODO: Add tests for SQLAllocStmt, pre-requisite requires
 // SQLDriverConnect implementation

 // GH-47707 TODO: Add tests for SQL_HANDLE_DESC implementation for
Comment thread
alinaliBQ marked this conversation as resolved.

 // descriptor handle, pre-requisite requires SQLAllocStmt

 *result = nullptr;

 switch (type) {
Expand DownExpand Up@@ -147,8 +144,6 @@ SQLRETURN SQLFreeHandle(SQLSMALLINT type, SQLHANDLE handle) {
 // GH-47706 TODO: Add tests for SQLFreeStmt, pre-requisite requires
 // SQLAllocStmt tests

 // GH-47707 TODO: Add tests for SQL_HANDLE_DESC implementation for
 // descriptor handle
 switch (type) {
 case SQL_HANDLE_ENV: {
 using ODBC::ODBCEnvironment;
Expand Down

3 changes: 3 additions & 0 deletions
cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_statement.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,9 @@ class ODBCStatement : public ODBCHandle<ODBCStatement> {
 void SetStmtAttr(SQLINTEGER statement_attribute, SQLPOINTER value,
 SQLINTEGER buffer_size, bool is_unicode);

 /// \brief Revert back to implicitly allocated internal descriptors.
 /// isApd as True indicates APD descritor is to be reverted.
 /// isApd as False indicates ARD descritor is to be reverted.
 void RevertAppDescriptor(bool is_apd);

 inline ODBCDescriptor* GetIRD() { return ird_.get(); }
Expand Down

56 changes: 30 additions & 26 deletions
cpp/src/arrow/flight/sql/odbc/tests/connection_attr_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -146,23 +146,25 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrTxnIsolationUnsupported
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrDbcInfoTokenSetOnly) {
 // Verify that set-only attribute cannot be read
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_ERROR, SQLGetConnectAttr(this->conn, SQL_ATTR_DBC_INFO_TOKEN, ptr, 0, 0));
 ASSERT_EQ(SQL_ERROR,
 SQLGetConnectAttr(this->conn, SQL_ATTR_DBC_INFO_TOKEN, ptr, 0, nullptr));
 VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateHY092);
}
#endif

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrOdbcCursorsDMOnly) {
 // Verify that DM-only attribute is handled by driver manager
 SQLULEN cursor_attr;
 ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_ODBC_CURSORS, &cursor_attr, 0, 0));
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_ODBC_CURSORS,
&cursor_attr, 0, nullptr));
 EXPECT_EQ(SQL_CUR_USE_DRIVER, cursor_attr);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTraceDMOnly) {
 // Verify that DM-only attribute is handled by driver manager
 SQLUINTEGER trace;
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_TRACE, &trace, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_TRACE, &trace, 0, nullptr));
 EXPECT_EQ(SQL_OPT_TRACE_OFF, trace);
}

Expand DownExpand Up@@ -190,15 +192,15 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTranslateLibUnsupported

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTranslateOptionUnsupported) {
 SQLINTEGER option;
 ASSERT_EQ(SQL_ERROR,
SQLGetConnectAttr(this->conn, SQL_ATTR_TRANSLATE_OPTION, &option, 0, 0));
 ASSERT_EQ(SQL_ERROR, SQLGetConnectAttr(this->conn, SQL_ATTR_TRANSLATE_OPTION, &option,
0, nullptr));
 VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateHYC00);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTxnIsolationUnsupported) {
 SQLINTEGER isolation;
 ASSERT_EQ(SQL_ERROR,
SQLGetConnectAttr(this->conn, SQL_ATTR_TXN_ISOLATION, &isolation, 0, 0));
 ASSERT_EQ(SQL_ERROR, SQLGetConnectAttr(this->conn, SQL_ATTR_TXN_ISOLATION, &isolation,
0, nullptr));
 VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateHYC00);
}

Expand All@@ -219,7 +221,7 @@ TYPED_TEST(ConnectionAttributeTest,
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcEventDefault) {
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_EVENT, ptr, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_EVENT, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}
#endif
Expand All@@ -228,7 +230,7 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcEventDefault) {
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcPcallbackDefault) {
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCALLBACK, ptr, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCALLBACK, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}
#endif
Expand All@@ -237,41 +239,43 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcPcallbackDefaul
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcPcontextDefault) {
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCONTEXT, ptr, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCONTEXT, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}
#endif

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncEnableDefault) {
 SQLULEN enable;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_ENABLE, &enable, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_ENABLE, &enable, 0, nullptr));
 EXPECT_EQ(SQL_ASYNC_ENABLE_OFF, enable);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAutoIpdDefault) {
 SQLUINTEGER ipd;
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_AUTO_IPD, &ipd, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_AUTO_IPD, &ipd, 0, nullptr));
 EXPECT_EQ(static_cast<SQLUINTEGER>(SQL_FALSE), ipd);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAutocommitDefault) {
 SQLUINTEGER auto_commit;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_AUTOCOMMIT, &auto_commit, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_AUTOCOMMIT, &auto_commit, 0, nullptr));
 EXPECT_EQ(SQL_AUTOCOMMIT_ON, auto_commit);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrEnlistInDtcDefault) {
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ENLIST_IN_DTC, ptr, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ENLIST_IN_DTC, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrQuietModeDefault) {
 HWND ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_QUIET_MODE, ptr, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_QUIET_MODE, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}

Expand All@@ -281,7 +285,7 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrAccessModeValid) {
 // Check default value first
 SQLUINTEGER mode = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, nullptr));
 EXPECT_EQ(SQL_MODE_READ_WRITE, mode);

 ASSERT_EQ(SQL_SUCCESS,
Expand All@@ -290,7 +294,7 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrAccessModeValid) {

 mode = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, nullptr));
 EXPECT_EQ(SQL_MODE_READ_WRITE, mode);

 // Attempt to set to SQL_MODE_READ_ONLY, driver should return warning and not error
Expand All@@ -305,32 +309,32 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrAccessModeValid) {
TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrConnectionTimeoutValid) {
 // Check default value first
 SQLUINTEGER timeout = -1;
 ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT, &timeout, 0, 0));
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT,
&timeout, 0, nullptr));
 EXPECT_EQ(0, timeout);

 ASSERT_EQ(SQL_SUCCESS, SQLSetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT,
 reinterpret_cast<SQLPOINTER>(42), 0));

 timeout = -1;
 ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT, &timeout, 0, 0));
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT,
&timeout, 0, nullptr));
 EXPECT_EQ(42, timeout);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrLoginTimeoutValid) {
 // Check default value first
 SQLUINTEGER timeout = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, nullptr));
 EXPECT_EQ(0, timeout);

 ASSERT_EQ(SQL_SUCCESS, SQLSetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT,
 reinterpret_cast<SQLPOINTER>(42), 0));

 timeout = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, nullptr));
 EXPECT_EQ(42, timeout);
}

Expand All@@ -340,15 +344,15 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrPacketSizeValid) {
 // Check default value first
 SQLUINTEGER size = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, nullptr));
 EXPECT_EQ(0, size);

 ASSERT_EQ(SQL_SUCCESS, SQLSetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE,
 reinterpret_cast<SQLPOINTER>(0), 0));

 size = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, nullptr));
 EXPECT_EQ(0, size);

 // Attempt to set to non-zero value, driver should return warning and not error
Expand Down

6 changes: 4 additions & 2 deletions
cpp/src/arrow/flight/sql/odbc/tests/connection_info_test.cc

View file


Open in desktop

Comment thread
alinaliBQ marked this conversation as resolved.

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,8 @@ TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDriverHdesc) {

 // Value returned from driver manager is the desc address
 SQLHDESC local_desc = descriptor;
 ASSERT_EQ(SQL_SUCCESS, SQLGetInfo(this->conn, SQL_HANDLE_DESC, &local_desc, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetInfo(this->conn, SQL_HANDLE_DESC, &local_desc, 0, nullptr));
 EXPECT_GT(local_desc, static_cast<SQLHSTMT>(0));

 // Free descriptor handle
Expand DownExpand Up@@ -194,7 +195,8 @@ TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDriverHlib) {
TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDriverHstmt) {
 // Value returned from driver manager is the stmt address
 SQLHSTMT local_stmt = this->stmt;
 ASSERT_EQ(SQL_SUCCESS, SQLGetInfo(this->conn, SQL_DRIVER_HSTMT, &local_stmt, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetInfo(this->conn, SQL_DRIVER_HSTMT, &local_stmt, 0, nullptr));
 EXPECT_GT(local_stmt, static_cast<SQLHSTMT>(0));
}

Expand Down

73 changes: 70 additions & 3 deletions
cpp/src/arrow/flight/sql/odbc/tests/connection_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,7 @@ TEST(SQLGetEnvAttr, TestSQLGetEnvAttrODBCVersion) {
 // Allocate an environment handle
 ASSERT_EQ(SQL_SUCCESS, SQLAllocEnv(&env));

 ASSERT_EQ(SQL_SUCCESS, SQLGetEnvAttr(env, SQL_ATTR_ODBC_VERSION, &version, 0, 0));
 ASSERT_EQ(SQL_SUCCESS, SQLGetEnvAttr(env, SQL_ATTR_ODBC_VERSION, &version, 0, nullptr));

 ASSERT_EQ(SQL_OV_ODBC2, version);

Expand DownExpand Up@@ -155,7 +155,7 @@ TYPED_TEST(ConnectionTest, TestSQLGetEnvAttrOutputNTS) {
 SQLINTEGER output_nts;

 ASSERT_EQ(SQL_SUCCESS,
 SQLGetEnvAttr(this->env, SQL_ATTR_OUTPUT_NTS, &output_nts, 0, 0));
 SQLGetEnvAttr(this->env, SQL_ATTR_OUTPUT_NTS, &output_nts, 0, nullptr));

 ASSERT_EQ(SQL_TRUE, output_nts);
}
Expand DownExpand Up@@ -432,7 +432,7 @@ TEST_F(ConnectionRemoteTest, TestSQLConnectDSNPrecedence) {
 << GetOdbcErrorMessage(SQL_HANDLE_DBC, conn);
}

#endif
#endif // _WIN32

TEST_F(ConnectionRemoteTest, TestSQLDriverConnectInvalidUid) {
 // Invalid connect string
Expand DownExpand Up@@ -508,4 +508,71 @@ TYPED_TEST(ConnectionHandleTest, TestCloseConnectionWithOpenStatement) {
 ASSERT_EQ(SQL_SUCCESS, SQLDisconnect(this->conn));
}

TYPED_TEST(ConnectionTest, TestSQLAllocFreeDesc) {
 SQLHDESC descriptor;

 // Allocate a descriptor using alloc handle
 ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_DESC, this->conn, &descriptor));

 // Free descriptor handle
 ASSERT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_DESC, descriptor));
}

TYPED_TEST(ConnectionTest, TestSQLSetStmtAttrDescriptor) {
 SQLHDESC apd_descriptor, ard_descriptor;

 // Allocate an APD descriptor using alloc handle
 ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_DESC, this->conn, &apd_descriptor));

 // Allocate an ARD descriptor using alloc handle
 ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_DESC, this->conn, &ard_descriptor));

 // Save implicitly allocated internal APD and ARD descriptor pointers
 SQLPOINTER internal_apd, internal_ard = nullptr;

 EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC,
 &internal_apd, sizeof(internal_apd), 0));

 EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC, &internal_ard,
 sizeof(internal_ard), 0));

 // Set APD descriptor to explicitly allocated handle
 EXPECT_EQ(SQL_SUCCESS, SQLSetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC,
 reinterpret_cast<SQLPOINTER>(apd_descriptor), 0));

 // Set ARD descriptor to explicitly allocated handle
 EXPECT_EQ(SQL_SUCCESS, SQLSetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC,
 reinterpret_cast<SQLPOINTER>(ard_descriptor), 0));

 // Verify APD and ARD descriptors are set to explicitly allocated pointers
 SQLPOINTER value = nullptr;
 EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC, &value,
 sizeof(value), 0));

 EXPECT_EQ(apd_descriptor, value);

 EXPECT_EQ(SQL_SUCCESS,
 SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC, &value, sizeof(value), 0));

 EXPECT_EQ(ard_descriptor, value);

 // Free explicitly allocated APD and ARD descriptor handles
 ASSERT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_DESC, apd_descriptor));

 ASSERT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_DESC, ard_descriptor));

 // Verify APD and ARD descriptors has been reverted to implicit descriptors
 value = nullptr;

 EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC, &value,
 sizeof(value), 0));

 EXPECT_EQ(internal_apd, value);

 EXPECT_EQ(SQL_SUCCESS,
 SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC, &value, sizeof(value), 0));

 EXPECT_EQ(internal_ard, value);
}

} // namespace arrow::flight::sql::odbc
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-47707: [C++][FlightRPC] Add tests for descriptor handle allocation#48053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lidavidm
merged 2 commits into

from

Dec 9, 2025
 Merged


GH-47707: [C++][FlightRPC] Add tests for descriptor handle allocation
#48053
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
e80551c

Add tests for `SQL_HANDLE_DESC` handle allocation


alinaliBQ Dec 4, 2025
b6e87e2

Use nullptr explicitly


alinaliBQ Dec 8, 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


5 changes: 0 additions & 5 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@@ -44,9 +44,6 @@ SQLRETURN SQLAllocHandle(SQLSMALLINT type, SQLHANDLE parent, SQLHANDLE* result)
 // GH-47706 TODO: Add tests for SQLAllocStmt, pre-requisite requires
 // SQLDriverConnect implementation

 // GH-47707 TODO: Add tests for SQL_HANDLE_DESC implementation for
Comment thread
alinaliBQ marked this conversation as resolved.

 // descriptor handle, pre-requisite requires SQLAllocStmt

 *result = nullptr;

 switch (type) {
Expand DownExpand Up@@ -147,8 +144,6 @@ SQLRETURN SQLFreeHandle(SQLSMALLINT type, SQLHANDLE handle) {
 // GH-47706 TODO: Add tests for SQLFreeStmt, pre-requisite requires
 // SQLAllocStmt tests

 // GH-47707 TODO: Add tests for SQL_HANDLE_DESC implementation for
 // descriptor handle
 switch (type) {
 case SQL_HANDLE_ENV: {
 using ODBC::ODBCEnvironment;
Expand Down

3 changes: 3 additions & 0 deletions
cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_statement.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,9 @@ class ODBCStatement : public ODBCHandle<ODBCStatement> {
 void SetStmtAttr(SQLINTEGER statement_attribute, SQLPOINTER value,
 SQLINTEGER buffer_size, bool is_unicode);

 /// \brief Revert back to implicitly allocated internal descriptors.
 /// isApd as True indicates APD descritor is to be reverted.
 /// isApd as False indicates ARD descritor is to be reverted.
 void RevertAppDescriptor(bool is_apd);

 inline ODBCDescriptor* GetIRD() { return ird_.get(); }
Expand Down

56 changes: 30 additions & 26 deletions
cpp/src/arrow/flight/sql/odbc/tests/connection_attr_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -146,23 +146,25 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrTxnIsolationUnsupported
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrDbcInfoTokenSetOnly) {
 // Verify that set-only attribute cannot be read
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_ERROR, SQLGetConnectAttr(this->conn, SQL_ATTR_DBC_INFO_TOKEN, ptr, 0, 0));
 ASSERT_EQ(SQL_ERROR,
 SQLGetConnectAttr(this->conn, SQL_ATTR_DBC_INFO_TOKEN, ptr, 0, nullptr));
 VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateHY092);
}
#endif

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrOdbcCursorsDMOnly) {
 // Verify that DM-only attribute is handled by driver manager
 SQLULEN cursor_attr;
 ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_ODBC_CURSORS, &cursor_attr, 0, 0));
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_ODBC_CURSORS,
&cursor_attr, 0, nullptr));
 EXPECT_EQ(SQL_CUR_USE_DRIVER, cursor_attr);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTraceDMOnly) {
 // Verify that DM-only attribute is handled by driver manager
 SQLUINTEGER trace;
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_TRACE, &trace, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_TRACE, &trace, 0, nullptr));
 EXPECT_EQ(SQL_OPT_TRACE_OFF, trace);
}

Expand DownExpand Up@@ -190,15 +192,15 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTranslateLibUnsupported

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTranslateOptionUnsupported) {
 SQLINTEGER option;
 ASSERT_EQ(SQL_ERROR,
SQLGetConnectAttr(this->conn, SQL_ATTR_TRANSLATE_OPTION, &option, 0, 0));
 ASSERT_EQ(SQL_ERROR, SQLGetConnectAttr(this->conn, SQL_ATTR_TRANSLATE_OPTION, &option,
0, nullptr));
 VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateHYC00);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTxnIsolationUnsupported) {
 SQLINTEGER isolation;
 ASSERT_EQ(SQL_ERROR,
SQLGetConnectAttr(this->conn, SQL_ATTR_TXN_ISOLATION, &isolation, 0, 0));
 ASSERT_EQ(SQL_ERROR, SQLGetConnectAttr(this->conn, SQL_ATTR_TXN_ISOLATION, &isolation,
0, nullptr));
 VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateHYC00);
}

Expand All@@ -219,7 +221,7 @@ TYPED_TEST(ConnectionAttributeTest,
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcEventDefault) {
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_EVENT, ptr, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_EVENT, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}
#endif
Expand All@@ -228,7 +230,7 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcEventDefault) {
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcPcallbackDefault) {
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCALLBACK, ptr, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCALLBACK, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}
#endif
Expand All@@ -237,41 +239,43 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcPcallbackDefaul
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcPcontextDefault) {
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCONTEXT, ptr, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCONTEXT, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}
#endif

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncEnableDefault) {
 SQLULEN enable;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_ENABLE, &enable, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_ENABLE, &enable, 0, nullptr));
 EXPECT_EQ(SQL_ASYNC_ENABLE_OFF, enable);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAutoIpdDefault) {
 SQLUINTEGER ipd;
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_AUTO_IPD, &ipd, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_AUTO_IPD, &ipd, 0, nullptr));
 EXPECT_EQ(static_cast<SQLUINTEGER>(SQL_FALSE), ipd);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAutocommitDefault) {
 SQLUINTEGER auto_commit;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_AUTOCOMMIT, &auto_commit, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_AUTOCOMMIT, &auto_commit, 0, nullptr));
 EXPECT_EQ(SQL_AUTOCOMMIT_ON, auto_commit);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrEnlistInDtcDefault) {
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ENLIST_IN_DTC, ptr, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ENLIST_IN_DTC, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrQuietModeDefault) {
 HWND ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_QUIET_MODE, ptr, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_QUIET_MODE, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}

Expand All@@ -281,7 +285,7 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrAccessModeValid) {
 // Check default value first
 SQLUINTEGER mode = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, nullptr));
 EXPECT_EQ(SQL_MODE_READ_WRITE, mode);

 ASSERT_EQ(SQL_SUCCESS,
Expand All@@ -290,7 +294,7 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrAccessModeValid) {

 mode = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, nullptr));
 EXPECT_EQ(SQL_MODE_READ_WRITE, mode);

 // Attempt to set to SQL_MODE_READ_ONLY, driver should return warning and not error
Expand All@@ -305,32 +309,32 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrAccessModeValid) {
TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrConnectionTimeoutValid) {
 // Check default value first
 SQLUINTEGER timeout = -1;
 ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT, &timeout, 0, 0));
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT,
&timeout, 0, nullptr));
 EXPECT_EQ(0, timeout);

 ASSERT_EQ(SQL_SUCCESS, SQLSetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT,
 reinterpret_cast<SQLPOINTER>(42), 0));

 timeout = -1;
 ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT, &timeout, 0, 0));
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT,
&timeout, 0, nullptr));
 EXPECT_EQ(42, timeout);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrLoginTimeoutValid) {
 // Check default value first
 SQLUINTEGER timeout = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, nullptr));
 EXPECT_EQ(0, timeout);

 ASSERT_EQ(SQL_SUCCESS, SQLSetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT,
 reinterpret_cast<SQLPOINTER>(42), 0));

 timeout = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, nullptr));
 EXPECT_EQ(42, timeout);
}

Expand All@@ -340,15 +344,15 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrPacketSizeValid) {
 // Check default value first
 SQLUINTEGER size = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, nullptr));
 EXPECT_EQ(0, size);

 ASSERT_EQ(SQL_SUCCESS, SQLSetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE,
 reinterpret_cast<SQLPOINTER>(0), 0));

 size = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, nullptr));
 EXPECT_EQ(0, size);

 // Attempt to set to non-zero value, driver should return warning and not error
Expand Down

6 changes: 4 additions & 2 deletions
cpp/src/arrow/flight/sql/odbc/tests/connection_info_test.cc

View file


Open in desktop

Comment thread
alinaliBQ marked this conversation as resolved.

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,8 @@ TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDriverHdesc) {

 // Value returned from driver manager is the desc address
 SQLHDESC local_desc = descriptor;
 ASSERT_EQ(SQL_SUCCESS, SQLGetInfo(this->conn, SQL_HANDLE_DESC, &local_desc, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetInfo(this->conn, SQL_HANDLE_DESC, &local_desc, 0, nullptr));
 EXPECT_GT(local_desc, static_cast<SQLHSTMT>(0));

 // Free descriptor handle
Expand DownExpand Up@@ -194,7 +195,8 @@ TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDriverHlib) {
TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDriverHstmt) {
 // Value returned from driver manager is the stmt address
 SQLHSTMT local_stmt = this->stmt;
 ASSERT_EQ(SQL_SUCCESS, SQLGetInfo(this->conn, SQL_DRIVER_HSTMT, &local_stmt, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetInfo(this->conn, SQL_DRIVER_HSTMT, &local_stmt, 0, nullptr));
 EXPECT_GT(local_stmt, static_cast<SQLHSTMT>(0));
}

Expand Down

73 changes: 70 additions & 3 deletions
cpp/src/arrow/flight/sql/odbc/tests/connection_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,7 @@ TEST(SQLGetEnvAttr, TestSQLGetEnvAttrODBCVersion) {
 // Allocate an environment handle
 ASSERT_EQ(SQL_SUCCESS, SQLAllocEnv(&env));

 ASSERT_EQ(SQL_SUCCESS, SQLGetEnvAttr(env, SQL_ATTR_ODBC_VERSION, &version, 0, 0));
 ASSERT_EQ(SQL_SUCCESS, SQLGetEnvAttr(env, SQL_ATTR_ODBC_VERSION, &version, 0, nullptr));

 ASSERT_EQ(SQL_OV_ODBC2, version);

Expand DownExpand Up@@ -155,7 +155,7 @@ TYPED_TEST(ConnectionTest, TestSQLGetEnvAttrOutputNTS) {
 SQLINTEGER output_nts;

 ASSERT_EQ(SQL_SUCCESS,
 SQLGetEnvAttr(this->env, SQL_ATTR_OUTPUT_NTS, &output_nts, 0, 0));
 SQLGetEnvAttr(this->env, SQL_ATTR_OUTPUT_NTS, &output_nts, 0, nullptr));

 ASSERT_EQ(SQL_TRUE, output_nts);
}
Expand DownExpand Up@@ -432,7 +432,7 @@ TEST_F(ConnectionRemoteTest, TestSQLConnectDSNPrecedence) {
 << GetOdbcErrorMessage(SQL_HANDLE_DBC, conn);
}

#endif
#endif // _WIN32

TEST_F(ConnectionRemoteTest, TestSQLDriverConnectInvalidUid) {
 // Invalid connect string
Expand DownExpand Up@@ -508,4 +508,71 @@ TYPED_TEST(ConnectionHandleTest, TestCloseConnectionWithOpenStatement) {
 ASSERT_EQ(SQL_SUCCESS, SQLDisconnect(this->conn));
}

TYPED_TEST(ConnectionTest, TestSQLAllocFreeDesc) {
 SQLHDESC descriptor;

 // Allocate a descriptor using alloc handle
 ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_DESC, this->conn, &descriptor));

 // Free descriptor handle
 ASSERT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_DESC, descriptor));
}

TYPED_TEST(ConnectionTest, TestSQLSetStmtAttrDescriptor) {
 SQLHDESC apd_descriptor, ard_descriptor;

 // Allocate an APD descriptor using alloc handle
 ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_DESC, this->conn, &apd_descriptor));

 // Allocate an ARD descriptor using alloc handle
 ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_DESC, this->conn, &ard_descriptor));

 // Save implicitly allocated internal APD and ARD descriptor pointers
 SQLPOINTER internal_apd, internal_ard = nullptr;

 EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC,
 &internal_apd, sizeof(internal_apd), 0));

 EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC, &internal_ard,
 sizeof(internal_ard), 0));

 // Set APD descriptor to explicitly allocated handle
 EXPECT_EQ(SQL_SUCCESS, SQLSetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC,
 reinterpret_cast<SQLPOINTER>(apd_descriptor), 0));

 // Set ARD descriptor to explicitly allocated handle
 EXPECT_EQ(SQL_SUCCESS, SQLSetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC,
 reinterpret_cast<SQLPOINTER>(ard_descriptor), 0));

 // Verify APD and ARD descriptors are set to explicitly allocated pointers
 SQLPOINTER value = nullptr;
 EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC, &value,
 sizeof(value), 0));

 EXPECT_EQ(apd_descriptor, value);

 EXPECT_EQ(SQL_SUCCESS,
 SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC, &value, sizeof(value), 0));

 EXPECT_EQ(ard_descriptor, value);

 // Free explicitly allocated APD and ARD descriptor handles
 ASSERT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_DESC, apd_descriptor));

 ASSERT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_DESC, ard_descriptor));

 // Verify APD and ARD descriptors has been reverted to implicit descriptors
 value = nullptr;

 EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC, &value,
 sizeof(value), 0));

 EXPECT_EQ(internal_apd, value);

 EXPECT_EQ(SQL_SUCCESS,
 SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC, &value, sizeof(value), 0));

 EXPECT_EQ(internal_ard, value);
}

} // namespace arrow::flight::sql::odbc
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-47707: [C++][FlightRPC] Add tests for descriptor handle allocation#48053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lidavidm
merged 2 commits into

from

Dec 9, 2025
 Merged


GH-47707: [C++][FlightRPC] Add tests for descriptor handle allocation
#48053
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
e80551c

Add tests for `SQL_HANDLE_DESC` handle allocation


alinaliBQ Dec 4, 2025
b6e87e2

Use nullptr explicitly


alinaliBQ Dec 8, 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


5 changes: 0 additions & 5 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@@ -44,9 +44,6 @@ SQLRETURN SQLAllocHandle(SQLSMALLINT type, SQLHANDLE parent, SQLHANDLE* result)
 // GH-47706 TODO: Add tests for SQLAllocStmt, pre-requisite requires
 // SQLDriverConnect implementation

 // GH-47707 TODO: Add tests for SQL_HANDLE_DESC implementation for
Comment thread
alinaliBQ marked this conversation as resolved.

 // descriptor handle, pre-requisite requires SQLAllocStmt

 *result = nullptr;

 switch (type) {
Expand DownExpand Up@@ -147,8 +144,6 @@ SQLRETURN SQLFreeHandle(SQLSMALLINT type, SQLHANDLE handle) {
 // GH-47706 TODO: Add tests for SQLFreeStmt, pre-requisite requires
 // SQLAllocStmt tests

 // GH-47707 TODO: Add tests for SQL_HANDLE_DESC implementation for
 // descriptor handle
 switch (type) {
 case SQL_HANDLE_ENV: {
 using ODBC::ODBCEnvironment;
Expand Down

3 changes: 3 additions & 0 deletions
cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_statement.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,9 @@ class ODBCStatement : public ODBCHandle<ODBCStatement> {
 void SetStmtAttr(SQLINTEGER statement_attribute, SQLPOINTER value,
 SQLINTEGER buffer_size, bool is_unicode);

 /// \brief Revert back to implicitly allocated internal descriptors.
 /// isApd as True indicates APD descritor is to be reverted.
 /// isApd as False indicates ARD descritor is to be reverted.
 void RevertAppDescriptor(bool is_apd);

 inline ODBCDescriptor* GetIRD() { return ird_.get(); }
Expand Down

56 changes: 30 additions & 26 deletions
cpp/src/arrow/flight/sql/odbc/tests/connection_attr_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -146,23 +146,25 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrTxnIsolationUnsupported
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrDbcInfoTokenSetOnly) {
 // Verify that set-only attribute cannot be read
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_ERROR, SQLGetConnectAttr(this->conn, SQL_ATTR_DBC_INFO_TOKEN, ptr, 0, 0));
 ASSERT_EQ(SQL_ERROR,
 SQLGetConnectAttr(this->conn, SQL_ATTR_DBC_INFO_TOKEN, ptr, 0, nullptr));
 VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateHY092);
}
#endif

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrOdbcCursorsDMOnly) {
 // Verify that DM-only attribute is handled by driver manager
 SQLULEN cursor_attr;
 ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_ODBC_CURSORS, &cursor_attr, 0, 0));
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_ODBC_CURSORS,
&cursor_attr, 0, nullptr));
 EXPECT_EQ(SQL_CUR_USE_DRIVER, cursor_attr);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTraceDMOnly) {
 // Verify that DM-only attribute is handled by driver manager
 SQLUINTEGER trace;
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_TRACE, &trace, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_TRACE, &trace, 0, nullptr));
 EXPECT_EQ(SQL_OPT_TRACE_OFF, trace);
}

Expand DownExpand Up@@ -190,15 +192,15 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTranslateLibUnsupported

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTranslateOptionUnsupported) {
 SQLINTEGER option;
 ASSERT_EQ(SQL_ERROR,
SQLGetConnectAttr(this->conn, SQL_ATTR_TRANSLATE_OPTION, &option, 0, 0));
 ASSERT_EQ(SQL_ERROR, SQLGetConnectAttr(this->conn, SQL_ATTR_TRANSLATE_OPTION, &option,
0, nullptr));
 VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateHYC00);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTxnIsolationUnsupported) {
 SQLINTEGER isolation;
 ASSERT_EQ(SQL_ERROR,
SQLGetConnectAttr(this->conn, SQL_ATTR_TXN_ISOLATION, &isolation, 0, 0));
 ASSERT_EQ(SQL_ERROR, SQLGetConnectAttr(this->conn, SQL_ATTR_TXN_ISOLATION, &isolation,
0, nullptr));
 VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateHYC00);
}

Expand All@@ -219,7 +221,7 @@ TYPED_TEST(ConnectionAttributeTest,
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcEventDefault) {
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_EVENT, ptr, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_EVENT, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}
#endif
Expand All@@ -228,7 +230,7 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcEventDefault) {
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcPcallbackDefault) {
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCALLBACK, ptr, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCALLBACK, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}
#endif
Expand All@@ -237,41 +239,43 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcPcallbackDefaul
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcPcontextDefault) {
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCONTEXT, ptr, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCONTEXT, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}
#endif

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncEnableDefault) {
 SQLULEN enable;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_ENABLE, &enable, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_ENABLE, &enable, 0, nullptr));
 EXPECT_EQ(SQL_ASYNC_ENABLE_OFF, enable);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAutoIpdDefault) {
 SQLUINTEGER ipd;
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_AUTO_IPD, &ipd, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_AUTO_IPD, &ipd, 0, nullptr));
 EXPECT_EQ(static_cast<SQLUINTEGER>(SQL_FALSE), ipd);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAutocommitDefault) {
 SQLUINTEGER auto_commit;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_AUTOCOMMIT, &auto_commit, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_AUTOCOMMIT, &auto_commit, 0, nullptr));
 EXPECT_EQ(SQL_AUTOCOMMIT_ON, auto_commit);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrEnlistInDtcDefault) {
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ENLIST_IN_DTC, ptr, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ENLIST_IN_DTC, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrQuietModeDefault) {
 HWND ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_QUIET_MODE, ptr, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_QUIET_MODE, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}

Expand All@@ -281,7 +285,7 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrAccessModeValid) {
 // Check default value first
 SQLUINTEGER mode = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, nullptr));
 EXPECT_EQ(SQL_MODE_READ_WRITE, mode);

 ASSERT_EQ(SQL_SUCCESS,
Expand All@@ -290,7 +294,7 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrAccessModeValid) {

 mode = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, nullptr));
 EXPECT_EQ(SQL_MODE_READ_WRITE, mode);

 // Attempt to set to SQL_MODE_READ_ONLY, driver should return warning and not error
Expand All@@ -305,32 +309,32 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrAccessModeValid) {
TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrConnectionTimeoutValid) {
 // Check default value first
 SQLUINTEGER timeout = -1;
 ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT, &timeout, 0, 0));
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT,
&timeout, 0, nullptr));
 EXPECT_EQ(0, timeout);

 ASSERT_EQ(SQL_SUCCESS, SQLSetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT,
 reinterpret_cast<SQLPOINTER>(42), 0));

 timeout = -1;
 ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT, &timeout, 0, 0));
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT,
&timeout, 0, nullptr));
 EXPECT_EQ(42, timeout);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrLoginTimeoutValid) {
 // Check default value first
 SQLUINTEGER timeout = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, nullptr));
 EXPECT_EQ(0, timeout);

 ASSERT_EQ(SQL_SUCCESS, SQLSetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT,
 reinterpret_cast<SQLPOINTER>(42), 0));

 timeout = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, nullptr));
 EXPECT_EQ(42, timeout);
}

Expand All@@ -340,15 +344,15 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrPacketSizeValid) {
 // Check default value first
 SQLUINTEGER size = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, nullptr));
 EXPECT_EQ(0, size);

 ASSERT_EQ(SQL_SUCCESS, SQLSetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE,
 reinterpret_cast<SQLPOINTER>(0), 0));

 size = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, nullptr));
 EXPECT_EQ(0, size);

 // Attempt to set to non-zero value, driver should return warning and not error
Expand Down

6 changes: 4 additions & 2 deletions
cpp/src/arrow/flight/sql/odbc/tests/connection_info_test.cc

View file


Open in desktop

Comment thread
alinaliBQ marked this conversation as resolved.

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,8 @@ TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDriverHdesc) {

 // Value returned from driver manager is the desc address
 SQLHDESC local_desc = descriptor;
 ASSERT_EQ(SQL_SUCCESS, SQLGetInfo(this->conn, SQL_HANDLE_DESC, &local_desc, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetInfo(this->conn, SQL_HANDLE_DESC, &local_desc, 0, nullptr));
 EXPECT_GT(local_desc, static_cast<SQLHSTMT>(0));

 // Free descriptor handle
Expand DownExpand Up@@ -194,7 +195,8 @@ TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDriverHlib) {
TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDriverHstmt) {
 // Value returned from driver manager is the stmt address
 SQLHSTMT local_stmt = this->stmt;
 ASSERT_EQ(SQL_SUCCESS, SQLGetInfo(this->conn, SQL_DRIVER_HSTMT, &local_stmt, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetInfo(this->conn, SQL_DRIVER_HSTMT, &local_stmt, 0, nullptr));
 EXPECT_GT(local_stmt, static_cast<SQLHSTMT>(0));
}

Expand Down

73 changes: 70 additions & 3 deletions
cpp/src/arrow/flight/sql/odbc/tests/connection_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,7 @@ TEST(SQLGetEnvAttr, TestSQLGetEnvAttrODBCVersion) {
 // Allocate an environment handle
 ASSERT_EQ(SQL_SUCCESS, SQLAllocEnv(&env));

 ASSERT_EQ(SQL_SUCCESS, SQLGetEnvAttr(env, SQL_ATTR_ODBC_VERSION, &version, 0, 0));
 ASSERT_EQ(SQL_SUCCESS, SQLGetEnvAttr(env, SQL_ATTR_ODBC_VERSION, &version, 0, nullptr));

 ASSERT_EQ(SQL_OV_ODBC2, version);

Expand DownExpand Up@@ -155,7 +155,7 @@ TYPED_TEST(ConnectionTest, TestSQLGetEnvAttrOutputNTS) {
 SQLINTEGER output_nts;

 ASSERT_EQ(SQL_SUCCESS,
 SQLGetEnvAttr(this->env, SQL_ATTR_OUTPUT_NTS, &output_nts, 0, 0));
 SQLGetEnvAttr(this->env, SQL_ATTR_OUTPUT_NTS, &output_nts, 0, nullptr));

 ASSERT_EQ(SQL_TRUE, output_nts);
}
Expand DownExpand Up@@ -432,7 +432,7 @@ TEST_F(ConnectionRemoteTest, TestSQLConnectDSNPrecedence) {
 << GetOdbcErrorMessage(SQL_HANDLE_DBC, conn);
}

#endif
#endif // _WIN32

TEST_F(ConnectionRemoteTest, TestSQLDriverConnectInvalidUid) {
 // Invalid connect string
Expand DownExpand Up@@ -508,4 +508,71 @@ TYPED_TEST(ConnectionHandleTest, TestCloseConnectionWithOpenStatement) {
 ASSERT_EQ(SQL_SUCCESS, SQLDisconnect(this->conn));
}

TYPED_TEST(ConnectionTest, TestSQLAllocFreeDesc) {
 SQLHDESC descriptor;

 // Allocate a descriptor using alloc handle
 ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_DESC, this->conn, &descriptor));

 // Free descriptor handle
 ASSERT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_DESC, descriptor));
}

TYPED_TEST(ConnectionTest, TestSQLSetStmtAttrDescriptor) {
 SQLHDESC apd_descriptor, ard_descriptor;

 // Allocate an APD descriptor using alloc handle
 ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_DESC, this->conn, &apd_descriptor));

 // Allocate an ARD descriptor using alloc handle
 ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_DESC, this->conn, &ard_descriptor));

 // Save implicitly allocated internal APD and ARD descriptor pointers
 SQLPOINTER internal_apd, internal_ard = nullptr;

 EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC,
 &internal_apd, sizeof(internal_apd), 0));

 EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC, &internal_ard,
 sizeof(internal_ard), 0));

 // Set APD descriptor to explicitly allocated handle
 EXPECT_EQ(SQL_SUCCESS, SQLSetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC,
 reinterpret_cast<SQLPOINTER>(apd_descriptor), 0));

 // Set ARD descriptor to explicitly allocated handle
 EXPECT_EQ(SQL_SUCCESS, SQLSetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC,
 reinterpret_cast<SQLPOINTER>(ard_descriptor), 0));

 // Verify APD and ARD descriptors are set to explicitly allocated pointers
 SQLPOINTER value = nullptr;
 EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC, &value,
 sizeof(value), 0));

 EXPECT_EQ(apd_descriptor, value);

 EXPECT_EQ(SQL_SUCCESS,
 SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC, &value, sizeof(value), 0));

 EXPECT_EQ(ard_descriptor, value);

 // Free explicitly allocated APD and ARD descriptor handles
 ASSERT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_DESC, apd_descriptor));

 ASSERT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_DESC, ard_descriptor));

 // Verify APD and ARD descriptors has been reverted to implicit descriptors
 value = nullptr;

 EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC, &value,
 sizeof(value), 0));

 EXPECT_EQ(internal_apd, value);

 EXPECT_EQ(SQL_SUCCESS,
 SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC, &value, sizeof(value), 0));

 EXPECT_EQ(internal_ard, value);
}

} // namespace arrow::flight::sql::odbc
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-47707: [C++][FlightRPC] Add tests for descriptor handle allocation#48053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lidavidm
merged 2 commits into

from

Dec 9, 2025
 Merged


GH-47707: [C++][FlightRPC] Add tests for descriptor handle allocation
#48053
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
e80551c

Add tests for `SQL_HANDLE_DESC` handle allocation


alinaliBQ Dec 4, 2025
b6e87e2

Use nullptr explicitly


alinaliBQ Dec 8, 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


5 changes: 0 additions & 5 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@@ -44,9 +44,6 @@ SQLRETURN SQLAllocHandle(SQLSMALLINT type, SQLHANDLE parent, SQLHANDLE* result)
 // GH-47706 TODO: Add tests for SQLAllocStmt, pre-requisite requires
 // SQLDriverConnect implementation

 // GH-47707 TODO: Add tests for SQL_HANDLE_DESC implementation for
Comment thread
alinaliBQ marked this conversation as resolved.

 // descriptor handle, pre-requisite requires SQLAllocStmt

 *result = nullptr;

 switch (type) {
Expand DownExpand Up@@ -147,8 +144,6 @@ SQLRETURN SQLFreeHandle(SQLSMALLINT type, SQLHANDLE handle) {
 // GH-47706 TODO: Add tests for SQLFreeStmt, pre-requisite requires
 // SQLAllocStmt tests

 // GH-47707 TODO: Add tests for SQL_HANDLE_DESC implementation for
 // descriptor handle
 switch (type) {
 case SQL_HANDLE_ENV: {
 using ODBC::ODBCEnvironment;
Expand Down

3 changes: 3 additions & 0 deletions
cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_statement.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,9 @@ class ODBCStatement : public ODBCHandle<ODBCStatement> {
 void SetStmtAttr(SQLINTEGER statement_attribute, SQLPOINTER value,
 SQLINTEGER buffer_size, bool is_unicode);

 /// \brief Revert back to implicitly allocated internal descriptors.
 /// isApd as True indicates APD descritor is to be reverted.
 /// isApd as False indicates ARD descritor is to be reverted.
 void RevertAppDescriptor(bool is_apd);

 inline ODBCDescriptor* GetIRD() { return ird_.get(); }
Expand Down

56 changes: 30 additions & 26 deletions
cpp/src/arrow/flight/sql/odbc/tests/connection_attr_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -146,23 +146,25 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrTxnIsolationUnsupported
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrDbcInfoTokenSetOnly) {
 // Verify that set-only attribute cannot be read
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_ERROR, SQLGetConnectAttr(this->conn, SQL_ATTR_DBC_INFO_TOKEN, ptr, 0, 0));
 ASSERT_EQ(SQL_ERROR,
 SQLGetConnectAttr(this->conn, SQL_ATTR_DBC_INFO_TOKEN, ptr, 0, nullptr));
 VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateHY092);
}
#endif

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrOdbcCursorsDMOnly) {
 // Verify that DM-only attribute is handled by driver manager
 SQLULEN cursor_attr;
 ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_ODBC_CURSORS, &cursor_attr, 0, 0));
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_ODBC_CURSORS,
&cursor_attr, 0, nullptr));
 EXPECT_EQ(SQL_CUR_USE_DRIVER, cursor_attr);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTraceDMOnly) {
 // Verify that DM-only attribute is handled by driver manager
 SQLUINTEGER trace;
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_TRACE, &trace, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_TRACE, &trace, 0, nullptr));
 EXPECT_EQ(SQL_OPT_TRACE_OFF, trace);
}

Expand DownExpand Up@@ -190,15 +192,15 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTranslateLibUnsupported

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTranslateOptionUnsupported) {
 SQLINTEGER option;
 ASSERT_EQ(SQL_ERROR,
SQLGetConnectAttr(this->conn, SQL_ATTR_TRANSLATE_OPTION, &option, 0, 0));
 ASSERT_EQ(SQL_ERROR, SQLGetConnectAttr(this->conn, SQL_ATTR_TRANSLATE_OPTION, &option,
0, nullptr));
 VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateHYC00);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTxnIsolationUnsupported) {
 SQLINTEGER isolation;
 ASSERT_EQ(SQL_ERROR,
SQLGetConnectAttr(this->conn, SQL_ATTR_TXN_ISOLATION, &isolation, 0, 0));
 ASSERT_EQ(SQL_ERROR, SQLGetConnectAttr(this->conn, SQL_ATTR_TXN_ISOLATION, &isolation,
0, nullptr));
 VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateHYC00);
}

Expand All@@ -219,7 +221,7 @@ TYPED_TEST(ConnectionAttributeTest,
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcEventDefault) {
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_EVENT, ptr, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_EVENT, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}
#endif
Expand All@@ -228,7 +230,7 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcEventDefault) {
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcPcallbackDefault) {
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCALLBACK, ptr, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCALLBACK, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}
#endif
Expand All@@ -237,41 +239,43 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcPcallbackDefaul
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcPcontextDefault) {
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCONTEXT, ptr, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCONTEXT, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}
#endif

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncEnableDefault) {
 SQLULEN enable;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_ENABLE, &enable, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_ENABLE, &enable, 0, nullptr));
 EXPECT_EQ(SQL_ASYNC_ENABLE_OFF, enable);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAutoIpdDefault) {
 SQLUINTEGER ipd;
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_AUTO_IPD, &ipd, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_AUTO_IPD, &ipd, 0, nullptr));
 EXPECT_EQ(static_cast<SQLUINTEGER>(SQL_FALSE), ipd);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAutocommitDefault) {
 SQLUINTEGER auto_commit;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_AUTOCOMMIT, &auto_commit, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_AUTOCOMMIT, &auto_commit, 0, nullptr));
 EXPECT_EQ(SQL_AUTOCOMMIT_ON, auto_commit);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrEnlistInDtcDefault) {
 SQLPOINTER ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ENLIST_IN_DTC, ptr, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ENLIST_IN_DTC, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrQuietModeDefault) {
 HWND ptr = NULL;
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_QUIET_MODE, ptr, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_QUIET_MODE, ptr, 0, nullptr));
 EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
}

Expand All@@ -281,7 +285,7 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrAccessModeValid) {
 // Check default value first
 SQLUINTEGER mode = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, nullptr));
 EXPECT_EQ(SQL_MODE_READ_WRITE, mode);

 ASSERT_EQ(SQL_SUCCESS,
Expand All@@ -290,7 +294,7 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrAccessModeValid) {

 mode = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, nullptr));
 EXPECT_EQ(SQL_MODE_READ_WRITE, mode);

 // Attempt to set to SQL_MODE_READ_ONLY, driver should return warning and not error
Expand All@@ -305,32 +309,32 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrAccessModeValid) {
TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrConnectionTimeoutValid) {
 // Check default value first
 SQLUINTEGER timeout = -1;
 ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT, &timeout, 0, 0));
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT,
&timeout, 0, nullptr));
 EXPECT_EQ(0, timeout);

 ASSERT_EQ(SQL_SUCCESS, SQLSetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT,
 reinterpret_cast<SQLPOINTER>(42), 0));

 timeout = -1;
 ASSERT_EQ(SQL_SUCCESS,
SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT, &timeout, 0, 0));
 ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT,
&timeout, 0, nullptr));
 EXPECT_EQ(42, timeout);
}

TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrLoginTimeoutValid) {
 // Check default value first
 SQLUINTEGER timeout = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, nullptr));
 EXPECT_EQ(0, timeout);

 ASSERT_EQ(SQL_SUCCESS, SQLSetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT,
 reinterpret_cast<SQLPOINTER>(42), 0));

 timeout = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, nullptr));
 EXPECT_EQ(42, timeout);
}

Expand All@@ -340,15 +344,15 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrPacketSizeValid) {
 // Check default value first
 SQLUINTEGER size = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, nullptr));
 EXPECT_EQ(0, size);

 ASSERT_EQ(SQL_SUCCESS, SQLSetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE,
 reinterpret_cast<SQLPOINTER>(0), 0));

 size = -1;
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, 0));
 SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, nullptr));
 EXPECT_EQ(0, size);

 // Attempt to set to non-zero value, driver should return warning and not error
Expand Down

6 changes: 4 additions & 2 deletions
cpp/src/arrow/flight/sql/odbc/tests/connection_info_test.cc

View file


Open in desktop

Comment thread
alinaliBQ marked this conversation as resolved.

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,8 @@ TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDriverHdesc) {

 // Value returned from driver manager is the desc address
 SQLHDESC local_desc = descriptor;
 ASSERT_EQ(SQL_SUCCESS, SQLGetInfo(this->conn, SQL_HANDLE_DESC, &local_desc, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetInfo(this->conn, SQL_HANDLE_DESC, &local_desc, 0, nullptr));
 EXPECT_GT(local_desc, static_cast<SQLHSTMT>(0));

 // Free descriptor handle
Expand DownExpand Up@@ -194,7 +195,8 @@ TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDriverHlib) {
TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDriverHstmt) {
 // Value returned from driver manager is the stmt address
 SQLHSTMT local_stmt = this->stmt;
 ASSERT_EQ(SQL_SUCCESS, SQLGetInfo(this->conn, SQL_DRIVER_HSTMT, &local_stmt, 0, 0));
 ASSERT_EQ(SQL_SUCCESS,
 SQLGetInfo(this->conn, SQL_DRIVER_HSTMT, &local_stmt, 0, nullptr));
 EXPECT_GT(local_stmt, static_cast<SQLHSTMT>(0));
}

Expand Down

73 changes: 70 additions & 3 deletions
cpp/src/arrow/flight/sql/odbc/tests/connection_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,7 @@ TEST(SQLGetEnvAttr, TestSQLGetEnvAttrODBCVersion) {
 // Allocate an environment handle
 ASSERT_EQ(SQL_SUCCESS, SQLAllocEnv(&env));

 ASSERT_EQ(SQL_SUCCESS, SQLGetEnvAttr(env, SQL_ATTR_ODBC_VERSION, &version, 0, 0));
 ASSERT_EQ(SQL_SUCCESS, SQLGetEnvAttr(env, SQL_ATTR_ODBC_VERSION, &version, 0, nullptr));

 ASSERT_EQ(SQL_OV_ODBC2, version);

Expand DownExpand Up@@ -155,7 +155,7 @@ TYPED_TEST(ConnectionTest, TestSQLGetEnvAttrOutputNTS) {
 SQLINTEGER output_nts;

 ASSERT_EQ(SQL_SUCCESS,
 SQLGetEnvAttr(this->env, SQL_ATTR_OUTPUT_NTS, &output_nts, 0, 0));
 SQLGetEnvAttr(this->env, SQL_ATTR_OUTPUT_NTS, &output_nts, 0, nullptr));

 ASSERT_EQ(SQL_TRUE, output_nts);
}
Expand DownExpand Up@@ -432,7 +432,7 @@ TEST_F(ConnectionRemoteTest, TestSQLConnectDSNPrecedence) {
 << GetOdbcErrorMessage(SQL_HANDLE_DBC, conn);
}

#endif
#endif // _WIN32

TEST_F(ConnectionRemoteTest, TestSQLDriverConnectInvalidUid) {
 // Invalid connect string
Expand DownExpand Up@@ -508,4 +508,71 @@ TYPED_TEST(ConnectionHandleTest, TestCloseConnectionWithOpenStatement) {
 ASSERT_EQ(SQL_SUCCESS, SQLDisconnect(this->conn));
}

TYPED_TEST(ConnectionTest, TestSQLAllocFreeDesc) {
 SQLHDESC descriptor;

 // Allocate a descriptor using alloc handle
 ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_DESC, this->conn, &descriptor));

 // Free descriptor handle
 ASSERT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_DESC, descriptor));
}

TYPED_TEST(ConnectionTest, TestSQLSetStmtAttrDescriptor) {
 SQLHDESC apd_descriptor, ard_descriptor;

 // Allocate an APD descriptor using alloc handle
 ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_DESC, this->conn, &apd_descriptor));

 // Allocate an ARD descriptor using alloc handle
 ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_DESC, this->conn, &ard_descriptor));

 // Save implicitly allocated internal APD and ARD descriptor pointers
 SQLPOINTER internal_apd, internal_ard = nullptr;

 EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC,
 &internal_apd, sizeof(internal_apd), 0));

 EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC, &internal_ard,
 sizeof(internal_ard), 0));

 // Set APD descriptor to explicitly allocated handle
 EXPECT_EQ(SQL_SUCCESS, SQLSetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC,
 reinterpret_cast<SQLPOINTER>(apd_descriptor), 0));

 // Set ARD descriptor to explicitly allocated handle
 EXPECT_EQ(SQL_SUCCESS, SQLSetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC,
 reinterpret_cast<SQLPOINTER>(ard_descriptor), 0));

 // Verify APD and ARD descriptors are set to explicitly allocated pointers
 SQLPOINTER value = nullptr;
 EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC, &value,
 sizeof(value), 0));

 EXPECT_EQ(apd_descriptor, value);

 EXPECT_EQ(SQL_SUCCESS,
 SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC, &value, sizeof(value), 0));

 EXPECT_EQ(ard_descriptor, value);

 // Free explicitly allocated APD and ARD descriptor handles
 ASSERT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_DESC, apd_descriptor));

 ASSERT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_DESC, ard_descriptor));

 // Verify APD and ARD descriptors has been reverted to implicit descriptors
 value = nullptr;

 EXPECT_EQ(SQL_SUCCESS, SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_PARAM_DESC, &value,
 sizeof(value), 0));

 EXPECT_EQ(internal_apd, value);

 EXPECT_EQ(SQL_SUCCESS,
 SQLGetStmtAttr(this->stmt, SQL_ATTR_APP_ROW_DESC, &value, sizeof(value), 0));

 EXPECT_EQ(internal_ard, value);
}

} // namespace arrow::flight::sql::odbc
Loading
Loading