Skip to content

Commit b6e87e2

Browse files
alinaliBQalinaliBQ
committed
Use nullptr explicitly
1 parent e80551c commit b6e87e2

File tree

4 files changed

+71
-58
lines changed

4 files changed

+71
-58
lines changed

‎cpp/src/arrow/flight/sql/odbc/tests/connection_attr_test.cc‎

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -146,23 +146,25 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrTxnIsolationUnsupported
146146
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrDbcInfoTokenSetOnly) {
147147
// Verify that set-only attribute cannot be read
148148
SQLPOINTER ptr = NULL;
149-
ASSERT_EQ(SQL_ERROR, SQLGetConnectAttr(this->conn, SQL_ATTR_DBC_INFO_TOKEN, ptr, 0, 0));
149+
ASSERT_EQ(SQL_ERROR,
150+
SQLGetConnectAttr(this->conn, SQL_ATTR_DBC_INFO_TOKEN, ptr, 0, nullptr));
150151
VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateHY092);
151152
}
152153
#endif
153154

154155
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrOdbcCursorsDMOnly) {
155156
// Verify that DM-only attribute is handled by driver manager
156157
SQLULEN cursor_attr;
157-
ASSERT_EQ(SQL_SUCCESS,
158-
SQLGetConnectAttr(this->conn, SQL_ATTR_ODBC_CURSORS, &cursor_attr, 0, 0));
158+
ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_ODBC_CURSORS,
159+
&cursor_attr, 0, nullptr));
159160
EXPECT_EQ(SQL_CUR_USE_DRIVER, cursor_attr);
160161
}
161162

162163
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTraceDMOnly) {
163164
// Verify that DM-only attribute is handled by driver manager
164165
SQLUINTEGER trace;
165-
ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_TRACE, &trace, 0, 0));
166+
ASSERT_EQ(SQL_SUCCESS,
167+
SQLGetConnectAttr(this->conn, SQL_ATTR_TRACE, &trace, 0, nullptr));
166168
EXPECT_EQ(SQL_OPT_TRACE_OFF, trace);
167169
}
168170

@@ -190,15 +192,15 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTranslateLibUnsupported
190192

191193
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTranslateOptionUnsupported) {
192194
SQLINTEGER option;
193-
ASSERT_EQ(SQL_ERROR,
194-
SQLGetConnectAttr(this->conn, SQL_ATTR_TRANSLATE_OPTION, &option, 0, 0));
195+
ASSERT_EQ(SQL_ERROR, SQLGetConnectAttr(this->conn, SQL_ATTR_TRANSLATE_OPTION, &option,
196+
0, nullptr));
195197
VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateHYC00);
196198
}
197199

198200
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrTxnIsolationUnsupported) {
199201
SQLINTEGER isolation;
200-
ASSERT_EQ(SQL_ERROR,
201-
SQLGetConnectAttr(this->conn, SQL_ATTR_TXN_ISOLATION, &isolation, 0, 0));
202+
ASSERT_EQ(SQL_ERROR, SQLGetConnectAttr(this->conn, SQL_ATTR_TXN_ISOLATION, &isolation,
203+
0, nullptr));
202204
VerifyOdbcErrorState(SQL_HANDLE_DBC, this->conn, kErrorStateHYC00);
203205
}
204206

@@ -219,7 +221,7 @@ TYPED_TEST(ConnectionAttributeTest,
219221
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcEventDefault) {
220222
SQLPOINTER ptr = NULL;
221223
ASSERT_EQ(SQL_SUCCESS,
222-
SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_EVENT, ptr, 0, 0));
224+
SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_EVENT, ptr, 0, nullptr));
223225
EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
224226
}
225227
#endif
@@ -228,7 +230,7 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcEventDefault) {
228230
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcPcallbackDefault) {
229231
SQLPOINTER ptr = NULL;
230232
ASSERT_EQ(SQL_SUCCESS,
231-
SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCALLBACK, ptr, 0, 0));
233+
SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCALLBACK, ptr, 0, nullptr));
232234
EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
233235
}
234236
#endif
@@ -237,41 +239,43 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcPcallbackDefaul
237239
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncDbcPcontextDefault) {
238240
SQLPOINTER ptr = NULL;
239241
ASSERT_EQ(SQL_SUCCESS,
240-
SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCONTEXT, ptr, 0, 0));
242+
SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_DBC_PCONTEXT, ptr, 0, nullptr));
241243
EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
242244
}
243245
#endif
244246

