Implement system_dsn for Mac

Author: justing-bq

cpp/src/arrow/flight/sql/odbc/odbc_impl/CMakeLists.txt

@@ -109,6 +109,8 @@ add_library(arrow_odbc_spi_impl
             types.h
             type_fwd.h
             type_utilities.h
+            system_dsn.cc
+            system_dsn.h
             util.cc
             util.h)
 target_compile_definitions(arrow_odbc_spi_impl PUBLIC UNICODE)
@@ -125,9 +127,7 @@ if(WIN32)
                          ui/dsn_configuration_window.h
                          ui/window.cc
                          ui/window.h
-                         win_system_dsn.cc
-                         system_dsn.cc
-                         system_dsn.h)
+                         win_system_dsn.cc)
 endif()
 
 if(APPLE)

cpp/src/arrow/flight/sql/odbc/odbc_impl/system_dsn.cc

@@ -17,23 +17,19 @@
 
 #include "arrow/flight/sql/odbc/odbc_impl/system_dsn.h"
 
-#include "arrow/flight/sql/odbc/odbc_impl/config/configuration.h"
-#include "arrow/flight/sql/odbc/odbc_impl/flight_sql_connection.h"
-#include "arrow/flight/sql/odbc/odbc_impl/ui/dsn_configuration_window.h"
-#include "arrow/flight/sql/odbc/odbc_impl/ui/window.h"
-#include "arrow/flight/sql/odbc/odbc_impl/util.h"
 #include "arrow/result.h"
 #include "arrow/util/utf8.h"
 
-#include <odbcinst.h>
 #include <sstream>
 
 namespace arrow::flight::sql::odbc {
 
 using config::Configuration;
 
-void PostError(DWORD error_code, LPCWSTR error_msg) {
+void PostError(DWORD error_code, LPWSTR error_msg) {
+#if defined _WIN32
   MessageBox(NULL, error_msg, L"Error!", MB_ICONEXCLAMATION | MB_OK);
+#endif // _WIN32
   SQLPostInstallerError(error_code, error_msg);
 }
 
@@ -42,7 +38,7 @@ void PostArrowUtilError(arrow::Status error_status) {
   std::wstring werror_msg = arrow::util::UTF8ToWideString(error_msg).ValueOr(
       L"Error during utf8 to wide string conversion");
 
-  PostError(ODBC_ERROR_GENERAL_ERR, werror_msg.c_str());
+  PostError(ODBC_ERROR_GENERAL_ERR, (LPWSTR)werror_msg.c_str());
 }
 
 void PostLastInstallerError() {
@@ -55,7 +51,7 @@ void PostLastInstallerError() {
   buf << L"Message: \"" << msg << L"\", Code: " << code;
   std::wstring error_msg = buf.str();
 
-  PostError(code, error_msg.c_str());
+  PostError(code, (LPWSTR)error_msg.c_str());
 }
 
 /**

cpp/src/arrow/flight/sql/odbc/odbc_impl/system_dsn.h

@@ -19,8 +19,11 @@
 #include "arrow/flight/sql/odbc/odbc_impl/platform.h"
 
 #include "arrow/flight/sql/odbc/odbc_impl/config/configuration.h"
+#include "arrow/flight/sql/odbc/odbc_impl/flight_sql_connection.h"
 #include "arrow/status.h"
 
+#include <odbcinst.h>
+
 namespace arrow::flight::sql::odbc {
 
 #if defined _WIN32
@@ -64,7 +67,7 @@ bool RegisterDsn(const config::Configuration& config, LPCWSTR driver);
  */
 bool UnregisterDsn(const std::wstring& dsn);
 
-void PostError(DWORD error_code, LPCWSTR error_msg);
+void PostError(DWORD error_code, LPWSTR error_msg);
 
 void PostArrowUtilError(arrow::Status error_status);
 }  // namespace arrow::flight::sql::odbc

cpp/src/arrow/flight/sql/odbc/odbc_impl/win_system_dsn.cc

@@ -144,7 +144,7 @@ BOOL INSTAPI ConfigDSNW(HWND hwnd_parent, WORD req, LPCWSTR wdriver,
         std::wstring werror_msg =
             arrow::util::UTF8ToWideString(error_msg).ValueOr(L"Error during DSN load");
 
-        PostError(err.GetNativeError(), werror_msg.c_str());
+        PostError(err.GetNativeError(), (LPWSTR)werror_msg.c_str());
         return FALSE;
       }
 

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

@@ -248,7 +248,6 @@ TYPED_TEST(ConnectionHandleTest, TestSQLDriverConnect) {
       << GetOdbcErrorMessage(SQL_HANDLE_DBC, this->conn);
 }
 
-#if defined _WIN32
 TYPED_TEST(ConnectionHandleTest, TestSQLDriverConnectDsn) {
   // Connect string
   std::string connect_str = this->GetConnectionString();
@@ -432,8 +431,6 @@ TEST_F(ConnectionRemoteTest, TestSQLConnectDSNPrecedence) {
       << GetOdbcErrorMessage(SQL_HANDLE_DBC, conn);
 }
 
-#endif  // _WIN32
-
 TEST_F(ConnectionRemoteTest, TestSQLDriverConnectInvalidUid) {
   // Invalid connect string
   std::string connect_str = GetInvalidConnectionString();

cpp/src/arrow/flight/sql/odbc/tests/odbc_test_suite.cc

@@ -463,9 +463,6 @@ std::string GetOdbcErrorMessage(SQLSMALLINT handle_type, SQLHANDLE handle) {
   return res;
 }
 
-// GH-47822 TODO: once RegisterDsn is implemented in Mac and Linux, the following can be
-// re-enabled.
-#if defined _WIN32
 bool WriteDSN(std::string connection_str) {
   Connection::ConnPropertyMap properties;
 
@@ -490,7 +487,6 @@ bool WriteDSN(Connection::ConnPropertyMap properties) {
   std::wstring w_driver = arrow::util::UTF8ToWideString(driver).ValueOr(L"");
   return RegisterDsn(config, w_driver.c_str());
 }
-#endif
 
 std::wstring GetStringColumnW(SQLHSTMT stmt, int col_id) {
   SQLWCHAR buf[1024];