Skip to content

Use C++ 20 standard #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alinaliBQ merged 4 commits into from
Jul 28, 2025
Merged

Use C++ 20 standard #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
585adb8
Add support for building with C++20
alinaliBQ Jul 24, 2025
f8da1d3
Upgrade spdlogs version
alinaliBQ Jul 24, 2025
aca03ae
Fix issue of missing unique_ptr definition
alinaliBQ Jul 24, 2025
b6bc9df
Trigger CI using empty commit
alinaliBQ Jul 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion cpp/src/arrow/flight/sql/odbc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
# specific language governing permissions and limitations
# under the License.

# Use C++ 20 for ODBC and its subdirectory
# GH-44792: Arrow will switch to C++ 20
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

add_custom_target(arrow_flight_sql_odbc)

# Ensure fmt is loaded as header only
Expand All @@ -36,7 +41,7 @@ add_definitions(-DUNICODE=1)

include(FetchContent)
fetchcontent_declare(spdlog
URL https://github.com/gabime/spdlog/archive/76fb40d95455f249bd70824ecfcae7a8f0930fa3.zip
URL https://github.com/gabime/spdlog/archive/refs/tags/v1.15.3.zip
CONFIGURE_COMMAND
""
BUILD_COMMAND
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/flight/sql/odbc/flight_sql/ui/dsn_configuration_window.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ int DsnConfigurationWindow::CreateEncryptionSettingsGroup(int posX, int posY, in
rightCheckPosX, rowPos - 2, 20, 2 * ROW_HEIGHT, L"",
ChildId::DISABLE_CERT_VERIFICATION_CHECKBOX, disableCertVerification);

rowPos += INTERVAL + static_cast<int>(1.5 * ROW_HEIGHT);
rowPos += INTERVAL + static_cast<int>(1.5 * static_cast<int>(ROW_HEIGHT));

encryptionSettingsGroupBox =
CreateGroupBox(posX, posY, sizeX, rowPos - posY, L"Encryption settings",
Expand Down
1 change: 1 addition & 0 deletions cpp/src/arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/logger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#pragma once

#include <functional>
#include <memory>
#include <string>

#include <spdlog/fmt/fmt.h>
Expand Down
70 changes: 35 additions & 35 deletions cpp/src/arrow/flight/sql/odbc/tests/connection_info_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoBatchSupport) {
TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoDataSourceName) {
this->connect();

validate(this->conn, SQL_DATA_SOURCE_NAME, L"");
validate(this->conn, SQL_DATA_SOURCE_NAME, (SQLWCHAR*)L"");

this->disconnect();
}
Expand Down Expand Up @@ -255,23 +255,23 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoDriverHstmt) {
TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoDriverName) {
this->connect();

validate(this->conn, SQL_DRIVER_NAME, L"Arrow Flight ODBC Driver");
validate(this->conn, SQL_DRIVER_NAME, (SQLWCHAR*)L"Arrow Flight ODBC Driver");

this->disconnect();
}

TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoDriverOdbcVer) {
this->connect();

validate(this->conn, SQL_DRIVER_ODBC_VER, L"03.80");
validate(this->conn, SQL_DRIVER_ODBC_VER, (SQLWCHAR*)L"03.80");

this->disconnect();
}

TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoDriverVer) {
this->connect();

validate(this->conn, SQL_DRIVER_VER, L"00.09.0000.0");
validate(this->conn, SQL_DRIVER_VER, (SQLWCHAR*)L"00.09.0000.0");

this->disconnect();
}
Expand Down Expand Up @@ -403,7 +403,7 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoOdbcVer) {
// This is implemented only in the Driver Manager.
this->connect();

validate(this->conn, SQL_ODBC_VER, L"03.80.0000");
validate(this->conn, SQL_ODBC_VER, (SQLWCHAR*)L"03.80.0000");

this->disconnect();
}
Expand All @@ -429,15 +429,15 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoParamArraySelects) {
TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoRowUpdates) {
this->connect();

validate(this->conn, SQL_ROW_UPDATES, L"N");
validate(this->conn, SQL_ROW_UPDATES, (SQLWCHAR*)L"N");

this->disconnect();
}

TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoSearchPatternEscape) {
this->connect();

validate(this->conn, SQL_SEARCH_PATTERN_ESCAPE, L"\\");
validate(this->conn, SQL_SEARCH_PATTERN_ESCAPE, (SQLWCHAR*)L"\\");

this->disconnect();
}
Expand Down Expand Up @@ -471,7 +471,7 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoStaticCursorAttributes2) {
TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoDatabaseName) {
this->connect();

validate(this->conn, SQL_DATABASE_NAME, L"");
validate(this->conn, SQL_DATABASE_NAME, (SQLWCHAR*)L"");

this->disconnect();
}
Expand All @@ -497,15 +497,15 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoDbmsVer) {
TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoAccessibleProcedures) {
this->connect();

validate(this->conn, SQL_ACCESSIBLE_PROCEDURES, L"N");
validate(this->conn, SQL_ACCESSIBLE_PROCEDURES, (SQLWCHAR*)L"N");

this->disconnect();
}

TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoAccessibleTables) {
this->connect();

validate(this->conn, SQL_ACCESSIBLE_TABLES, L"Y");
validate(this->conn, SQL_ACCESSIBLE_TABLES, (SQLWCHAR*)L"Y");

this->disconnect();
}
Expand All @@ -521,15 +521,15 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoBookmarkPersistence) {
TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoCatalogTerm) {
this->connect();

validate(this->conn, SQL_CATALOG_TERM, L"");
validate(this->conn, SQL_CATALOG_TERM, (SQLWCHAR*)L"");

this->disconnect();
}

TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoCollationSeq) {
this->connect();

validate(this->conn, SQL_COLLATION_SEQ, L"");
validate(this->conn, SQL_COLLATION_SEQ, (SQLWCHAR*)L"");

this->disconnect();
}
Expand Down Expand Up @@ -571,7 +571,7 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoCursorSensitivity) {
TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoDataSourceReadOnly) {
this->connect();

validate(this->conn, SQL_DATA_SOURCE_READ_ONLY, L"N");
validate(this->conn, SQL_DATA_SOURCE_READ_ONLY, (SQLWCHAR*)L"N");

this->disconnect();
}
Expand All @@ -587,31 +587,31 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoDefaultTxnIsolation) {
TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoDescribeParameter) {
this->connect();

validate(this->conn, SQL_DESCRIBE_PARAMETER, L"N");
validate(this->conn, SQL_DESCRIBE_PARAMETER, (SQLWCHAR*)L"N");

this->disconnect();
}

TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoMultResultSets) {
this->connect();

validate(this->conn, SQL_MULT_RESULT_SETS, L"N");
validate(this->conn, SQL_MULT_RESULT_SETS, (SQLWCHAR*)L"N");

this->disconnect();
}

TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoMultipleActiveTxn) {
this->connect();

validate(this->conn, SQL_MULTIPLE_ACTIVE_TXN, L"N");
validate(this->conn, SQL_MULTIPLE_ACTIVE_TXN, (SQLWCHAR*)L"N");

this->disconnect();
}

TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoNeedLongDataLen) {
this->connect();

validate(this->conn, SQL_NEED_LONG_DATA_LEN, L"N");
validate(this->conn, SQL_NEED_LONG_DATA_LEN, (SQLWCHAR*)L"N");

this->disconnect();
}
Expand All @@ -627,15 +627,15 @@ TEST_F(FlightSQLODBCMockTestBase, TestSQLGetInfoNullCollation) {
TEST_F(FlightSQLODBCMockTestBase, TestSQLGetInfoProcedureTerm) {
this->connect();

validate(this->conn, SQL_PROCEDURE_TERM, L"");
validate(this->conn, SQL_PROCEDURE_TERM, (SQLWCHAR*)L"");

this->disconnect();
}

TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoSchemaTerm) {
this->connect();

validate(this->conn, SQL_SCHEMA_TERM, L"schema");
validate(this->conn, SQL_SCHEMA_TERM, (SQLWCHAR*)L"schema");

this->disconnect();
}
Expand All @@ -651,7 +651,7 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoScrollOptions) {
TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoTableTerm) {
this->connect();

validate(this->conn, SQL_TABLE_TERM, L"table");
validate(this->conn, SQL_TABLE_TERM, (SQLWCHAR*)L"table");

this->disconnect();
}
Expand All @@ -675,7 +675,7 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoTxnIsolationOption) {
TEST_F(FlightSQLODBCMockTestBase, TestSQLGetInfoUserName) {
this->connect();

validate(this->conn, SQL_USER_NAME, L"");
validate(this->conn, SQL_USER_NAME, (SQLWCHAR*)L"");

this->disconnect();
}
Expand Down Expand Up @@ -726,7 +726,7 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoAnsiSqlDatetimeLiterals) {
this->connect();

// Type does not exist in sql.h
// validate(this->conn, SQL_ANSI_SQL_DATETIME_LITERALS, L"");
// validate(this->conn, SQL_ANSI_SQL_DATETIME_LITERALS, (SQLWCHAR*)L"");

this->disconnect();
}
Expand All @@ -742,15 +742,15 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoCatalogLocation) {
TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoCatalogName) {
this->connect();

validate(this->conn, SQL_CATALOG_NAME, L"N");
validate(this->conn, SQL_CATALOG_NAME, (SQLWCHAR*)L"N");

this->disconnect();
}

TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoCatalogNameSeparator) {
this->connect();

validate(this->conn, SQL_CATALOG_NAME_SEPARATOR, L"");
validate(this->conn, SQL_CATALOG_NAME_SEPARATOR, (SQLWCHAR*)L"");

this->disconnect();
}
Expand All @@ -766,7 +766,7 @@ TEST_F(FlightSQLODBCMockTestBase, TestSQLGetInfoCatalogUsage) {
TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoColumnAlias) {
this->connect();

validate(this->conn, SQL_COLUMN_ALIAS, L"Y");
validate(this->conn, SQL_COLUMN_ALIAS, (SQLWCHAR*)L"Y");

this->disconnect();
}
Expand Down Expand Up @@ -910,7 +910,7 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoDropView) {
TEST_F(FlightSQLODBCMockTestBase, TestSQLGetInfoExpressionsInOrderby) {
this->connect();

validate(this->conn, SQL_EXPRESSIONS_IN_ORDERBY, L"N");
validate(this->conn, SQL_EXPRESSIONS_IN_ORDERBY, (SQLWCHAR*)L"N");

this->disconnect();
}
Expand All @@ -935,7 +935,7 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoIdentifierCase) {
TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoIdentifierQuoteChar) {
this->connect();

validate(this->conn, SQL_IDENTIFIER_QUOTE_CHAR, L"\"");
validate(this->conn, SQL_IDENTIFIER_QUOTE_CHAR, (SQLWCHAR*)L"\"");

this->disconnect();
}
Expand All @@ -961,7 +961,7 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoInsertStatement) {
TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoIntegrity) {
this->connect();

validate(this->conn, SQL_INTEGRITY, L"N");
validate(this->conn, SQL_INTEGRITY, (SQLWCHAR*)L"N");

this->disconnect();
}
Expand All @@ -977,7 +977,7 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoKeywords) {
TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoLikeEscapeClause) {
this->connect();

validate(this->conn, SQL_LIKE_ESCAPE_CLAUSE, L"Y");
validate(this->conn, SQL_LIKE_ESCAPE_CLAUSE, (SQLWCHAR*)L"Y");

this->disconnect();
}
Expand All @@ -1002,23 +1002,23 @@ TEST_F(FlightSQLODBCMockTestBase, TestSQLGetInfoOjCapabilities) {
TEST_F(FlightSQLODBCMockTestBase, TestSQLGetInfoOrderByColumnsInSelect) {
this->connect();

validate(this->conn, SQL_ORDER_BY_COLUMNS_IN_SELECT, L"Y");
validate(this->conn, SQL_ORDER_BY_COLUMNS_IN_SELECT, (SQLWCHAR*)L"Y");

this->disconnect();
}

TEST_F(FlightSQLODBCMockTestBase, TestSQLGetInfoOuterJoins) {
this->connect();

validate(this->conn, SQL_OUTER_JOINS, L"N");
validate(this->conn, SQL_OUTER_JOINS, (SQLWCHAR*)L"N");

this->disconnect();
}

TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoProcedures) {
this->connect();

validate(this->conn, SQL_PROCEDURES, L"N");
validate(this->conn, SQL_PROCEDURES, (SQLWCHAR*)L"N");

this->disconnect();
}
Expand All @@ -1043,7 +1043,7 @@ TEST_F(FlightSQLODBCMockTestBase, TestSQLGetInfoSchemaUsage) {
TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoSpecialCharacters) {
this->connect();

validate(this->conn, SQL_SPECIAL_CHARACTERS, L"");
validate(this->conn, SQL_SPECIAL_CHARACTERS, (SQLWCHAR*)L"");

this->disconnect();
}
Expand Down Expand Up @@ -1184,15 +1184,15 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoMaxProcedureNameLen) {
TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoMaxRowSize) {
this->connect();

validate(this->conn, SQL_MAX_ROW_SIZE, L"");
validate(this->conn, SQL_MAX_ROW_SIZE, (SQLWCHAR*)L"");

this->disconnect();
}

TEST_F(FlightSQLODBCMockTestBase, TestSQLGetInfoMaxRowSizeIncludesLong) {
this->connect();

validate(this->conn, SQL_MAX_ROW_SIZE_INCLUDES_LONG, L"N");
validate(this->conn, SQL_MAX_ROW_SIZE_INCLUDES_LONG, (SQLWCHAR*)L"N");

this->disconnect();
}
Expand Down
Loading