apache · zeroshade · Jun 23, 2025 · Jun 3, 2025 · Jun 3, 2025 · Jun 3, 2025
@@ -194,6 +194,7 @@ jobs:
           BUILD_DRIVER_MANAGER: "1"
           BUILD_DRIVER_POSTGRESQL: "1"
           BUILD_DRIVER_SQLITE: "1"
+          ADBC_DRIVER_MANAGER_USER_CONFIG_TEST: "1"
         run: |
           ./ci/scripts/cpp_build.sh "$(pwd)" "$(pwd)/build"
       - name: Test

@@ -97,6 +97,7 @@ jobs:
           BUILD_DRIVER_BIGQUERY: "0"
           BUILD_DRIVER_FLIGHTSQL: "0"
           BUILD_DRIVER_SNOWFLAKE: "0"
+          BUILD_DRIVER_MANAGER_USER_CONFIG_TEST: "1"
         run: |
           .\ci\scripts\cpp_build.ps1 $pwd ${{ github.workspace }}\build
 
@@ -149,6 +150,7 @@ jobs:
         env:
           BUILD_ALL: "0"
           BUILD_DRIVER_MANAGER: "1"
+          BUILD_DRIVER_MANAGER_USER_CONFIG_TEST: "1"
         run: .\ci\scripts\cpp_build.ps1 $pwd $pwd\build
       - name: Build Driver PostgreSQL
         env:
@@ -164,6 +166,7 @@ jobs:
         env:
           BUILD_ALL: "0"
           BUILD_DRIVER_MANAGER: "1"
+          BUILD_DRIVER_MANAGER_USER_CONFIG_TEST: "1"
         run: .\ci\scripts\cpp_test.ps1 $pwd\build
       - name: Test Driver SQLite
         env:

@@ -907,7 +907,7 @@ jobs:
         shell: cmd
         run: |
           where python.exe
-          CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars64.bat"
+          CALL "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
           pushd adbc
           set SETUPTOOLS_SCM_PRETEND_VERSION=%VERSION%
           .\ci\scripts\python_wheel_windows_build.bat %cd% %cd%\build

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -229,6 +229,31 @@ public domain, released using the CC0 1.0 Universal dedication (*).
 
 --------------------------------------------------------------------------------
 
+The files in c/vendor/toml++ contain code from
+
+https://github.com/marzer/tomlplusplus
+
+and have the following copyright notice:
+
+MIT License
+
+Copyright (c) Mark Gillard <mark.gillard@outlook.com.au>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+--------------------------------------------------------------------------------
+
 The files python/*/*/_version.py and python/*/*/_static_version.py
 contain code from
 

@@ -18,14 +18,15 @@
 cmake_minimum_required(VERSION 3.18)
 get_filename_component(REPOSITORY_ROOT ".." ABSOLUTE)
 list(APPEND CMAKE_MODULE_PATH "${REPOSITORY_ROOT}/c/cmake_modules/")
-include(AdbcDefines)
-include(BuildUtils)
+include(AdbcVersion)
 project(adbc
         VERSION "${ADBC_BASE_VERSION}"
         LANGUAGES C CXX)
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+include(AdbcDefines)
+include(BuildUtils)
 
 include(CTest)
 

@@ -22,7 +22,6 @@ enable_language(C CXX)
 
 set(BUILD_SUPPORT_DIR "${REPOSITORY_ROOT}/ci/build_support")
 
-include(AdbcVersion)
 include(CheckLinkerFlag)
 include(DefineOptions)
 include(GNUInstallDirs) # Populates CMAKE_INSTALL_INCLUDEDIR
@@ -92,6 +91,8 @@ if(MSVC)
   add_compile_options(/wd4711)
   # Don't warn about padding added after members
   add_compile_options(/wd4820)
+  # Don't warn about enforcing left-to-right evaluation order for operator[]
+  add_compile_options(/wd4866)
   add_compile_options(/wd5027)
   add_compile_options(/wd5039)
   add_compile_options(/wd5045)

@@ -199,7 +199,7 @@ function(ADD_ARROW_LIB LIB_NAME)
 
   if(BUILD_SHARED)
     add_library(${LIB_NAME}_shared SHARED ${LIB_DEPS})
