Add ODBC Debian support

* Attempt to build Debian ODBC

Update debian-13-cpp.dockerfile

  # New if statement attempts to fix error at https://github.com/Bit-Quill/arrow/actions/runs/23025621291/job/66872649956#step:6:4516. Only an if statement is added, rest of code change is space

  # Disable Arrow parquet due to https://github.com/Bit-Quill/arrow/actions/runs/23070284534/job/67018772931#step:6:11116

Author: alinaliBQ

.github/workflows/cpp_extra.yml

@@ -338,7 +338,7 @@ jobs:
 
   odbc-linux:
     needs: check-labels
-    name: ODBC Linux
+    name: ODBC ${{ matrix.title }}
     runs-on: ubuntu-latest
     if: >-
       needs.check-labels.outputs.force == 'true' ||
@@ -347,6 +347,12 @@ jobs:
     timeout-minutes: 75
     strategy:
       fail-fast: false
+      matrix:
+        include:
+          - image: ubuntu-cpp-odbc
+            title: AMD64 Ubuntu
+          - image: debian-cpp-odbc
+            title: AMD64 Debian
     env:
       ARCH: amd64
       ARCHERY_DEBUG: 1
@@ -365,8 +371,8 @@ jobs:
         uses: actions/cache@v5
         with:
           path: .docker
-          key: ubuntu-cpp-odbc-${{ hashFiles('cpp/**') }}
-          restore-keys: ubuntu-cpp-odbc-
+          key: ${{ matrix.image }}-${{ hashFiles('cpp/**') }}
+          restore-keys: ${{ matrix.image }}-
       - name: Setup Python on hosted runner
         uses: actions/setup-python@v6
         with:
@@ -381,7 +387,7 @@ jobs:
           # GH-40558: reduce ASLR to avoid ASAN/LSAN crashes
           sudo sysctl -w vm.mmap_rnd_bits=28
           source ci/scripts/util_enable_core_dumps.sh
-          archery docker run ubuntu-cpp-odbc
+          archery docker run ${{ matrix.image }}
       - name: Docker Push
         if: >-
           success() &&
@@ -392,7 +398,7 @@ jobs:
           ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
           ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
         continue-on-error: true
-        run: archery docker push ubuntu-cpp-odbc
+        run: archery docker push ${{ matrix.image }}
 
   odbc-macos:
     needs: check-labels

ci/docker/debian-13-cpp.dockerfile

@@ -88,8 +88,10 @@ RUN apt-get update -y -q && \
         rapidjson-dev \
         rsync \
         rustc \
+        sudo \
         tzdata \
         tzdata-legacy \
+        unixodbc-dev \
         zlib1g-dev && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*

compose.yaml

@@ -134,6 +134,7 @@ x-hierarchy:
   - debian-cpp:
     - debian-c-glib:
       - debian-ruby
+    - debian-cpp-odbc
     - debian-python:
       - debian-docs
   - fedora-cpp:
@@ -372,6 +373,54 @@ services:
         /arrow/ci/scripts/cpp_build.sh /arrow /build &&
         /arrow/ci/scripts/cpp_test.sh /arrow /build"
 
