Skip to content

Change GetInfo disabled tests to start new connection #159

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
alinaliBQ merged 2 commits into from
Mar 10, 2026
Merged

Change GetInfo disabled tests to start new connection #159

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7df8bc1
Enable disabled tests
alinaliBQ Mar 9, 2026
4d0619c
Fix getinfo tests to use standalone connection
alinaliBQ Mar 9, 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
37 changes: 30 additions & 7 deletions cpp/src/arrow/flight/sql/odbc/tests/connection_info_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ class ConnectionInfoMockTest : public FlightSQLODBCMockTestBase {};
using TestTypes = ::testing::Types<ConnectionInfoMockTest, FlightSQLODBCRemoteTestBase>;
TYPED_TEST_SUITE(ConnectionInfoTest, TestTypes);

template <typename T>
class ConnectionInfoHandleTest : public T {};
using TestTypesHandle = ::testing::Types<FlightSQLOdbcEnvConnHandleMockTestBase,
FlightSQLOdbcEnvConnHandleRemoteTestBase>;
TYPED_TEST_SUITE(ConnectionInfoHandleTest, TestTypesHandle);

namespace {
// Helper Functions

Expand Down Expand Up @@ -583,14 +589,19 @@ TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoAlterTable) {
EXPECT_EQ(static_cast<SQLUINTEGER>(0), value);
}

#ifdef DISABLE_TEST
TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoCatalogLocation) {
TYPED_TEST(ConnectionInfoHandleTest, TestSQLGetInfoCatalogLocation) {
// GH-49482 TODO: resolve inconsitent return value for SQL_CATALOG_LOCATION and change
// test type to `ConnectionInfoTest`
this->ConnectWithString(this->GetConnectionString());

SQLUSMALLINT value;
GetInfo(conn, SQL_CATALOG_LOCATION, &value);

EXPECT_EQ(static_cast<SQLUSMALLINT>(0), value);

EXPECT_EQ(SQL_SUCCESS, SQLDisconnect(conn))
<< GetOdbcErrorMessage(SQL_HANDLE_DBC, conn);
}
#endif

TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoCatalogName) {
SQLWCHAR value[kOdbcBufferSize] = L"";
Expand Down Expand Up @@ -711,21 +722,33 @@ TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDropDomain) {
EXPECT_EQ(static_cast<SQLUINTEGER>(0), value);
}

#ifdef DISABLE_TEST
TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDropSchema) {
TYPED_TEST(ConnectionInfoHandleTest, TestSQLGetInfoDropSchema) {
// GH-49482 TODO: resolve inconsitent return value for SQL_DROP_SCHEMA and change test
// type to `ConnectionInfoTest`
this->ConnectWithString(this->GetConnectionString());

SQLUINTEGER value;
GetInfo(conn, SQL_DROP_SCHEMA, &value);

EXPECT_EQ(static_cast<SQLUINTEGER>(0), value);

EXPECT_EQ(SQL_SUCCESS, SQLDisconnect(conn))
<< GetOdbcErrorMessage(SQL_HANDLE_DBC, conn);
}

TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDropTable) {
TYPED_TEST(ConnectionInfoHandleTest, TestSQLGetInfoDropTable) {
// GH-49482 TODO: resolve inconsitent return value for SQL_DROP_TABLE and change test
// type to `ConnectionInfoTest`
this->ConnectWithString(this->GetConnectionString());

SQLUINTEGER value;
GetInfo(conn, SQL_DROP_TABLE, &value);

EXPECT_EQ(static_cast<SQLUINTEGER>(0), value);

EXPECT_EQ(SQL_SUCCESS, SQLDisconnect(conn))
<< GetOdbcErrorMessage(SQL_HANDLE_DBC, conn);
}
#endif

TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDropTranslation) {
SQLUINTEGER value;
Expand Down
Loading