245247
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAsyncEnableDefault) {
246248
SQLULEN enable;
247249
ASSERT_EQ(SQL_SUCCESS,
248-
SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_ENABLE, &enable, 0, 0));
250+
SQLGetConnectAttr(this->conn, SQL_ATTR_ASYNC_ENABLE, &enable, 0, nullptr));
249251
EXPECT_EQ(SQL_ASYNC_ENABLE_OFF, enable);
250252
}
251253

252254
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAutoIpdDefault) {
253255
SQLUINTEGER ipd;
254-
ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_AUTO_IPD, &ipd, 0, 0));
256+
ASSERT_EQ(SQL_SUCCESS,
257+
SQLGetConnectAttr(this->conn, SQL_ATTR_AUTO_IPD, &ipd, 0, nullptr));
255258
EXPECT_EQ(static_cast<SQLUINTEGER>(SQL_FALSE), ipd);
256259
}
257260

258261
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrAutocommitDefault) {
259262
SQLUINTEGER auto_commit;
260263
ASSERT_EQ(SQL_SUCCESS,
261-
SQLGetConnectAttr(this->conn, SQL_ATTR_AUTOCOMMIT, &auto_commit, 0, 0));
264+
SQLGetConnectAttr(this->conn, SQL_ATTR_AUTOCOMMIT, &auto_commit, 0, nullptr));
262265
EXPECT_EQ(SQL_AUTOCOMMIT_ON, auto_commit);
263266
}
264267

265268
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrEnlistInDtcDefault) {
266269
SQLPOINTER ptr = NULL;
267270
ASSERT_EQ(SQL_SUCCESS,
268-
SQLGetConnectAttr(this->conn, SQL_ATTR_ENLIST_IN_DTC, ptr, 0, 0));
271+
SQLGetConnectAttr(this->conn, SQL_ATTR_ENLIST_IN_DTC, ptr, 0, nullptr));
269272
EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
270273
}
271274

272275
TYPED_TEST(ConnectionAttributeTest, TestSQLGetConnectAttrQuietModeDefault) {
273276
HWND ptr = NULL;
274-
ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_QUIET_MODE, ptr, 0, 0));
277+
ASSERT_EQ(SQL_SUCCESS,
278+
SQLGetConnectAttr(this->conn, SQL_ATTR_QUIET_MODE, ptr, 0, nullptr));
275279
EXPECT_EQ(reinterpret_cast<SQLPOINTER>(NULL), ptr);
276280
}
277281

@@ -281,7 +285,7 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrAccessModeValid) {
281285
// Check default value first
282286
SQLUINTEGER mode = -1;
283287
ASSERT_EQ(SQL_SUCCESS,
284-
SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, 0));
288+
SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, nullptr));
285289
EXPECT_EQ(SQL_MODE_READ_WRITE, mode);
286290

287291
ASSERT_EQ(SQL_SUCCESS,
@@ -290,7 +294,7 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrAccessModeValid) {
290294

291295
mode = -1;
292296
ASSERT_EQ(SQL_SUCCESS,
293-
SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, 0));
297+
SQLGetConnectAttr(this->conn, SQL_ATTR_ACCESS_MODE, &mode, 0, nullptr));
294298
EXPECT_EQ(SQL_MODE_READ_WRITE, mode);
295299

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

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