+  debian-cpp-odbc:
+    # Usage:
+    #   docker compose build debian-cpp-odbc
+    #   docker compose run --rm debian-cpp-odbc
+    # Parameters:
+    #   ARCH: amd64, arm64v8, ...
+    #   DEBIAN: 12, experimental
+    image: ${REPO}:${ARCH}-debian-${DEBIAN}-cpp
+    build:
+      context: .
+      dockerfile: ci/docker/debian-${DEBIAN}-cpp.dockerfile
+      cache_from:
+        - ${REPO}:${ARCH}-debian-${DEBIAN}-cpp
+      args:
+        arch: ${ARCH}
+        gcc: ${GCC}
+        llvm: ${LLVM}
+    shm_size: *shm-size
+    ulimits: *ulimits
+    environment:
+      <<: [*common, *ccache, *sccache, *cpp]
+      ARROW_ACERO: "OFF"
+      ARROW_AZURE: "OFF"
+      ARROW_BUILD_TYPE: RELEASE
+      ARROW_CSV: "OFF"
+      ARROW_DATASET: "OFF"
+      ARROW_ENABLE_TIMING_TESTS:  # inherit
+      ARROW_DEPENDENCY_SOURCE: BUNDLED
+      ARROW_DEPENDENCY_USE_SHARED: "OFF"
+      ARROW_FILESYSTEM: "OFF"
+      ARROW_FLIGHT_SQL_ODBC: "ON"
+      ARROW_GANDIVA: "OFF"
+      ARROW_GCS: "OFF"
+      ARROW_HDFS: "OFF"
+      ARROW_ORC: "OFF"
+      ARROW_PARQUET: "OFF"
+      ARROW_S3: "OFF"
+      ARROW_SUBSTRAIT: "OFF"
+    volumes: &debian-volumes
+      - .:/arrow:delegated
+      - ${DOCKER_VOLUME_PREFIX}debian-ccache:/ccache:delegated
+    # Register ODBC before running tests
+    command: >
+      /bin/bash -c "
+        /arrow/ci/scripts/cpp_build.sh /arrow /build &&
+        sudo /arrow/cpp/src/arrow/flight/sql/odbc/install/unix/install_odbc.sh /usr/local/lib/libarrow_flight_sql_odbc.so &&
+        /arrow/ci/scripts/cpp_test.sh /arrow /build"
+
   ubuntu-cpp:
     # Usage:
     #   docker compose build ubuntu-cpp

cpp/cmake_modules/ThirdpartyToolchain.cmake

@@ -2679,51 +2679,53 @@ macro(build_zlib)
   # bundled. We need to do this for all packages
   # not just zlib as some depend on zlib, but we don't rebuild
   # if it exists already
