Resolve Windows ODBC test error

- Add `arrow_odbc_spi_impl` linking back to odbc test to resolve test issues.
- `ARROW_TEST_LINK_LIBS` contains more libraries than `ARROW_TEST_STATIC_LINK_LIBS`/`ARROW_TEST_SHARED_LINK_LIBS`, might have been causing linking issues.

- Add `DEPENDENCIES ` variable back on Windows

Author: alinaliBQ

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

@@ -59,10 +59,12 @@ endif()
 
 # On Windows, dynmaic build for ODBC is supported.
 # On unix systems, static build for ODBC is supported, all libraries are linked statically on unix.
+set(ARROW_FLIGHT_SQL_ODBC_DEPENDENCIES "")
 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)
+  set(ARROW_FLIGHT_SQL_ODBC_DEPENDENCIES arrow_flight_sql)
   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
@@ -87,6 +89,8 @@ add_arrow_lib(arrow_flight_sql_odbc
               ${ARROW_FLIGHT_SQL_ODBC_SRCS}
               DEFINITIONS
               UNICODE
+              DEPENDENCIES
+              ${ARROW_FLIGHT_SQL_ODBC_DEPENDENCIES}
               SHARED_LINK_FLAGS
               ${ARROW_VERSION_SCRIPT_FLAGS} # Defined in cpp/arrow/CMakeLists.txt
               SHARED_LINK_LIBS

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

@@ -44,29 +44,26 @@ set(ARROW_FLIGHT_SQL_ODBC_TEST_SRCS
 
 if(ARROW_TEST_LINKAGE STREQUAL "static")
   set(ARROW_FLIGHT_SQL_ODBC_TEST_LINK_LIBS arrow_flight_sql_odbc_static
-                                           ${ARROW_TEST_LINK_LIBS})
+                                           ${ARROW_TEST_STATIC_LINK_LIBS})
 else()
   set(ARROW_FLIGHT_SQL_ODBC_TEST_LINK_LIBS arrow_flight_sql_odbc_shared
-                                           ${ARROW_TEST_LINK_LIBS})
+                                           ${ARROW_TEST_SHARED_LINK_LIBS})
 endif()
 
-list(APPEND
-     ARROW_FLIGHT_SQL_ODBC_TEST_LINK_LIBS
-     ${ODBC_LIBRARIES}
-     ${ODBCINST}
-     ${SQLite3_LIBRARIES})
+set(ARROW_FLIGHT_SQL_ODBC_TEST_LIBS ${ODBC_LIBRARIES} ${ODBCINST} ${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.
 set(ARROW_FLIGHT_SQL_ODBC_TEST_EXTRA_LINK_LIBS "")
 set(ARROW_FLIGHT_SQL_ODBC_TEST_STATIC_LINK_LIBS "")
 if(WIN32)
-  list(APPEND ARROW_FLIGHT_SQL_ODBC_TEST_EXTRA_LINK_LIBS
-       ${ARROW_FLIGHT_SQL_ODBC_TEST_LINK_LIBS})
+  # arrow_odbc_spi_impl is required on Windows due to dynamic linking
+  list(APPEND ARROW_FLIGHT_SQL_ODBC_TEST_EXTRA_LINK_LIBS arrow_odbc_spi_impl
+       ${ARROW_FLIGHT_SQL_ODBC_TEST_LIBS})
 else()
   # Unix
   list(APPEND ARROW_FLIGHT_SQL_ODBC_TEST_STATIC_LINK_LIBS
-       ${ARROW_FLIGHT_SQL_ODBC_TEST_LINK_LIBS})
+       ${ARROW_FLIGHT_SQL_ODBC_TEST_LIBS} ${ARROW_FLIGHT_SQL_ODBC_TEST_LINK_LIBS})
 endif()
 
 add_arrow_test(flight_sql_odbc_test