315319
timeout = -1;
316-
ASSERT_EQ(SQL_SUCCESS,
317-
SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT, &timeout, 0, 0));
320+
ASSERT_EQ(SQL_SUCCESS, SQLGetConnectAttr(this->conn, SQL_ATTR_CONNECTION_TIMEOUT,
321+
&timeout, 0, nullptr));
318322
EXPECT_EQ(42, timeout);
319323
}
320324

321325
TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrLoginTimeoutValid) {
322326
// Check default value first
323327
SQLUINTEGER timeout = -1;
324328
ASSERT_EQ(SQL_SUCCESS,
325-
SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, 0));
329+
SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, nullptr));
326330
EXPECT_EQ(0, timeout);
327331

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

331335
timeout = -1;
332336
ASSERT_EQ(SQL_SUCCESS,
333-
SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, 0));
337+
SQLGetConnectAttr(this->conn, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, nullptr));
334338
EXPECT_EQ(42, timeout);
335339
}
336340

@@ -340,15 +344,15 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrPacketSizeValid) {
340344
// Check default value first
341345
SQLUINTEGER size = -1;
342346
ASSERT_EQ(SQL_SUCCESS,
343-
SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, 0));
347+
SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, nullptr));
344348
EXPECT_EQ(0, size);
345349

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

349353
size = -1;
350354
ASSERT_EQ(SQL_SUCCESS,
351-
SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, 0));
355+
SQLGetConnectAttr(this->conn, SQL_ATTR_PACKET_SIZE, &size, 0, nullptr));
352356
EXPECT_EQ(0, size);
353357

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

‎cpp/src/arrow/flight/sql/odbc/tests/connection_info_test.cc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,8 @@ TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDriverHdesc) {
166166

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

172173
// Free descriptor handle
@@ -194,7 +195,8 @@ TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDriverHlib) {
194195
TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDriverHstmt) {
195196
// Value returned from driver manager is the stmt address
196197
SQLHSTMT local_stmt = this->stmt;
197-
ASSERT_EQ(SQL_SUCCESS, SQLGetInfo(this->conn, SQL_DRIVER_HSTMT, &local_stmt, 0, 0));
198+
ASSERT_EQ(SQL_SUCCESS,
199+
SQLGetInfo(this->conn, SQL_DRIVER_HSTMT, &local_stmt, 0, nullptr));
198200
EXPECT_GT(local_stmt, static_cast<SQLHSTMT>(0));
199201
}
200202

‎cpp/src/arrow/flight/sql/odbc/tests/connection_test.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ TEST(SQLGetEnvAttr, TestSQLGetEnvAttrODBCVersion) {
117117
// Allocate an environment handle
118118
ASSERT_EQ(SQL_SUCCESS, SQLAllocEnv(&env));
119119

120-
ASSERT_EQ(SQL_SUCCESS, SQLGetEnvAttr(env, SQL_ATTR_ODBC_VERSION, &version, 0, 0));
120+
ASSERT_EQ(SQL_SUCCESS, SQLGetEnvAttr(env, SQL_ATTR_ODBC_VERSION, &version, 0, nullptr));
121121

122122
ASSERT_EQ(SQL_OV_ODBC2, version);
123123

@@ -155,7 +155,7 @@ TYPED_TEST(ConnectionTest, TestSQLGetEnvAttrOutputNTS) {
155155
SQLINTEGER output_nts;
156156

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

160160
ASSERT_EQ(SQL_TRUE, output_nts);
161161
}

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

Lines changed: 35 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ TYPED_TEST(ErrorsTest, TestSQLGetDiagFieldWForDescriptorFailureFromDriverManager
162162
// Allocate a descriptor using alloc handle
163163
ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_DESC, this->conn, &descriptor));
164164

