From 0fada1f3529bff1c890cf4b1de56389753834544 Mon Sep 17 00:00:00 2001
From: James Duong <jduong@dremio.com>
Date: Wed, 20 Jul 2022 15:51:38 -0700
Subject: [PATCH] Update flightsql-odbc commit for encoding and struct fixes

- Fix bug where detected encoding isn't recorded on Mac.
- Fix crash when structs have null fields

Change-Id: Ia4c9eb0895305865b33982e7cfbf345c5af1c4a8
---
 CMakeLists.txt  | 2 +-
 build-debug.sh  | 2 +-
 build.sh        | 2 +-
 build_osx.sh    | 2 +-
 build_win32.bat | 2 +-
 build_win64.bat | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7ba0c6..3d6f555 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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()
 
diff --git a/build-debug.sh b/build-debug.sh
index 8a90de1..a01c8f6 100755
--- a/build-debug.sh
+++ b/build-debug.sh
@@ -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 \
diff --git a/build.sh b/build.sh
index 8a31c3f..dcf7505 100755
--- a/build.sh
+++ b/build.sh
@@ -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 \
diff --git a/build_osx.sh b/build_osx.sh
index 575509a..a704ba4 100755
--- a/build_osx.sh
+++ b/build_osx.sh
@@ -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 \
diff --git a/build_win32.bat b/build_win32.bat
index fe246da..d3b8a7a 100644
--- a/build_win32.bat
+++ b/build_win32.bat
@@ -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%^
diff --git a/build_win64.bat b/build_win64.bat
index c7d5497..e9ef6cf 100644
--- a/build_win64.bat
+++ b/build_win64.bat
@@ -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%^