Skip to content

Disable DSN default values on macOS #158

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 2 commits into from
Feb 25, 2026
Merged

Disable DSN default values on macOS #158

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31eff6c
Remove DSN default values on macOS
alinaliBQ Feb 24, 2026
2275022
Work on Justin's comment
alinaliBQ Feb 24, 2026
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
18 changes: 16 additions & 2 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/config/configuration.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,16 +130,30 @@ void Configuration::LoadDsn(const std::string& dsn) {
Set(FlightSqlConnection::TOKEN, ReadDsnString(dsn, FlightSqlConnection::TOKEN));
Set(FlightSqlConnection::UID, ReadDsnString(dsn, FlightSqlConnection::UID));
Set(FlightSqlConnection::PWD, ReadDsnString(dsn, FlightSqlConnection::PWD));
Set(FlightSqlConnection::USE_ENCRYPTION,
ReadDsnString(dsn, FlightSqlConnection::USE_ENCRYPTION, DEFAULT_ENABLE_ENCRYPTION));
Set(FlightSqlConnection::TRUSTED_CERTS,
ReadDsnString(dsn, FlightSqlConnection::TRUSTED_CERTS));

#ifndef __APPLE__

@justing-bq justing-bq Feb 24, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it makes more sense to do the #ifdef APPLE first and let windows and linux be covered by #else rather than the other way around. It is more consistent with the rest of the code.

@alinaliBQ alinaliBQ Feb 24, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup good point, I have addressed your comment

// Windows and Linux
Set(FlightSqlConnection::USE_ENCRYPTION,
ReadDsnString(dsn, FlightSqlConnection::USE_ENCRYPTION, DEFAULT_ENABLE_ENCRYPTION));
Set(FlightSqlConnection::USE_SYSTEM_TRUST_STORE,
ReadDsnString(dsn, FlightSqlConnection::USE_SYSTEM_TRUST_STORE,
DEFAULT_USE_CERT_STORE));
Set(FlightSqlConnection::DISABLE_CERTIFICATE_VERIFICATION,
ReadDsnString(dsn, FlightSqlConnection::DISABLE_CERTIFICATE_VERIFICATION,
DEFAULT_DISABLE_CERT_VERIFICATION));
#else
// macOS iODBC treats non-empty defaults as the real values when reading from system
// DSN, so we don't pass defaults on macOS.
// GH-49387 TODO: enable default values on macOS
Set(FlightSqlConnection::USE_ENCRYPTION,
ReadDsnString(dsn, FlightSqlConnection::USE_ENCRYPTION));
Set(FlightSqlConnection::USE_SYSTEM_TRUST_STORE,
ReadDsnString(dsn, FlightSqlConnection::USE_SYSTEM_TRUST_STORE));
Set(FlightSqlConnection::DISABLE_CERTIFICATE_VERIFICATION,
ReadDsnString(dsn, FlightSqlConnection::DISABLE_CERTIFICATE_VERIFICATION));
#endif

auto customKeys = ReadAllKeys(dsn);
RemoveAllKnownKeys(customKeys);
Expand Down
Loading