-    target_compile_features(${LIB_NAME}_shared PRIVATE cxx_std_11)
+    target_compile_features(${LIB_NAME}_shared PRIVATE cxx_std_17)
     set_property(TARGET ${LIB_NAME}_shared PROPERTY CXX_STANDARD_REQUIRED ON)
     adbc_configure_target(${LIB_NAME}_shared)
     if(EXTRA_DEPS)

@@ -139,6 +139,12 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
                        "shared"
                        "static")
 
+  define_option(ADBC_DRIVER_MANAGER_TEST_MANIFEST_USER_LEVEL
+                "Build driver manager manifest user-level tests" OFF)
+
+  define_option(ADBC_DRIVER_MANAGER_TEST_MANIFEST_SYSTEM_LEVEL
+                "Build driver manager manifest system-level tests" OFF)
+
   #----------------------------------------------------------------------
   set_option_category("Lint")
 

@@ -15,6 +15,34 @@
 # specific language governing permissions and limitations
 # under the License.
 
+set(ADBC_DRIVER_MANAGER_SHARED_LINK_LIBS ${CMAKE_DL_LIBS})
+set(ADBC_DRIVER_MANAGER_STATIC_LINK_LIBS ${CMAKE_DL_LIBS})
+# std::filesystem with old g++/clang++ require libstdc++fs/libc++fs.
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+  if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "9")
+    list(APPEND ADBC_DRIVER_MANAGER_SHARED_LINK_LIBS stdc++fs)
+    list(APPEND ADBC_DRIVER_MANAGER_STATIC_LINK_LIBS stdc++fs)
+  endif()
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+  if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "8")
+    list(APPEND ADBC_DRIVER_MANAGER_SHARED_LINK_LIBS c++fs)
+    list(APPEND ADBC_DRIVER_MANAGER_STATIC_LINK_LIBS c++fs)
+  endif()
+endif()
+
+if(WIN32)
+  list(APPEND
+       ADBC_DRIVER_MANAGER_SHARED_LINK_LIBS
+       advapi32
+       uuid
+       shell32)
+  list(APPEND
+       ADBC_DRIVER_MANAGER_STATIC_LINK_LIBS
+       advapi32
+       uuid
+       shell32)
+endif()
+
 add_arrow_lib(adbc_driver_manager
               SOURCES
               adbc_driver_manager.cc
@@ -25,9 +53,9 @@ add_arrow_lib(adbc_driver_manager
               PKG_CONFIG_NAME
               adbc-driver-manager
               SHARED_LINK_LIBS
-              ${CMAKE_DL_LIBS}
+              ${ADBC_DRIVER_MANAGER_SHARED_LINK_LIBS}
               STATIC_LINK_LIBS
-              ${CMAKE_DL_LIBS}
+              ${ADBC_DRIVER_MANAGER_STATIC_LINK_LIBS}
               SHARED_LINK_FLAGS
               ${ADBC_LINK_FLAGS})
 
@@ -62,6 +90,20 @@ if(ADBC_BUILD_TESTS)
                 adbc_validation
                 ${TEST_LINK_LIBS})
   target_compile_features(adbc-driver-manager-test PRIVATE cxx_std_17)
+
+  if(ADBC_DRIVER_SQLITE)
+    target_compile_definitions(adbc-driver-manager-test
+                               PRIVATE ADBC_DRIVER_MANAGER_TEST_LIB="${CMAKE_BINARY_DIR}/driver/sqlite/libadbc_driver_sqlite${CMAKE_SHARED_LIBRARY_SUFFIX}"
+    )
+  endif()
+  if(ADBC_DRIVER_MANAGER_TEST_MANIFEST_USER_LEVEL)
+    target_compile_definitions(adbc-driver-manager-test
+                               PRIVATE ADBC_DRIVER_MANAGER_TEST_MANIFEST_USER_LEVEL=1)
+  endif()
+  if(ADBC_DRIVER_MANAGER_TEST_MANIFEST_SYSTEM_LEVEL)
+    target_compile_definitions(adbc-driver-manager-test
+                               PRIVATE ADBC_DRIVER_MANAGER_TEST_MANIFEST_SYSTEM_LEVEL=1)
+  endif()
   target_include_directories(adbc-driver-manager-test SYSTEM
                              PRIVATE ${REPOSITORY_ROOT}/c/ ${REPOSITORY_ROOT}/c/include/
                                      ${LIBPQ_INCLUDE_DIRS} ${REPOSITORY_ROOT}/c/driver)