Skip to content

Commit 059b110

Browse files
committed
Fix lint
1 parent 4f6cce4 commit 059b110

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_handle.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ class ODBCHandle {
5656
}
5757
// on mac, DriverException doesn't catch the subclass exceptions hence we added
5858
// the following above.
59-
// GH-48278 TODO investigate if there is a way to catch all the subclass exceptions under
60-
// DriverException
59+
// GH-48278 TODO investigate if there is a way to catch all the subclass exceptions
60+
// under DriverException
6161
catch (const arrow::flight::sql::odbc::DriverException& ex) {
6262
GetDiagnostics().AddError(ex);
6363
} catch (const std::bad_alloc&) {

cpp/src/arrow/flight/sql/odbc/tests/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
add_custom_target(tests)
1919

2020
if(WIN32)
21-
include_directories(${ODBC_INCLUDE_DIRS})
21+
include_directories(${ODBC_INCLUDE_DIRS})
2222
else()
23-
include_directories(${ODBC_INCLUDE_DIR})
23+
include_directories(${ODBC_INCLUDE_DIR})
2424
endif()
2525

2626
find_package(SQLite3Alt REQUIRED)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2198,7 +2198,7 @@ TEST_F(ColumnsMockTest, TestSQLDescribeColValidateInput) {
21982198
VerifyOdbcErrorState(SQL_HANDLE_STMT, this->stmt, kErrorStateS1002);
21992199
#else
22002200
VerifyOdbcErrorState(SQL_HANDLE_STMT, this->stmt, kErrorState07009);
2201-
#endif // __APPLE__
2201+
#endif // __APPLE__
22022202

22032203
// Invalid descriptor index - index out of range
22042204
EXPECT_EQ(SQL_ERROR, SQLDescribeCol(this->stmt, out_of_range_column, column_name,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,11 +308,11 @@ TYPED_TEST(ErrorsTest, TestSQLGetDiagRecInputData) {
308308

309309
// Invalid handle
310310
#ifdef __APPLE__
311-
// MacOS ODBC driver manager requires connection handle
311+
// MacOS ODBC driver manager requires connection handle
312312
EXPECT_EQ(SQL_INVALID_HANDLE, SQLGetDiagRec(0, this->conn, 1, 0, 0, 0, 0, 0));
313313
#else
314314
EXPECT_EQ(SQL_INVALID_HANDLE, SQLGetDiagRec(0, 0, 0, 0, 0, 0, 0, 0));
315-
#endif // __APPLE__
315+
#endif // __APPLE__
316316
}
317317

318318
TYPED_TEST(ErrorsOdbcV2Test, TestSQLErrorInputData) {
@@ -328,7 +328,7 @@ TYPED_TEST(ErrorsOdbcV2Test, TestSQLErrorInputData) {
328328
EXPECT_EQ(SQL_NO_DATA, SQLError(SQL_NULL_HENV, this->conn, this->stmt, 0, 0, 0, 0, 0));
329329
#else
330330
EXPECT_EQ(SQL_NO_DATA, SQLError(0, 0, this->stmt, 0, 0, 0, 0, 0));
331-
#endif // __APPLE__
331+
#endif // __APPLE__
332332

333333
// Invalid handle
334334
EXPECT_EQ(SQL_INVALID_HANDLE, SQLError(0, 0, 0, 0, 0, 0, 0, 0));

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ TYPED_TEST(StatementTest, TestSQLPrepareInvalidQuery) {
109109
VerifyOdbcErrorState(SQL_HANDLE_STMT, this->stmt, kErrorStateS1010);
110110
#else
111111
VerifyOdbcErrorState(SQL_HANDLE_STMT, this->stmt, kErrorStateHY010);
112-
#endif // __APPLE__
112+
#endif // __APPLE__
113113
}
114114

115115
TYPED_TEST(StatementTest, TestSQLExecDirectDataQuery) {
@@ -2020,7 +2020,7 @@ TYPED_TEST(StatementTest, TestSQLNativeSqlReturnsErrorOnBadInputs) {
20202020
VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateS1090);
20212021
#else
20222022
VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateHY090);
2023-
#endif // __APPLE__
2023+
#endif // __APPLE__
20242024
}
20252025

20262026
TYPED_TEST(StatementTest, SQLNumResultColsReturnsColumnsOnSelect) {
@@ -2069,7 +2069,7 @@ TYPED_TEST(StatementTest, SQLNumResultColsFunctionSequenceErrorOnNoQuery) {
20692069
VerifyOdbcErrorState(SQL_HANDLE_STMT, this->stmt, kErrorStateS1010);
20702070
#else
20712071
VerifyOdbcErrorState(SQL_HANDLE_STMT, this->stmt, kErrorStateHY010);
2072-
#endif // __APPLE__
2072+
#endif // __APPLE__
20732073

20742074
ASSERT_EQ(expected_value, column_count);
20752075
}
@@ -2117,7 +2117,7 @@ TYPED_TEST(StatementTest, SQLRowCountFunctionSequenceErrorOnNoQuery) {
21172117
VerifyOdbcErrorState(SQL_HANDLE_STMT, this->stmt, kErrorStateS1010);
21182118
#else
21192119
VerifyOdbcErrorState(SQL_HANDLE_STMT, this->stmt, kErrorStateHY010);
2120-
#endif // __APPLE__
2120+
#endif // __APPLE__
21212121

21222122
EXPECT_EQ(expected_value, row_count);
21232123
}

0 commit comments

Comments
 (0)