testing

Author: amoeba

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

@@ -67,16 +67,27 @@ set(ARROW_FLIGHT_SQL_ODBC_SHARED_INSTALL_INTERFACE_LIBS "")
 set(ARROW_FLIGHT_SQL_ODBC_STATIC_INSTALL_INTERFACE_LIBS "")
 set(ARROW_FLIGHT_SQL_ODBC_SHARED_PRIVATE_LINK_LIBS "")
 
-if(WIN32 AND ARROW_BUILD_STATIC)
-  # Static Arrow deps on Windows — self-contained ODBC DLL
-  set(ARROW_FLIGHT_SQL_ODBC_SHARED_LINK_LIBS arrow_flight_sql_static arrow_odbc_spi_impl)
-  set(ARROW_FLIGHT_SQL_ODBC_STATIC_LINK_LIBS arrow_flight_sql_static)
-  list(APPEND ARROW_FLIGHT_SQL_ODBC_SHARED_INSTALL_INTERFACE_LIBS
-       ArrowFlight::arrow_flight_sql_static)
-  list(APPEND ARROW_FLIGHT_SQL_ODBC_STATIC_INSTALL_INTERFACE_LIBS
-       ArrowFlight::arrow_flight_sql_static)
+if(WIN32)
+  if(ARROW_BUILD_STATIC)
+    # Static Arrow deps on Windows — self-contained ODBC DLL
+    set(ARROW_FLIGHT_SQL_ODBC_SHARED_LINK_LIBS arrow_flight_sql_static arrow_odbc_spi_impl)
+    set(ARROW_FLIGHT_SQL_ODBC_STATIC_LINK_LIBS arrow_flight_sql_static)
+    list(APPEND ARROW_FLIGHT_SQL_ODBC_SHARED_INSTALL_INTERFACE_LIBS
+         ArrowFlight::arrow_flight_sql_static)
+    list(APPEND ARROW_FLIGHT_SQL_ODBC_STATIC_INSTALL_INTERFACE_LIBS
+         ArrowFlight::arrow_flight_sql_static)
+  else()
+    set(ARROW_FLIGHT_SQL_ODBC_SHARED_LINK_LIBS arrow_flight_sql_shared arrow_odbc_spi_impl)
+    set(ARROW_FLIGHT_SQL_ODBC_STATIC_LINK_LIBS arrow_flight_sql_static)
+    list(APPEND ARROW_FLIGHT_SQL_ODBC_SHARED_INSTALL_INTERFACE_LIBS
+         ArrowFlight::arrow_flight_sql_shared)
+    list(APPEND ARROW_FLIGHT_SQL_ODBC_STATIC_INSTALL_INTERFACE_LIBS
+         ArrowFlight::arrow_flight_sql_static)
+  endif()
   list(APPEND ARROW_FLIGHT_SQL_ODBC_SHARED_PRIVATE_LINK_LIBS ODBC::ODBC ${ODBCINST})
 else()
+  # Unix/macOS: driver dynamically links arrow_flight_sql so the driver and test
+  # binary share the same grpc/arrow_flight runtime.
   set(ARROW_FLIGHT_SQL_ODBC_SHARED_LINK_LIBS arrow_odbc_spi_impl)
   set(ARROW_FLIGHT_SQL_ODBC_STATIC_LINK_LIBS ODBC::ODBC ${ODBCINST})
 endif()

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

@@ -150,7 +150,6 @@ else()
                                arrow_compute_static
                                Boost::locale
                                Boost::headers
-                               Boost::variant
                                RapidJSON)
 
   if(NOT APPLE)

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

@@ -42,7 +42,7 @@ set(ARROW_FLIGHT_SQL_ODBC_TEST_SRCS
     # GH-46889: move protobuf_test_util to a more common location
     ../../../../engine/substrait/protobuf_test_util.cc)
 
-if(ARROW_FLIGHT_TEST_LINKAGE STREQUAL "static")
+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()
@@ -54,32 +54,27 @@ endif()
 set(ARROW_FLIGHT_SQL_ODBC_TEST_LIBS ${ODBCINST} ${ODBC_LIBRARIES} ${SQLite3_LIBRARIES})
 
 # On Windows, dynamic linking ODBC is supported, tests link libraries dynamically.
-# On unix systems, static linking ODBC is supported, thus tests link libraries statically.
+# On Windows with static Arrow, use STATIC_LINK_LIBS to avoid mixing static/shared.
+# On Unix/macOS, tests link libraries statically.
 set(ARROW_FLIGHT_SQL_ODBC_TEST_EXTRA_LINK_LIBS "")
 set(ARROW_FLIGHT_SQL_ODBC_TEST_STATIC_LINK_LIBS "")
 if(WIN32 AND ARROW_FLIGHT_TEST_LINKAGE STREQUAL "static")
   # Static Windows tests
-  list(APPEND
-       ARROW_FLIGHT_SQL_ODBC_TEST_STATIC_LINK_LIBS
+  list(APPEND ARROW_FLIGHT_SQL_ODBC_TEST_STATIC_LINK_LIBS
        arrow_odbc_spi_impl
        ${ARROW_FLIGHT_SQL_ODBC_TEST_LIBS}
-       ${ARROW_FLIGHT_SQL_ODBC_TEST_LINK_LIBS})
+       ${ARROW_FLIGHT_SQL_ODBC_TEST_LINK_LIBS}
+       ${ARROW_TEST_STATIC_LINK_LIBS})
 elseif(WIN32)
-  # Dynamic Windows tests (current behavior)
+  # Dynamic Windows tests
   list(APPEND ARROW_FLIGHT_SQL_ODBC_TEST_EXTRA_LINK_LIBS arrow_odbc_spi_impl
        ${ARROW_FLIGHT_SQL_ODBC_TEST_LIBS})
 else()
-  # Unix
+  # Unix/macOS
   list(APPEND ARROW_FLIGHT_SQL_ODBC_TEST_STATIC_LINK_LIBS
        ${ARROW_FLIGHT_SQL_ODBC_TEST_LIBS} ${ARROW_FLIGHT_SQL_ODBC_TEST_LINK_LIBS})
 endif()
 
-# When Flight tests require static linkage, we must also add Arrow test libs to STATIC_LINK_LIBS
-# to avoid add_arrow_test from adding shared Arrow test libs
-if(ARROW_FLIGHT_TEST_LINKAGE STREQUAL "static")
-  list(APPEND ARROW_FLIGHT_SQL_ODBC_TEST_STATIC_LINK_LIBS ${ARROW_TEST_STATIC_LINK_LIBS})
-endif()
-
 add_arrow_test(flight_sql_odbc_test
                SOURCES
                ${ARROW_FLIGHT_SQL_ODBC_TEST_SRCS}