Skip to content

GH-50578: [C++][FlightRPC][ODBC] Always return SQL_NO_DATA from GetMoreResults #50700

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

Draft
amoeba wants to merge 2 commits into
base: main
Choose a base branch
from
+1 −12
Draft

GH-50578: [C++][FlightRPC][ODBC] Always return SQL_NO_DATA from GetMoreResults #50700

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
edb25fb
Always return SQL_NO_DATA from GetMoreResults
amoeba Jul 29, 2026
b1399a3
update test
amoeba Jul 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_statement.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,11 +784,7 @@ SQLRETURN ODBCStatement::GetData(SQLSMALLINT record_number, SQLSMALLINT c_type,

@alinaliBQ alinaliBQ Jul 29, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The CI hasn't run the C++ Extra tests, so I'm not sure whether TestSQLMoreResultsWithoutQuery will fail. If the driver manager doesn't return HY010 for SQLMoreResults, you may need to update TestSQLMoreResultsWithoutQuery to expect SQL_NO_DATA on all platforms.

arrow/cpp/src/arrow/flight/sql/odbc/tests/statement_test.cc

Lines 1986 to 1995 in deed9c0

TYPED_TEST(StatementTest, TestSQLMoreResultsWithoutQuery) {
#ifdef __linux__
ASSERT_EQ(SQL_NO_DATA, SQLMoreResults(this->stmt));
#else // Windows & Mac
// Verify function sequence error state is reported when SQLMoreResults is called
// without executing any queries
ASSERT_EQ(SQL_ERROR, SQLMoreResults(this->stmt));
VerifyOdbcErrorState(SQL_HANDLE_STMT, this->stmt, kErrorStateHY010);
#endif
}

to:

TYPED_TEST(StatementTest, TestSQLMoreResultsWithoutQuery) {
  ASSERT_EQ(SQL_NO_DATA, SQLMoreResults(this->stmt));
}

edit: fixed typo

@amoeba amoeba Jul 29, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. I pushed without the test fix to verify the test fails in CI since I don't have the tests running locally.

SQLRETURN ODBCStatement::GetMoreResults() {
// Multiple result sets are not supported by Arrow protocol.
if (current_result_) {
return SQL_NO_DATA;
} else {
throw DriverException("Function sequence error", "HY010");
}
return SQL_NO_DATA;
}

void ODBCStatement::GetColumnCount(SQLSMALLINT* column_count_ptr) {
Expand Down
7 changes: 0 additions & 7 deletions cpp/src/arrow/flight/sql/odbc/tests/statement_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1984,14 +1984,7 @@ TYPED_TEST(StatementTest, TestSQLMoreResultsNoData) {
}

TYPED_TEST(StatementTest, TestSQLMoreResultsWithoutQuery) {
#ifdef __linux__
ASSERT_EQ(SQL_NO_DATA, SQLMoreResults(this->stmt));
#else // Windows & Mac
// Verify function sequence error state is reported when SQLMoreResults is called
// without executing any queries
ASSERT_EQ(SQL_ERROR, SQLMoreResults(this->stmt));
VerifyOdbcErrorState(SQL_HANDLE_STMT, this->stmt, kErrorStateHY010);
#endif
}

TYPED_TEST(StatementTest, TestSQLNativeSqlReturnsInputString) {
Expand Down
Loading