165-
EXPECT_EQ(SQL_ERROR,
166-
SQLGetDescField(descriptor, 1, SQL_DESC_DATETIME_INTERVAL_CODE, 0, 0, 0));
165+
EXPECT_EQ(SQL_ERROR, SQLGetDescField(descriptor, 1, SQL_DESC_DATETIME_INTERVAL_CODE, 0,
166+
0, nullptr));
167167

168168
// Retrieve all supported header level and record level data
169169
SQLSMALLINT HEADER_LEVEL = 0;
@@ -228,8 +228,8 @@ TYPED_TEST(ErrorsTest, TestSQLGetDiagRecForDescriptorFailureFromDriverManager) {
228228
// Allocate a descriptor using alloc handle
229229
ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_DESC, this->conn, &descriptor));
230230

231-
EXPECT_EQ(SQL_ERROR,
232-
SQLGetDescField(descriptor, 1, SQL_DESC_DATETIME_INTERVAL_CODE, 0, 0, 0));
231+
EXPECT_EQ(SQL_ERROR, SQLGetDescField(descriptor, 1, SQL_DESC_DATETIME_INTERVAL_CODE, 0,
232+
0, nullptr));
233233

234234
SQLWCHAR sql_state[6];
235235
SQLINTEGER native_error;
@@ -301,25 +301,31 @@ TYPED_TEST(ErrorsTest, TestSQLGetDiagRecInputData) {
301301
message, kOdbcBufferSize, &message_length));
302302

303303
// Pass valid record number with null inputs
304-
EXPECT_EQ(SQL_NO_DATA, SQLGetDiagRec(SQL_HANDLE_DBC, this->conn, 1, 0, 0, 0, 0, 0));
304+
EXPECT_EQ(SQL_NO_DATA, SQLGetDiagRec(SQL_HANDLE_DBC, this->conn, 1, nullptr, nullptr,
305+
nullptr, 0, nullptr));
305306

306307
// Invalid handle
307-
EXPECT_EQ(SQL_INVALID_HANDLE, SQLGetDiagRec(0, 0, 0, 0, 0, 0, 0, 0));
308+
EXPECT_EQ(SQL_INVALID_HANDLE,
309+
SQLGetDiagRec(0, nullptr, 0, nullptr, nullptr, nullptr, 0, nullptr));
308310
}
309311

310312
TYPED_TEST(ErrorsTest, TestSQLErrorInputData) {
311313
// Test ODBC 2.0 API SQLError. Driver manager maps SQLError to SQLGetDiagRec.
312314
// SQLError does not post diagnostic records for itself.
313315

314316
// Pass valid handles with null inputs
315-
EXPECT_EQ(SQL_NO_DATA, SQLError(this->env, 0, 0, 0, 0, 0, 0, 0));
317+
EXPECT_EQ(SQL_NO_DATA,
318+
SQLError(this->env, nullptr, nullptr, nullptr, nullptr, nullptr, 0, nullptr));
316319

317-
EXPECT_EQ(SQL_NO_DATA, SQLError(0, this->conn, 0, 0, 0, 0, 0, 0));
320+
EXPECT_EQ(SQL_NO_DATA, SQLError(nullptr, this->conn, nullptr, nullptr, nullptr, nullptr,
321+
0, nullptr));
318322

319-
EXPECT_EQ(SQL_NO_DATA, SQLError(0, 0, this->stmt, 0, 0, 0, 0, 0));
323+
EXPECT_EQ(SQL_NO_DATA, SQLError(nullptr, nullptr, this->stmt, nullptr, nullptr, nullptr,
324+
0, nullptr));
320325

321326
// Invalid handle
322-
EXPECT_EQ(SQL_INVALID_HANDLE, SQLError(0, 0, 0, 0, 0, 0, 0, 0));
327+
EXPECT_EQ(SQL_INVALID_HANDLE,
328+
SQLError(nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, 0, nullptr));
323329
}
324330

