Skip to content

Commit b73c118

Browse files
alinaliBQalinaliBQ
committed
Attempt to fix build issue & Enable Windows CI
Move include of odbc_impl header to after utf8.
1 parent 583b47e commit b73c118

File tree

2 files changed

+121
-121
lines changed

2 files changed

+121
-121
lines changed

‎.github/workflows/cpp.yml‎

Lines changed: 118 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -285,123 +285,122 @@ jobs:
285285
# ulimit -c unlimited # must enable within the same shell
286286
# ci/scripts/cpp_test.sh $(pwd) $(pwd)/build
287287

288-
# -AL- disable Windows CI
289-
# windows:
290-
# if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
291-
# name: AMD64 Windows 2022 AVX2 C++
292-
# uses: ./.github/workflows/cpp_windows.yml
293-
# with:
294-
# arch: x64
295-
# os: windows-2022
296-
# simd-level: AVX2
288+
windows:
289+
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
290+
name: AMD64 Windows 2022 AVX2 C++
291+
uses: ./.github/workflows/cpp_windows.yml
292+
with:
293+
arch: x64
294+
os: windows-2022
295+
simd-level: AVX2
297296

298-
# windows-mingw:
299-
# name: AMD64 Windows MinGW ${{ matrix.msystem_upper }} C++
300-
# runs-on: windows-2022
301-
# if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
302-
# # Build may take 1h+ without cache.
303-
# timeout-minutes: 120
304-
# strategy:
305-
# fail-fast: false
306-
# matrix:
307-
# include:
308-
# - msystem_lower: mingw64
309-
# msystem_upper: MINGW64
310-
# - msystem_lower: clang64
311-
# msystem_upper: CLANG64
312-
# env:
313-
# ARROW_BUILD_SHARED: ON
314-
# ARROW_BUILD_STATIC: OFF
315-
# ARROW_BUILD_TESTS: ON
316-
# ARROW_BUILD_TYPE: release
317-
# ARROW_DATASET: ON
318-
# ARROW_FLIGHT: ON
319-
# ARROW_FLIGHT_SQL: ON
320-
# ARROW_FLIGHT_SQL_ODBC: ON
321-
# ARROW_FLIGHT_SQL_ODBC_INSTALLER: ON
322-
# ARROW_GANDIVA: ON
323-
# ARROW_GCS: ON
324-
# ARROW_HDFS: OFF
325-
# ARROW_HOME: /${{ matrix.msystem_lower}}
326-
# ARROW_JEMALLOC: OFF
327-
# ARROW_PARQUET: ON
328-
# ARROW_S3: ON
329-
# ARROW_SUBSTRAIT: ON
330-
# ARROW_USE_GLOG: OFF
331-
# ARROW_VERBOSE_THIRDPARTY_BUILD: OFF
332-
# ARROW_WITH_BROTLI: ON
333-
# ARROW_WITH_BZ2: ON
334-
# ARROW_WITH_LZ4: ON
335-
# ARROW_WITH_OPENTELEMETRY: OFF
336-
# ARROW_WITH_SNAPPY: ON
337-
# ARROW_WITH_ZLIB: ON
338-
# ARROW_WITH_ZSTD: ON
339-
# ARROW_CMAKE_ARGS: >-
340-
# -DARROW_PACKAGE_PREFIX=/${{ matrix.msystem_lower}}
341-
# -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
342-
# # We can't use unity build because we don't have enough memory on
343-
# # GitHub Actions.
344-
# # CMAKE_UNITY_BUILD: ON
345-
# steps:
346-
# - name: Disable Crash Dialogs
347-
# run: |
348-
# reg add `
349-
# "HKCU\SOFTWARE\Microsoft\Windows\Windows Error Reporting" `
350-
# /v DontShowUI `
351-
# /t REG_DWORD `
352-
# /d 1 `
353-
# /f
354-
# - name: Checkout Arrow
355-
# uses: actions/checkout@v5
356-
# with:
357-
# fetch-depth: 0
358-
# submodules: recursive
359-
# - uses: msys2/setup-msys2@v2
360-
# with:
361-
# msystem: ${{ matrix.msystem_upper }}
362-
# update: true
363-
# - name: Setup MSYS2
364-
# shell: msys2 {0}
365-
# run: ci/scripts/msys2_setup.sh cpp
366-
# - name: Cache ccache
367-
# uses: actions/cache@v4
368-
# with:
369-
# path: ccache
370-
# key: cpp-ccache-${{ matrix.msystem_lower}}-${{ hashFiles('cpp/**') }}
371-
# restore-keys: cpp-ccache-${{ matrix.msystem_lower}}-
372-
# - name: Build
373-
# shell: msys2 {0}
374-
# run: |
375-
# export CMAKE_BUILD_PARALLEL_LEVEL=$NUMBER_OF_PROCESSORS
376-
# ci/scripts/cpp_build.sh "$(pwd)" "$(pwd)/build"
377-
# - name: Download Timezone Database
378-
# shell: bash
379-
# run: ci/scripts/download_tz_database.sh
380-
# - name: Download MinIO
381-
# shell: msys2 {0}
382-
# run: |
383-
# mkdir -p /usr/local/bin
384-
# wget \
385-
# --output-document /usr/local/bin/minio.exe \
386-
# https://dl.min.io/server/minio/release/windows-amd64/archive/minio.RELEASE.2024-09-13T20-26-02Z
387-
# chmod +x /usr/local/bin/minio.exe
388-
# - name: Set up Python
389-
# uses: actions/[email protected]
390-
# id: python-install
391-
# with:
392-
# python-version: '3.12'
393-
# - name: Install Google Cloud Storage Testbench
394-
# shell: msys2 {0}
395-
# env:
396-
# PIPX_BIN_DIR: /usr/local/bin
397-
# PIPX_BASE_PYTHON: ${{ steps.python-install.outputs.python-path }}
398-
# run: |
399-
# ci/scripts/install_gcs_testbench.sh default
400-
# - name: Register Flight SQL ODBC Driver
401-
# shell: cmd
402-
# run: |
403-
# call "cpp\src\arrow\flight\sql\odbc\tests\install_odbc.cmd" ${{ github.workspace }}\build\cpp\%ARROW_BUILD_TYPE%\libarrow_flight_sql_odbc.dll
404-
# - name: Test
405-
# shell: msys2 {0}
406-
# run: |
407-
# ci/scripts/cpp_test.sh "$(pwd)" "$(pwd)/build"
297+
windows-mingw:
298+
name: AMD64 Windows MinGW ${{ matrix.msystem_upper }} C++
299+
runs-on: windows-2022
300+
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
301+
# Build may take 1h+ without cache.
302+
timeout-minutes: 120
303+
strategy:
304+
fail-fast: false
305+
matrix:
306+
include:
307+
- msystem_lower: mingw64
308+
msystem_upper: MINGW64
309+
- msystem_lower: clang64
310+
msystem_upper: CLANG64
311+
env:
312+
ARROW_BUILD_SHARED: ON
313+
ARROW_BUILD_STATIC: OFF
314+
ARROW_BUILD_TESTS: ON
315+
ARROW_BUILD_TYPE: release
316+
ARROW_DATASET: ON
317+
ARROW_FLIGHT: ON
318+
ARROW_FLIGHT_SQL: ON
319+
ARROW_FLIGHT_SQL_ODBC: ON
320+
ARROW_FLIGHT_SQL_ODBC_INSTALLER: ON
321+
ARROW_GANDIVA: ON
322+
ARROW_GCS: ON
323+
ARROW_HDFS: OFF
324+
ARROW_HOME: /${{ matrix.msystem_lower}}
325+
ARROW_JEMALLOC: OFF
326+
ARROW_PARQUET: ON
327+
ARROW_S3: ON
328+
ARROW_SUBSTRAIT: ON
329+
ARROW_USE_GLOG: OFF
330+
ARROW_VERBOSE_THIRDPARTY_BUILD: OFF
331+
ARROW_WITH_BROTLI: ON
332+
ARROW_WITH_BZ2: ON
333+
ARROW_WITH_LZ4: ON
334+
ARROW_WITH_OPENTELEMETRY: OFF
335+
ARROW_WITH_SNAPPY: ON
336+
ARROW_WITH_ZLIB: ON
337+
ARROW_WITH_ZSTD: ON
338+
ARROW_CMAKE_ARGS: >-
339+
-DARROW_PACKAGE_PREFIX=/${{ matrix.msystem_lower}}
340+
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
341+
# We can't use unity build because we don't have enough memory on
342+
# GitHub Actions.
343+
# CMAKE_UNITY_BUILD: ON
344+
steps:
345+
- name: Disable Crash Dialogs
346+
run: |
347+
reg add `
348+
"HKCU\SOFTWARE\Microsoft\Windows\Windows Error Reporting" `
349+
/v DontShowUI `
350+
/t REG_DWORD `
351+
/d 1 `
352+
/f
353+
- name: Checkout Arrow
354+
uses: actions/checkout@v5
355+
with:
356+
fetch-depth: 0
357+
submodules: recursive
358+
- uses: msys2/setup-msys2@v2
359+
with:
360+
msystem: ${{ matrix.msystem_upper }}
361+
update: true
362+
- name: Setup MSYS2
363+
shell: msys2 {0}
364+
run: ci/scripts/msys2_setup.sh cpp
365+
- name: Cache ccache
366+
uses: actions/cache@v4
367+
with:
368+
path: ccache
369+
key: cpp-ccache-${{ matrix.msystem_lower}}-${{ hashFiles('cpp/**') }}
370+
restore-keys: cpp-ccache-${{ matrix.msystem_lower}}-
371+
- name: Build
372+
shell: msys2 {0}
373+
run: |
374+
export CMAKE_BUILD_PARALLEL_LEVEL=$NUMBER_OF_PROCESSORS
375+
ci/scripts/cpp_build.sh "$(pwd)" "$(pwd)/build"
376+
- name: Download Timezone Database
377+
shell: bash
378+
run: ci/scripts/download_tz_database.sh
379+
- name: Download MinIO
380+
shell: msys2 {0}
381+
run: |
382+
mkdir -p /usr/local/bin
383+
wget \
384+
--output-document /usr/local/bin/minio.exe \
385+
https://dl.min.io/server/minio/release/windows-amd64/archive/minio.RELEASE.2024-09-13T20-26-02Z
386+
chmod +x /usr/local/bin/minio.exe
387+
- name: Set up Python
388+
uses: actions/[email protected]
389+
id: python-install
390+
with:
391+
python-version: '3.12'
392+
- name: Install Google Cloud Storage Testbench
393+
shell: msys2 {0}
394+
env:
395+
PIPX_BIN_DIR: /usr/local/bin
396+
PIPX_BASE_PYTHON: ${{ steps.python-install.outputs.python-path }}
397+
run: |
398+
ci/scripts/install_gcs_testbench.sh default
399+
- name: Register Flight SQL ODBC Driver
400+
shell: cmd
401+
run: |
402+
call "cpp\src\arrow\flight\sql\odbc\tests\install_odbc.cmd" ${{ github.workspace }}\build\cpp\%ARROW_BUILD_TYPE%\libarrow_flight_sql_odbc.dll
403+
- name: Test
404+
shell: msys2 {0}
405+
run: |
406+
ci/scripts/cpp_test.sh "$(pwd)" "$(pwd)/build"

‎cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_connection.cc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
#include "arrow/flight/sql/odbc/odbc_impl/odbc_connection.h"
19-
2018
#include "arrow/result.h"
2119
#include "arrow/util/utf8.h"
2220

21+
// utf8.h needs to be included first due to conflicts with odbc_connection.h on macOS
22+
#include "arrow/flight/sql/odbc/odbc_impl/odbc_connection.h"
23+
2324
#include "arrow/flight/sql/odbc/odbc_impl/attribute_utils.h"
2425
#include "arrow/flight/sql/odbc/odbc_impl/config/configuration.h"
2526
#include "arrow/flight/sql/odbc/odbc_impl/exceptions.h"

0 commit comments

Comments
 (0)