Skip to content

Commit 2760394

Browse files
committed
Replace 0 with nullptr for SQLGetData test calls
- be explicit with nullptr instead of 0
1 parent 95373ad commit 2760394

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ TYPED_TEST(StatementTest, TestSQLExecDirectSimpleQuery) {
4848

4949
SQLINTEGER val;
5050

51-
ASSERT_EQ(SQL_SUCCESS, SQLGetData(this->stmt, 1, SQL_C_LONG, &val, 0, 0));
51+
ASSERT_EQ(SQL_SUCCESS, SQLGetData(this->stmt, 1, SQL_C_LONG, &val, 0, nullptr));
5252
// Verify 1 is returned
5353
EXPECT_EQ(1, val);
5454

5555
ASSERT_EQ(SQL_NO_DATA, SQLFetch(this->stmt));
5656

57-
ASSERT_EQ(SQL_ERROR, SQLGetData(this->stmt, 1, SQL_C_LONG, &val, 0, 0));
57+
ASSERT_EQ(SQL_ERROR, SQLGetData(this->stmt, 1, SQL_C_LONG, &val, 0, nullptr));
5858
// Invalid cursor state
5959
VerifyOdbcErrorState(SQL_HANDLE_STMT, this->stmt, kErrorState24000);
6060
}
@@ -82,14 +82,14 @@ TYPED_TEST(StatementTest, TestSQLExecuteSimpleQuery) {
8282
ASSERT_EQ(SQL_SUCCESS, SQLFetch(this->stmt));
8383

8484
SQLINTEGER val;
85-
ASSERT_EQ(SQL_SUCCESS, SQLGetData(this->stmt, 1, SQL_C_LONG, &val, 0, 0));
85+
ASSERT_EQ(SQL_SUCCESS, SQLGetData(this->stmt, 1, SQL_C_LONG, &val, 0, nullptr));
8686

8787
// Verify 1 is returned
8888
EXPECT_EQ(1, val);
8989

9090
ASSERT_EQ(SQL_NO_DATA, SQLFetch(this->stmt));
9191

92-
ASSERT_EQ(SQL_ERROR, SQLGetData(this->stmt, 1, SQL_C_LONG, &val, 0, 0));
92+
ASSERT_EQ(SQL_ERROR, SQLGetData(this->stmt, 1, SQL_C_LONG, &val, 0, nullptr));
9393
// Invalid cursor state
9494
VerifyOdbcErrorState(SQL_HANDLE_STMT, this->stmt, kErrorState24000);
9595
}
@@ -975,7 +975,7 @@ TYPED_TEST(StatementTest, DISABLED_TestSQLExecDirectFloatTruncation) {
975975
int16_t ssmall_int_val;
976976

977977
ASSERT_EQ(SQL_SUCCESS_WITH_INFO,
978-
SQLGetData(this->stmt, 1, SQL_C_SSHORT, &ssmall_int_val, 0, 0));
978+
SQLGetData(this->stmt, 1, SQL_C_SSHORT, &ssmall_int_val, 0, nullptr));
979979
// Verify float truncation is reported
980980
VerifyOdbcErrorState(SQL_HANDLE_STMT, this->stmt, kErrorState01S07);
981981

@@ -1023,7 +1023,7 @@ TEST_F(StatementMockTest, TestSQLExecDirectTruncationQueryNullIndicator) {
10231023
ASSERT_EQ(SQL_SUCCESS, SQLFetch(this->stmt));
10241024

10251025
SQLINTEGER val;
1026-
ASSERT_EQ(SQL_SUCCESS, SQLGetData(this->stmt, 1, SQL_C_LONG, &val, 0, 0));
1026+
ASSERT_EQ(SQL_SUCCESS, SQLGetData(this->stmt, 1, SQL_C_LONG, &val, 0, nullptr));
10271027
// Verify 1 is returned for non-truncation case.
10281028
EXPECT_EQ(1, val);
10291029

@@ -1032,7 +1032,7 @@ TEST_F(StatementMockTest, TestSQLExecDirectTruncationQueryNullIndicator) {
10321032
SQLCHAR char_val[len];
10331033
SQLLEN buf_len = sizeof(SQLCHAR) * len;
10341034
ASSERT_EQ(SQL_SUCCESS_WITH_INFO,
1035-
SQLGetData(this->stmt, 2, SQL_C_CHAR, &char_val, buf_len, 0));
1035+
SQLGetData(this->stmt, 2, SQL_C_CHAR, &char_val, buf_len, nullptr));
10361036
// Verify string truncation is reported
10371037
VerifyOdbcErrorState(SQL_HANDLE_STMT, this->stmt, kErrorState01004);
10381038

@@ -1042,15 +1042,15 @@ TEST_F(StatementMockTest, TestSQLExecDirectTruncationQueryNullIndicator) {
10421042
size_t wchar_size = GetSqlWCharSize();
10431043
buf_len = wchar_size * len2;
10441044
ASSERT_EQ(SQL_SUCCESS_WITH_INFO,
1045-
SQLGetData(this->stmt, 3, SQL_C_WCHAR, &wchar_val, buf_len, 0));
1045+
SQLGetData(this->stmt, 3, SQL_C_WCHAR, &wchar_val, buf_len, nullptr));
10461046
// Verify string truncation is reported
10471047
VerifyOdbcErrorState(SQL_HANDLE_STMT, this->stmt, kErrorState01004);
10481048

10491049
// varbinary
10501050
std::vector<int8_t> varbinary_val(3);
10511051
buf_len = varbinary_val.size();
10521052
ASSERT_EQ(SQL_SUCCESS_WITH_INFO,
1053-
SQLGetData(this->stmt, 4, SQL_C_BINARY, &varbinary_val[0], buf_len, 0));
1053+
SQLGetData(this->stmt, 4, SQL_C_BINARY, &varbinary_val[0], buf_len, nullptr));
10541054
// Verify binary truncation is reported
10551055
VerifyOdbcErrorState(SQL_HANDLE_STMT, this->stmt, kErrorState01004);
10561056
}
@@ -1069,7 +1069,7 @@ TEST_F(StatementRemoteTest, TestSQLExecDirectNullQueryNullIndicator) {
10691069

10701070
SQLINTEGER val;
10711071

1072-
ASSERT_EQ(SQL_ERROR, SQLGetData(this->stmt, 1, SQL_C_LONG, &val, 0, 0));
1072+
ASSERT_EQ(SQL_ERROR, SQLGetData(this->stmt, 1, SQL_C_LONG, &val, 0, nullptr));
10731073
// Verify invalid null indicator is reported, as it is required
10741074
VerifyOdbcErrorState(SQL_HANDLE_STMT, this->stmt, kErrorState22002);
10751075
}

0 commit comments

Comments
 (0)