Build ODBC statically on macOS

.github/workflows/cpp_extra.yml

@@ -357,6 +357,10 @@ jobs:
       ARROW_BUILD_TESTS: ON
       ARROW_FLIGHT_SQL_ODBC: ON
       ARROW_HOME: /tmp/local
+      ARROW_DEPENDENCY_USE_SHARED: OFF
+      ARROW_DEPENDENCY_SOURCE: BUNDLED
+      ARROW_MIMALLOC: OFF
+      CMAKE_CXX_STANDARD: "20"
     steps:
       - name: Checkout Arrow
         uses: actions/checkout@v6.0.0
@@ -366,6 +370,19 @@ jobs:
       - name: Install Dependencies
         run: |
           brew bundle --file=cpp/Brewfile
+          # We want to use bundled RE2 for static linking. If
+          # Homebrew's RE2 is installed, its header file may be used.
+          # We uninstall Homebrew's RE2 to ensure using bundled RE2.
+          brew uninstall grpc || : # gRPC depends on RE2
+          brew uninstall grpc@1.54 || : # gRPC 1.54 may be installed too
+          brew uninstall re2
+          # We want to use bundled Protobuf for static linking. If
+          # Homebrew's Protobuf is installed, its library file may be
+          # used on test  We uninstall Homebrew's Protobuf to ensure using
+          # bundled Protobuf.
+          brew uninstall protobuf
+          # We want to use bundled Boost for static linking.
+          brew uninstall boost
       - name: Setup ccache
         run: |
           ci/scripts/ccache_setup.sh
@@ -427,6 +444,7 @@ jobs:
       CMAKE_INSTALL_PREFIX: /usr
       VCPKG_BINARY_SOURCES: 'clear;nugettimeout,600;nuget,GitHub,readwrite'
       VCPKG_DEFAULT_TRIPLET: x64-windows
+      CMAKE_CXX_STANDARD: "20"
     steps:
       - name: Disable Crash Dialogs
         run: |

cpp/cmake_modules/ThirdpartyToolchain.cmake

@@ -1107,6 +1107,11 @@ function(build_boost)
   else()
     list(APPEND BOOST_EXCLUDE_LIBRARIES uuid)
   endif()
+  if(ARROW_FLIGHT_SQL_ODBC)
+    list(APPEND BOOST_INCLUDE_LIBRARIES beast xpressive)
+  else()
+    list(APPEND BOOST_EXCLUDE_LIBRARIES beast xpressive)
+  endif()
   set(BOOST_SKIP_INSTALL_RULES ON)
   if(NOT ARROW_ENABLE_THREADING)
     set(BOOST_UUID_LINK_LIBATOMIC OFF)
@@ -3024,8 +3029,8 @@ function(build_cares)
   if(APPLE)
     # libresolv must be linked from c-ares version 1.16.1
     find_library(LIBRESOLV_LIBRARY NAMES resolv libresolv REQUIRED)