325331
TYPED_TEST(ErrorsTest, TestSQLErrorEnvErrorFromDriverManager) {
@@ -336,8 +342,8 @@ TYPED_TEST(ErrorsTest, TestSQLErrorEnvErrorFromDriverManager) {
336342
SQLINTEGER native_error = 0;
337343
SQLWCHAR message[SQL_MAX_MESSAGE_LENGTH] = {0};
338344
SQLSMALLINT message_length = 0;
339-
ASSERT_EQ(SQL_SUCCESS, SQLError(this->env, 0, 0, sql_state, &native_error, message,
340-
SQL_MAX_MESSAGE_LENGTH, &message_length));
345+
ASSERT_EQ(SQL_SUCCESS, SQLError(this->env, nullptr, nullptr, sql_state, &native_error,
346+
message, SQL_MAX_MESSAGE_LENGTH, &message_length));
341347

342348
EXPECT_GT(message_length, 50);
343349

@@ -356,16 +362,16 @@ TYPED_TEST(ErrorsTest, TestSQLErrorConnError) {
356362
// DM passes 512 as buffer length to SQLError.
357363

358364
// Attempt to set unsupported attribute
359-
SQLRETURN ret = SQLGetConnectAttr(this->conn, SQL_ATTR_TXN_ISOLATION, 0, 0, 0);
365+
SQLRETURN ret = SQLGetConnectAttr(this->conn, SQL_ATTR_TXN_ISOLATION, 0, 0, nullptr);
360366

361367
ASSERT_EQ(SQL_ERROR, ret);
362368

363369
SQLWCHAR sql_state[6] = {0};
364370
SQLINTEGER native_error = 0;
365371
SQLWCHAR message[SQL_MAX_MESSAGE_LENGTH] = {0};
366372
SQLSMALLINT message_length = 0;
367-
ASSERT_EQ(SQL_SUCCESS, SQLError(0, this->conn, 0, sql_state, &native_error, message,
368-
SQL_MAX_MESSAGE_LENGTH, &message_length));
373+
ASSERT_EQ(SQL_SUCCESS, SQLError(nullptr, this->conn, nullptr, sql_state, &native_error,
374+
message, SQL_MAX_MESSAGE_LENGTH, &message_length));
369375

370376
EXPECT_GT(message_length, 60);
371377

@@ -393,8 +399,8 @@ TYPED_TEST(ErrorsTest, TestSQLErrorStmtError) {
393399
SQLINTEGER native_error = 0;
394400
SQLWCHAR message[SQL_MAX_MESSAGE_LENGTH] = {0};
395401
SQLSMALLINT message_length = 0;
396-
ASSERT_EQ(SQL_SUCCESS, SQLError(0, 0, this->stmt, sql_state, &native_error, message,
397-
SQL_MAX_MESSAGE_LENGTH, &message_length));
402+
ASSERT_EQ(SQL_SUCCESS, SQLError(nullptr, nullptr, this->stmt, sql_state, &native_error,
403+
message, SQL_MAX_MESSAGE_LENGTH, &message_length));
398404

399405
EXPECT_GT(message_length, 70);
400406

@@ -428,8 +434,8 @@ TYPED_TEST(ErrorsTest, TestSQLErrorStmtWarning) {
428434
SQLINTEGER native_error = 0;
429435
SQLWCHAR message[SQL_MAX_MESSAGE_LENGTH] = {0};
430436
SQLSMALLINT message_length = 0;
431-
ASSERT_EQ(SQL_SUCCESS, SQLError(0, 0, this->stmt, sql_state, &native_error, message,
432-
SQL_MAX_MESSAGE_LENGTH, &message_length));
437+
ASSERT_EQ(SQL_SUCCESS, SQLError(nullptr, nullptr, this->stmt, sql_state, &native_error,
438+
message, SQL_MAX_MESSAGE_LENGTH, &message_length));
433439

434440
EXPECT_GT(message_length, 50);
435441

@@ -455,8 +461,8 @@ TYPED_TEST(ErrorsOdbcV2Test, TestSQLErrorEnvErrorODBCVer2FromDriverManager) {
455461
SQLINTEGER native_error = 0;
456462
SQLWCHAR message[SQL_MAX_MESSAGE_LENGTH] = {0};
457463
SQLSMALLINT message_length = 0;
458-
ASSERT_EQ(SQL_SUCCESS, SQLError(this->env, 0, 0, sql_state, &native_error, message,
459-
SQL_MAX_MESSAGE_LENGTH, &message_length));
464+
ASSERT_EQ(SQL_SUCCESS, SQLError(this->env, nullptr, nullptr, sql_state, &native_error,
465+
message, SQL_MAX_MESSAGE_LENGTH, &message_length));
460466

461467
EXPECT_GT(message_length, 50);
462468

@@ -475,14 +481,15 @@ TYPED_TEST(ErrorsOdbcV2Test, TestSQLErrorConnErrorODBCVer2) {
475481
// DM passes 512 as buffer length to SQLError.
476482

477483
// Attempt to set unsupported attribute
478-
ASSERT_EQ(SQL_ERROR, SQLGetConnectAttr(this->conn, SQL_ATTR_TXN_ISOLATION, 0, 0, 0));
484+
ASSERT_EQ(SQL_ERROR,
485+
SQLGetConnectAttr(this->conn, SQL_ATTR_TXN_ISOLATION, 0, 0, nullptr));
479486

480487
SQLWCHAR sql_state[6] = {0};
481488
SQLINTEGER native_error = 0;
482489
SQLWCHAR message[SQL_MAX_MESSAGE_LENGTH] = {0};
483490
SQLSMALLINT message_length = 0;
484-
ASSERT_EQ(SQL_SUCCESS, SQLError(0, this->conn, 0, sql_state, &native_error, message,
485-
SQL_MAX_MESSAGE_LENGTH, &message_length));
491+
ASSERT_EQ(SQL_SUCCESS, SQLError(nullptr, this->conn, nullptr, sql_state, &native_error,
492+
message, SQL_MAX_MESSAGE_LENGTH, &message_length));
486493

487494
EXPECT_GT(message_length, 60);
488495

@@ -510,8 +517,8 @@ TYPED_TEST(ErrorsOdbcV2Test, TestSQLErrorStmtErrorODBCVer2) {
510517
SQLINTEGER native_error = 0;
511518
SQLWCHAR message[SQL_MAX_MESSAGE_LENGTH] = {0};
512519
SQLSMALLINT message_length = 0;
513-
ASSERT_EQ(SQL_SUCCESS, SQLError(0, 0, this->stmt, sql_state, &native_error, message,
514-
SQL_MAX_MESSAGE_LENGTH, &message_length));
520+
ASSERT_EQ(SQL_SUCCESS, SQLError(nullptr, nullptr, this->stmt, sql_state, &native_error,
521+
message, SQL_MAX_MESSAGE_LENGTH, &message_length));
515522

516523
EXPECT_GT(message_length, 70);
517524

@@ -546,8 +553,8 @@ TYPED_TEST(ErrorsOdbcV2Test, TestSQLErrorStmtWarningODBCVer2) {
546553
SQLINTEGER native_error = 0;
547554
SQLWCHAR message[SQL_MAX_MESSAGE_LENGTH] = {0};
548555
SQLSMALLINT message_length = 0;
549-
ASSERT_EQ(SQL_SUCCESS, SQLError(0, 0, this->stmt, sql_state, &native_error, message,
550-
SQL_MAX_MESSAGE_LENGTH, &message_length));
556+
ASSERT_EQ(SQL_SUCCESS, SQLError(nullptr, nullptr, this->stmt, sql_state, &native_error,
557+
message, SQL_MAX_MESSAGE_LENGTH, &message_length));
551558

552559
EXPECT_GT(message_length, 50);
553560

0 commit comments

Comments
 (0)