@@ -146,23 +146,25 @@ TYPED_TEST(ConnectionAttributeTest, TestSQLSetConnectAttrTxnIsolationUnsupported
146146TYPED_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
154155TYPED_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
162163TYPED_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
191193TYPED_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
198200TYPED_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,
219221TYPED_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) {
228230TYPED_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
237239TYPED_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
245247TYPED_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
252254TYPED_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
258261TYPED_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
265268TYPED_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
272275TYPED_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) {
305309TYPED_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
321325TYPED_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
0 commit comments