@@ -364,6 +364,7 @@ void GetSQLColAttributeNumeric(SQLHSTMT stmt, const std::wstring& wsql, SQLUSMAL
364364 SQLColAttribute (stmt, idx, field_identifier, 0 , 0 , nullptr , value));
365365}
366366
367+ #ifndef __APPLE__
367368void GetSQLColAttributesNumeric (SQLHSTMT stmt, const std::wstring& wsql, SQLUSMALLINT idx,
368369 SQLUSMALLINT field_identifier, SQLLEN * value) {
369370 // Execute query and check SQLColAttribute numeric attribute
@@ -377,7 +378,7 @@ void GetSQLColAttributesNumeric(SQLHSTMT stmt, const std::wstring& wsql, SQLUSMA
377378 ASSERT_EQ (SQL_SUCCESS ,
378379 SQLColAttributes (stmt, idx, field_identifier, 0 , 0 , nullptr , value));
379380}
380-
381+ # endif // __APPLE__
381382} // namespace
382383
383384TYPED_TEST (ColumnsTest, SQLColumnsTestInputData) {
@@ -488,7 +489,7 @@ TEST_F(ColumnsMockTest, TestSQLColumnsAllColumns) {
488489 std::wstring (L" YES" )); // expected_is_nullable
489490
490491 // Check 4th Column
491- ASSERT_EQ (SQL_SUCCESS , SQLFetch (this ->stmt ));
492+ EXPECT_EQ (SQL_SUCCESS , SQLFetch (this ->stmt ));
492493
493494 CheckMockSQLColumns (this ->stmt ,
494495 std::wstring (L" main" ), // expected_catalog
@@ -1387,7 +1388,8 @@ TEST_F(ColumnsMockTest, TestSQLColAttributeAllTypes) {
13871388 SQL_FALSE ); // expected_unsigned_column
13881389}
13891390
1390- TEST_F (ColumnsOdbcV2MockTest, TestSQLColAttributesAllTypesODBCVer2) {
1391+ #ifndef __APPLE__
1392+ TEST_F (ColumnsOdbcV2MockTest, TestSQLColAttributesAllTypes) {
13911393 // Tests ODBC 2.0 API SQLColAttributes
13921394 this ->CreateTableAllDataType ();
13931395
@@ -1446,6 +1448,7 @@ TEST_F(ColumnsOdbcV2MockTest, TestSQLColAttributesAllTypesODBCVer2) {
14461448 SQL_PRED_NONE , // expected_searchable
14471449 SQL_FALSE ); // expected_unsigned_column
14481450}
1451+ #endif // __APPLE__
14491452
14501453TEST_F (ColumnsRemoteTest, TestSQLColAttributeAllTypes) {
14511454 // Test assumes there is a table $scratch.ODBCTest in remote server
@@ -1910,6 +1913,7 @@ TYPED_TEST(ColumnsTest, TestSQLColAttributeCaseSensitive) {
19101913 ASSERT_EQ (SQL_FALSE , value);
19111914}
19121915
1916+ #ifndef __APPLE__
19131917TYPED_TEST (ColumnsOdbcV2Test, TestSQLColAttributesCaseSensitive) {
19141918 // Arrow limitation: returns SQL_FALSE for case sensitive column
19151919 // Tests ODBC 2.0 API SQLColAttributes
@@ -1924,6 +1928,7 @@ TYPED_TEST(ColumnsOdbcV2Test, TestSQLColAttributesCaseSensitive) {
19241928 GetSQLColAttributesNumeric (this ->stmt , wsql, 28 , SQL_COLUMN_CASE_SENSITIVE , &value);
19251929 ASSERT_EQ (SQL_FALSE , value);
19261930}
1931+ #endif // __APPLE__
19271932
19281933TEST_F (ColumnsMockTest, TestSQLColAttributeUniqueValue) {
19291934 // Mock server limitation: returns false for auto-increment column
@@ -1935,6 +1940,7 @@ TEST_F(ColumnsMockTest, TestSQLColAttributeUniqueValue) {
19351940 ASSERT_EQ (SQL_FALSE , value);
19361941}
19371942
1943+ #ifndef __APPLE__
19381944TEST_F (ColumnsOdbcV2MockTest, TestSQLColAttributesAutoIncrement) {
19391945 // Tests ODBC 2.0 API SQLColAttributes
19401946 // Mock server limitation: returns false for auto-increment column
@@ -1945,6 +1951,7 @@ TEST_F(ColumnsOdbcV2MockTest, TestSQLColAttributesAutoIncrement) {
19451951 GetSQLColAttributeNumeric (this ->stmt , wsql, 1 , SQL_COLUMN_AUTO_INCREMENT , &value);
19461952 ASSERT_EQ (SQL_FALSE , value);
19471953}
1954+ #endif // __APPLE__
19481955
19491956TEST_F (ColumnsMockTest, TestSQLColAttributeBaseTableName) {
19501957 this ->CreateTableAllDataType ();
@@ -1955,6 +1962,7 @@ TEST_F(ColumnsMockTest, TestSQLColAttributeBaseTableName) {
19551962 ASSERT_EQ (std::wstring (L" AllTypesTable" ), value);
19561963}
19571964
1965+ #ifndef __APPLE__
19581966TEST_F (ColumnsOdbcV2MockTest, TestSQLColAttributesTableName) {
19591967 // Tests ODBC 2.0 API SQLColAttributes
19601968 this ->CreateTableAllDataType ();
@@ -1964,6 +1972,7 @@ TEST_F(ColumnsOdbcV2MockTest, TestSQLColAttributesTableName) {
19641972 GetSQLColAttributesString (this ->stmt , wsql, 1 , SQL_COLUMN_TABLE_NAME , value);
19651973 ASSERT_EQ (std::wstring (L" AllTypesTable" ), value);
19661974}
1975+ #endif // __APPLE__
19671976
19681977TEST_F (ColumnsMockTest, TestSQLColAttributeCatalogName) {
19691978 // Mock server limitattion: mock doesn't return catalog for result metadata,
@@ -1985,6 +1994,7 @@ TEST_F(ColumnsRemoteTest, TestSQLColAttributeCatalogName) {
19851994 ASSERT_EQ (std::wstring (L" " ), value);
19861995}
19871996
1997+ #ifndef __APPLE__
19881998TEST_F (ColumnsOdbcV2MockTest, TestSQLColAttributesQualifierName) {
19891999 // Mock server limitattion: mock doesn't return catalog for result metadata,
19902000 // and the defautl catalog should be 'main'
@@ -2005,6 +2015,7 @@ TEST_F(ColumnsOdbcV2RemoteTest, TestSQLColAttributesQualifierName) {
20052015 GetSQLColAttributeString (this ->stmt , wsql, 1 , SQL_COLUMN_QUALIFIER_NAME , value);
20062016 ASSERT_EQ (std::wstring (L" " ), value);
20072017}
2018+ #endif // __APPLE__
20082019
20092020TYPED_TEST (ColumnsTest, TestSQLColAttributeCount) {
20102021 std::wstring wsql = this ->GetQueryAllDataTypes ();
@@ -2050,6 +2061,7 @@ TEST_F(ColumnsRemoteTest, TestSQLColAttributeSchemaName) {
20502061 ASSERT_EQ (std::wstring (L" " ), value);
20512062}
20522063
2064+ #ifndef __APPLE__
20532065TEST_F (ColumnsOdbcV2MockTest, TestSQLColAttributesOwnerName) {
20542066 // Tests ODBC 2.0 API SQLColAttributes
20552067 this ->CreateTableAllDataType ();
@@ -2071,6 +2083,7 @@ TEST_F(ColumnsOdbcV2RemoteTest, TestSQLColAttributesOwnerName) {
20712083 GetSQLColAttributesString (this ->stmt , wsql, 1 , SQL_COLUMN_OWNER_NAME , value);
20722084 ASSERT_EQ (std::wstring (L" " ), value);
20732085}
2086+ #endif // __APPLE__
20742087
20752088TEST_F (ColumnsMockTest, TestSQLColAttributeTableName) {
20762089 this ->CreateTableAllDataType ();
@@ -2119,6 +2132,7 @@ TEST_F(ColumnsRemoteTest, TestSQLColAttributeTypeName) {
21192132 ASSERT_EQ (std::wstring (L" TIMESTAMP" ), value);
21202133}
21212134
2135+ #ifndef __APPLE__
21222136TEST_F (ColumnsOdbcV2MockTest, TestSQLColAttributesTypeName) {
21232137 // Tests ODBC 2.0 API SQLColAttributes
21242138 this ->CreateTableAllDataType ();
@@ -2159,6 +2173,7 @@ TEST_F(ColumnsOdbcV2RemoteTest, TestSQLColAttributesTypeName) {
21592173 GetSQLColAttributesString (this ->stmt , L" " , 9 , SQL_COLUMN_TYPE_NAME , value);
21602174 ASSERT_EQ (std::wstring (L" TIMESTAMP" ), value);
21612175}
2176+ #endif // __APPLE__
21622177
21632178TYPED_TEST (ColumnsTest, TestSQLColAttributeUnnamed) {
21642179 std::wstring wsql = this ->GetQueryAllDataTypes ();
@@ -2175,6 +2190,7 @@ TYPED_TEST(ColumnsTest, TestSQLColAttributeUpdatable) {
21752190 ASSERT_EQ (SQL_ATTR_READWRITE_UNKNOWN , value);
21762191}
21772192
2193+ #ifndef __APPLE__
21782194TYPED_TEST (ColumnsOdbcV2Test, TestSQLColAttributesUpdatable) {
21792195 // Tests ODBC 2.0 API SQLColAttributes
21802196 std::wstring wsql = this ->GetQueryAllDataTypes ();
@@ -2183,6 +2199,7 @@ TYPED_TEST(ColumnsOdbcV2Test, TestSQLColAttributesUpdatable) {
21832199 GetSQLColAttributesNumeric (this ->stmt , wsql, 1 , SQL_COLUMN_UPDATABLE , &value);
21842200 ASSERT_EQ (SQL_ATTR_READWRITE_UNKNOWN , value);
21852201}
2202+ #endif // __APPLE__
21862203
21872204TEST_F (ColumnsMockTest, SQLDescribeColValidateInput) {
21882205 this ->CreateTestTables ();
0 commit comments