Skip to content

Commit

Permalink
Update flightsql-odbc commit for encoding and struct fixes
Browse files Browse the repository at this point in the history
- Fix bug where detected encoding isn't recorded on Mac.
- Fix crash when structs have null fields

Change-Id: Ia4c9eb0895305865b33982e7cfbf345c5af1c4a8
  • Loading branch information
jduo committed Jul 20, 2022
1 parent 3978f5f commit 0fada1f
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ if (NOT ODBCABSTRACTION_GIT_TAG)
if (DEFINED ENV{ODBCABSTRACTION_GIT_TAG})
set(ODBCABSTRACTION_GIT_TAG "$ENV{ODBCABSTRACTION_GIT_TAG}")
else()
set(ODBCABSTRACTION_GIT_TAG "a6dbaaba4654d9a80892c7cd8788a8e76ff4501e")
set(ODBCABSTRACTION_GIT_TAG "c1707ba1bc10dbd70076b24eb722cf05055e801b")
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion build-debug.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ cd _build
ARROW_GIT_REPOSITORY="${ARROW_GIT_REPOSITORY:=https://github.com/apache/arrow}"
ARROW_GIT_TAG="${ARROW_GIT_TAG:=b050bd0d31db6412256cec3362c0d57c9732e1f2}"
ODBCABSTRACTION_REPO="${ODBCABSTRACTION_REPO:=/opt/flightsql-odbc}"
ODBCABSTRACTION_GIT_TAG="${ODBCABSTRACTION_GIT_TAG:=a6dbaaba4654d9a80892c7cd8788a8e76ff4501e}"
ODBCABSTRACTION_GIT_TAG="${ODBCABSTRACTION_GIT_TAG:=c1707ba1bc10dbd70076b24eb722cf05055e801b}"

cmake \
-GNinja \
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cd _build
ARROW_GIT_REPOSITORY="${ARROW_GIT_REPOSITORY:=https://github.com/apache/arrow}"
ARROW_GIT_TAG="${ARROW_GIT_TAG:=b050bd0d31db6412256cec3362c0d57c9732e1f2}"
ODBCABSTRACTION_REPO="${ODBCABSTRACTION_REPO:=/opt/flightsql-odbc}"
ODBCABSTRACTION_GIT_TAG="${ODBCABSTRACTION_GIT_TAG:=a6dbaaba4654d9a80892c7cd8788a8e76ff4501e}"
ODBCABSTRACTION_GIT_TAG="${ODBCABSTRACTION_GIT_TAG:=c1707ba1bc10dbd70076b24eb722cf05055e801b}"

cmake \
-GNinja \
Expand Down
2 changes: 1 addition & 1 deletion build_osx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cd build
ARROW_GIT_REPOSITORY="${ARROW_GIT_REPOSITORY:=https://github.com/apache/arrow}"
ARROW_GIT_TAG="${ARROW_GIT_TAG:=b050bd0d31db6412256cec3362c0d57c9732e1f2}"
ODBCABSTRACTION_REPO="${ODBCABSTRACTION_REPO:=../flightsql-odbc}"
ODBCABSTRACTION_GIT_TAG="${ODBCABSTRACTION_GIT_TAG:=a6dbaaba4654d9a80892c7cd8788a8e76ff4501e}"
ODBCABSTRACTION_GIT_TAG="${ODBCABSTRACTION_GIT_TAG:=c1707ba1bc10dbd70076b24eb722cf05055e801b}"

cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down
2 changes: 1 addition & 1 deletion build_win32.bat
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ SETLOCAL
if NOT DEFINED ARROW_GIT_REPOSITORY SET ARROW_GIT_REPOSITORY="https://github.com/apache/arrow"
if NOT DEFINED ARROW_GIT_TAG SET ARROW_GIT_TAG="b050bd0d31db6412256cec3362c0d57c9732e1f2"
if NOT DEFINED ODBCABSTRACTION_REPO SET ODBCABSTRACTION_REPO="../flightsql-odbc"
if NOT DEFINED ODBCABSTRACTION_GIT_TAG SET ODBCABSTRACTION_GIT_TAG="a6dbaaba4654d9a80892c7cd8788a8e76ff4501e"
if NOT DEFINED ODBCABSTRACTION_GIT_TAG SET ODBCABSTRACTION_GIT_TAG="c1707ba1bc10dbd70076b24eb722cf05055e801b"

cmake ..^
-DARROW_GIT_REPOSITORY=%ARROW_GIT_REPOSITORY%^
Expand Down
2 changes: 1 addition & 1 deletion build_win64.bat
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ SETLOCAL
if NOT DEFINED ARROW_GIT_REPOSITORY SET ARROW_GIT_REPOSITORY="https://github.com/apache/arrow"
if NOT DEFINED ARROW_GIT_TAG SET ARROW_GIT_TAG="b050bd0d31db6412256cec3362c0d57c9732e1f2"
if NOT DEFINED ODBCABSTRACTION_REPO SET ODBCABSTRACTION_REPO="../flightsql-odbc"
if NOT DEFINED ODBCABSTRACTION_GIT_TAG SET ODBCABSTRACTION_GIT_TAG="a6dbaaba4654d9a80892c7cd8788a8e76ff4501e"
if NOT DEFINED ODBCABSTRACTION_GIT_TAG SET ODBCABSTRACTION_GIT_TAG="c1707ba1bc10dbd70076b24eb722cf05055e801b"

cmake ..^
-DARROW_GIT_REPOSITORY=%ARROW_GIT_REPOSITORY%^
Expand Down

0 comments on commit 0fada1f

Please sign in to comment.