-  if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
-    # build zlib using Emscripten ports
-    if(NOT EXISTS ${EMSCRIPTEN_SYSROOT}/lib/wasm32-emscripten/pic/libz.a)
-      execute_process(COMMAND embuilder --pic --force build zlib)
-    endif()
-    add_library(ZLIB::ZLIB STATIC IMPORTED)
-    set_property(TARGET ZLIB::ZLIB
-                 PROPERTY IMPORTED_LOCATION
-                          "${EMSCRIPTEN_SYSROOT}/lib/wasm32-emscripten/pic/libz.a")
-    target_include_directories(ZLIB::ZLIB INTERFACE "${EMSCRIPTEN_SYSROOT}/include")
-    list(APPEND ARROW_BUNDLED_STATIC_LIBS ZLIB::ZLIB)
-  else()
-    set(ZLIB_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/zlib_ep/src/zlib_ep-install")
-    if(MSVC)
-      if(${UPPERCASE_BUILD_TYPE} STREQUAL "DEBUG")
-        set(ZLIB_STATIC_LIB_NAME zlibstaticd.lib)
-      else()
-        set(ZLIB_STATIC_LIB_NAME zlibstatic.lib)
+  if(NOT TARGET ZLIB::ZLIB)
+    if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+      # build zlib using Emscripten ports
+      if(NOT EXISTS ${EMSCRIPTEN_SYSROOT}/lib/wasm32-emscripten/pic/libz.a)
+        execute_process(COMMAND embuilder --pic --force build zlib)
       endif()
+      add_library(ZLIB::ZLIB STATIC IMPORTED)
+      set_property(TARGET ZLIB::ZLIB
+                   PROPERTY IMPORTED_LOCATION
+                            "${EMSCRIPTEN_SYSROOT}/lib/wasm32-emscripten/pic/libz.a")
+      target_include_directories(ZLIB::ZLIB INTERFACE "${EMSCRIPTEN_SYSROOT}/include")
+      list(APPEND ARROW_BUNDLED_STATIC_LIBS ZLIB::ZLIB)
     else()
-      set(ZLIB_STATIC_LIB_NAME libz.a)
+      set(ZLIB_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/zlib_ep/src/zlib_ep-install")
+      if(MSVC)
+        if(${UPPERCASE_BUILD_TYPE} STREQUAL "DEBUG")
+          set(ZLIB_STATIC_LIB_NAME zlibstaticd.lib)
+        else()
+          set(ZLIB_STATIC_LIB_NAME zlibstatic.lib)
+        endif()
+      else()
+        set(ZLIB_STATIC_LIB_NAME libz.a)
+      endif()
+      set(ZLIB_STATIC_LIB "${ZLIB_PREFIX}/lib/${ZLIB_STATIC_LIB_NAME}")
+      set(ZLIB_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS} "-DCMAKE_INSTALL_PREFIX=${ZLIB_PREFIX}")
+
+      externalproject_add(zlib_ep
+                          ${EP_COMMON_OPTIONS}
+                          URL ${ZLIB_SOURCE_URL}
+                          URL_HASH "SHA256=${ARROW_ZLIB_BUILD_SHA256_CHECKSUM}"
+                          BUILD_BYPRODUCTS "${ZLIB_STATIC_LIB}"
+                          CMAKE_ARGS ${ZLIB_CMAKE_ARGS})
+
+      file(MAKE_DIRECTORY "${ZLIB_PREFIX}/include")
+
+      add_library(ZLIB::ZLIB STATIC IMPORTED)
+      set(ZLIB_LIBRARIES ${ZLIB_STATIC_LIB})
+      set(ZLIB_INCLUDE_DIRS "${ZLIB_PREFIX}/include")
+      set_target_properties(ZLIB::ZLIB PROPERTIES IMPORTED_LOCATION ${ZLIB_LIBRARIES})
+      target_include_directories(ZLIB::ZLIB BEFORE INTERFACE "${ZLIB_INCLUDE_DIRS}")
+
+      add_dependencies(ZLIB::ZLIB zlib_ep)
+      list(APPEND ARROW_BUNDLED_STATIC_LIBS ZLIB::ZLIB)
     endif()
-    set(ZLIB_STATIC_LIB "${ZLIB_PREFIX}/lib/${ZLIB_STATIC_LIB_NAME}")
-    set(ZLIB_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS} "-DCMAKE_INSTALL_PREFIX=${ZLIB_PREFIX}")
-
-    externalproject_add(zlib_ep
-                        ${EP_COMMON_OPTIONS}
-                        URL ${ZLIB_SOURCE_URL}
-                        URL_HASH "SHA256=${ARROW_ZLIB_BUILD_SHA256_CHECKSUM}"
-                        BUILD_BYPRODUCTS "${ZLIB_STATIC_LIB}"
-                        CMAKE_ARGS ${ZLIB_CMAKE_ARGS})
 
-    file(MAKE_DIRECTORY "${ZLIB_PREFIX}/include")
-
-    add_library(ZLIB::ZLIB STATIC IMPORTED)
-    set(ZLIB_LIBRARIES ${ZLIB_STATIC_LIB})
-    set(ZLIB_INCLUDE_DIRS "${ZLIB_PREFIX}/include")
-    set_target_properties(ZLIB::ZLIB PROPERTIES IMPORTED_LOCATION ${ZLIB_LIBRARIES})
-    target_include_directories(ZLIB::ZLIB BEFORE INTERFACE "${ZLIB_INCLUDE_DIRS}")
-
-    add_dependencies(ZLIB::ZLIB zlib_ep)
-    list(APPEND ARROW_BUNDLED_STATIC_LIBS ZLIB::ZLIB)
+    set(ZLIB_VENDORED TRUE)
   endif()
-
-  set(ZLIB_VENDORED TRUE)
 endmacro()
 
 if(ARROW_WITH_ZLIB)