-    set_target_properties(c-ares::cares PROPERTIES INTERFACE_LINK_LIBRARIES
-                                                   "${LIBRESOLV_LIBRARY}")
+    set_target_properties(c-ares PROPERTIES INTERFACE_LINK_LIBRARIES
+                                            "${LIBRESOLV_LIBRARY}")
   endif()
 
   set(ARROW_BUNDLED_STATIC_LIBS

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

@@ -19,6 +19,11 @@
 # GH-44792: Arrow will switch to C++ 20
 set(CMAKE_CXX_STANDARD 20)
 
+if(APPLE)
+  # CMAKE_FIND_LIBRARY_SUFFIXES.
+  set(APPEND CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+endif()
+
 if(WIN32)
   if(MSVC_VERSION GREATER_EQUAL 1900)
     set(ODBCINST legacy_stdio_definitions odbccp32 shlwapi)
@@ -61,33 +66,55 @@ if(WIN32)
   list(APPEND ARROW_FLIGHT_SQL_ODBC_SRCS odbc.def install/versioninfo.rc)
 endif()
 
-add_arrow_lib(arrow_flight_sql_odbc
-              CMAKE_PACKAGE_NAME
-              ArrowFlightSqlOdbc
-              PKG_CONFIG_NAME
-              arrow-flight-sql-odbc
-              OUTPUTS
-              ARROW_FLIGHT_SQL_ODBC_LIBRARIES
-              SOURCES
-              ${ARROW_FLIGHT_SQL_ODBC_SRCS}
-              DEPENDENCIES
-              arrow_flight_sql
-              DEFINITIONS
-              UNICODE
-              SHARED_LINK_FLAGS
-              ${ARROW_VERSION_SCRIPT_FLAGS} # Defined in cpp/arrow/CMakeLists.txt
-              SHARED_LINK_LIBS
-              arrow_flight_sql_shared
-              SHARED_INSTALL_INTERFACE_LIBS
-              ArrowFlight::arrow_flight_sql_shared
-              STATIC_LINK_LIBS
-              arrow_flight_sql_static
-              STATIC_INSTALL_INTERFACE_LIBS
-              ArrowFlight::arrow_flight_sql_static
-              SHARED_PRIVATE_LINK_LIBS
-              ODBC::ODBC
-              ${ODBCINST}
-              arrow_odbc_spi_impl)
+# On Windows, dynmaic build for ODBC is supported.
+# On unix systems, static build for ODBC is supported, all libraries are linked statically on unix.
+if(WIN32)
+  add_arrow_lib(arrow_flight_sql_odbc
+                CMAKE_PACKAGE_NAME
+                ArrowFlightSqlOdbc
+                PKG_CONFIG_NAME
+                arrow-flight-sql-odbc
+                OUTPUTS
+                ARROW_FLIGHT_SQL_ODBC_LIBRARIES
+                SOURCES
+                ${ARROW_FLIGHT_SQL_ODBC_SRCS}
+                DEFINITIONS
+                UNICODE
+                SHARED_LINK_FLAGS
+                ${ARROW_VERSION_SCRIPT_FLAGS} # Defined in cpp/arrow/CMakeLists.txt
+                SHARED_LINK_LIBS
+                arrow_flight_sql_shared
+                arrow_odbc_spi_impl
+                SHARED_INSTALL_INTERFACE_LIBS
+                ArrowFlight::arrow_flight_sql_shared
+                STATIC_LINK_LIBS
+                arrow_flight_sql_static
+                STATIC_INSTALL_INTERFACE_LIBS
+                ArrowFlight::arrow_flight_sql_static
+                SHARED_PRIVATE_LINK_LIBS
+                ODBC::ODBC
+                ${ODBCINST})
+else()
+  # Unix
+  add_arrow_lib(arrow_flight_sql_odbc
+                CMAKE_PACKAGE_NAME
+                ArrowFlightSqlOdbc
+                PKG_CONFIG_NAME
+                arrow-flight-sql-odbc
+                OUTPUTS
+                ARROW_FLIGHT_SQL_ODBC_LIBRARIES
+                SOURCES
+                ${ARROW_FLIGHT_SQL_ODBC_SRCS}
+                DEFINITIONS
+                UNICODE
+                SHARED_LINK_FLAGS
+                ${ARROW_VERSION_SCRIPT_FLAGS} # Defined in cpp/arrow/CMakeLists.txt
+                STATIC_LINK_LIBS
+                ODBC::ODBC
+                ${ODBCINST}
+                SHARED_LINK_LIBS
+                arrow_odbc_spi_impl)
+endif()
 
 foreach(LIB_TARGET ${ARROW_FLIGHT_SQL_ODBC_LIBRARIES})
   target_compile_definitions(${LIB_TARGET} PRIVATE ARROW_FLIGHT_SQL_ODBC_EXPORTING)

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

@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_library(arrow_odbc_spi_impl
+add_library(arrow_odbc_spi_impl STATIC
             accessors/binary_array_accessor.cc
             accessors/binary_array_accessor.h
             accessors/boolean_array_accessor.cc
@@ -133,8 +133,11 @@ endif()
 if(APPLE)
   target_include_directories(arrow_odbc_spi_impl SYSTEM BEFORE PUBLIC ${ODBC_INCLUDE_DIR})
   target_link_libraries(arrow_odbc_spi_impl
-                        PUBLIC arrow_flight_sql_shared arrow_compute_shared Boost::locale
-                               iodbc)
+                        PUBLIC arrow_flight_sql_static
+                               arrow_compute_static
+                               Boost::locale
+                               Boost::headers
+                               RapidJSON)
 else()
   find_package(ODBC REQUIRED)
   target_include_directories(arrow_odbc_spi_impl PUBLIC ${ODBC_INCLUDE_DIR})
@@ -143,14 +146,6 @@ else()
                                ${ODBCINST})
 endif()
 
-set_target_properties(arrow_odbc_spi_impl
-                      PROPERTIES ARCHIVE_OUTPUT_DIRECTORY
-                                 ${CMAKE_BINARY_DIR}/$<CONFIG>/lib
-                                 LIBRARY_OUTPUT_DIRECTORY
-                                 ${CMAKE_BINARY_DIR}/$<CONFIG>/lib
-                                 RUNTIME_OUTPUT_DIRECTORY
-                                 ${CMAKE_BINARY_DIR}/$<CONFIG>/lib)
-
 # CLI
 add_executable(arrow_odbc_spi_impl_cli main.cc)
 set_target_properties(arrow_odbc_spi_impl_cli
@@ -159,6 +154,16 @@ set_target_properties(arrow_odbc_spi_impl_cli
 target_link_libraries(arrow_odbc_spi_impl_cli arrow_odbc_spi_impl)
 
 # Unit tests
+
+# On Windows, dynamic linking ODBC is supported.
+# On unix systems, static linking ODBC is supported, thus the library linking is static.
+if(WIN32)
+  set(ODBC_SPI_IMPL_TEST_LINK_LIBS arrow_flight_testing_shared)
+else()
+  # unix
+  set(ODBC_SPI_IMPL_TEST_LINK_LIBS arrow_flight_testing_static)
+endif()
+
 add_arrow_test(odbc_spi_impl_test
                SOURCES
                accessors/boolean_array_accessor_test.cc
@@ -177,4 +182,4 @@ add_arrow_test(odbc_spi_impl_test
                util_test.cc
                EXTRA_LINK_LIBS
                arrow_odbc_spi_impl
-               arrow_flight_testing_shared)
+               ${ODBC_SPI_IMPL_TEST_LINK_LIBS})

cpp/src/arrow/flight/sql/odbc/odbc_impl/config/connection_string_parser.h

@@ -19,7 +19,7 @@
 
 #include <string>
 
-#include "config/configuration.h"
+#include "arrow/flight/sql/odbc/odbc_impl/config/configuration.h"
 
 namespace arrow::flight::sql::odbc {
 namespace config {

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

@@ -30,7 +30,6 @@
 #include <sql.h>
 #include <sqlext.h>
 #include <sqltypes.h>
-#include <boost/variant.hpp>
 #include <optional>
 #include <utility>
 

cpp/src/arrow/flight/sql/odbc/odbc_impl/spi/connection.h

@@ -18,7 +18,6 @@
 #pragma once
 
 #include <boost/algorithm/string.hpp>
-#include <boost/variant.hpp>
 #include <functional>
 #include <map>
 #include <optional>

cpp/src/arrow/flight/sql/odbc/odbc_impl/ui/add_property_window.cc

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "ui/add_property_window.h"
+#include "arrow/flight/sql/odbc/odbc_impl/ui/add_property_window.h"
 
 #include <Windowsx.h>
 
@@ -25,8 +25,8 @@
 #include <commctrl.h>
 
 #include "arrow/flight/sql/odbc/odbc_impl/exceptions.h"
-#include "ui/custom_window.h"
-#include "ui/window.h"
+#include "arrow/flight/sql/odbc/odbc_impl/ui/custom_window.h"
+#include "arrow/flight/sql/odbc/odbc_impl/ui/window.h"
 
 namespace arrow::flight::sql::odbc {
 namespace config {

cpp/src/arrow/flight/sql/odbc/odbc_impl/ui/custom_window.cc

@@ -29,7 +29,7 @@
 #include <sstream>
 
 #include "arrow/flight/sql/odbc/odbc_impl/exceptions.h"
-#include "ui/custom_window.h"
+#include "arrow/flight/sql/odbc/odbc_impl/ui/custom_window.h"
 
 namespace arrow::flight::sql::odbc {
 namespace config {

cpp/src/arrow/flight/sql/odbc/odbc_impl/ui/custom_window.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "ui/window.h"
+#include "arrow/flight/sql/odbc/odbc_impl/ui/window.h"
 
 namespace arrow::flight::sql::odbc {
 namespace config {

cpp/src/arrow/flight/sql/odbc/odbc_impl/ui/dsn_configuration_window.h

@@ -17,8 +17,8 @@
 
 #pragma once
 
-#include "config/configuration.h"
-#include "ui/custom_window.h"
+#include "arrow/flight/sql/odbc/odbc_impl/config/configuration.h"
+#include "arrow/flight/sql/odbc/odbc_impl/ui/custom_window.h"
 
 namespace arrow::flight::sql::odbc {
 namespace config {

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

@@ -17,7 +17,6 @@
 
 #pragma once
 
-#include <boost/variant.hpp>
 #include <boost/xpressive/xpressive.hpp>
 
 #include <codecvt>

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

@@ -15,8 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_custom_target(tests)
-
 if(WIN32)
   include_directories(${ODBC_INCLUDE_DIRS})
 else()
@@ -33,29 +31,59 @@ set(ARROW_FLIGHT_SQL_MOCK_SERVER_SRCS
     ../../example/sqlite_server.cc
     ../../example/sqlite_tables_schema_batch_reader.cc)
 
-add_arrow_test(flight_sql_odbc_test
-               SOURCES
-               odbc_test_suite.cc
-               odbc_test_suite.h
-               columns_test.cc
-               connection_attr_test.cc
-               connection_info_test.cc
-               connection_test.cc
-               errors_test.cc
-               get_functions_test.cc
-               statement_attr_test.cc
-               statement_test.cc
-               tables_test.cc
-               type_info_test.cc
-               # Enable Protobuf cleanup after test execution
-               # GH-46889: move protobuf_test_util to a more common location
-               ../../../../engine/substrait/protobuf_test_util.cc
-               ${ARROW_FLIGHT_SQL_MOCK_SERVER_SRCS}
-               EXTRA_LINK_LIBS
-               ${ODBC_LIBRARIES}
-               ${ODBCINST}
-               ${SQLite3_LIBRARIES}
-               arrow_odbc_spi_impl)
+if(ARROW_TEST_LINKAGE STREQUAL "static")
+  set(ARROW_FLIGHT_SQL_ODBC_TEST_LINK_LIBS arrow_flight_sql_odbc_static
+                                           ${ARROW_TEST_STATIC_LINK_LIBS})
+else()
+  set(ARROW_FLIGHT_SQL_ODBC_TEST_LINK_LIBS arrow_flight_sql_odbc_shared
+                                           ${ARROW_TEST_SHARED_LINK_LIBS})
+endif()
+
+set(ARROW_FLIGHT_SQL_ODBC_TEST_SRCS
+    odbc_test_suite.cc
+    odbc_test_suite.h
+    columns_test.cc
+    connection_attr_test.cc
+    connection_info_test.cc
+    connection_test.cc
+    errors_test.cc
+    get_functions_test.cc
+    statement_attr_test.cc
+    statement_test.cc
+    tables_test.cc
+    type_info_test.cc
+    # Enable Protobuf cleanup after test execution
+    # GH-46889: move protobuf_test_util to a more common location
+    ../../../../engine/substrait/protobuf_test_util.cc)
+
+# On Windows, dynamic linking ODBC is supported, tests link libraries dynamically.
+# On unix systems, static linking ODBC is supported, thus tests link libraries statically.
+if(WIN32)
+  add_arrow_test(flight_sql_odbc_test
+                 SOURCES
+                 ${ARROW_FLIGHT_SQL_ODBC_TEST_SRCS}
+                 ${ARROW_FLIGHT_SQL_MOCK_SERVER_SRCS}
+                 DEFINITIONS
+                 UNICODE
+                 EXTRA_LINK_LIBS
+                 ${ODBC_LIBRARIES}
+                 ${ODBCINST}
+                 ${SQLite3_LIBRARIES}
+                 ${ARROW_FLIGHT_SQL_ODBC_TEST_LINK_LIBS})
+else()
+  # unix
+  add_arrow_test(flight_sql_odbc_test
+                 SOURCES
+                 ${ARROW_FLIGHT_SQL_ODBC_TEST_SRCS}
+                 ${ARROW_FLIGHT_SQL_MOCK_SERVER_SRCS}
+                 DEFINITIONS
+                 UNICODE
+                 STATIC_LINK_LIBS
+                 ${ODBC_LIBRARIES}
+                 ${ODBCINST}
+                 ${SQLite3_LIBRARIES}
+                 ${ARROW_FLIGHT_SQL_ODBC_TEST_LINK_LIBS})
+endif()
 
 # Disable unity build due to sqlite_sql_info.cc conflict with sql.h and sqlext.h headers.
 set_target_properties(arrow-flight-sql-odbc-test PROPERTIES UNITY_BUILD OFF)