Override the flightsql-odbc version

Override what flightsql-odbc reports for SQLGetInfo(SQL_DRIVER_VER) to be consistent with WARPDRIVE_VERSION which is what's used for the DLL version. Change-Id: Ib4d8ae59b9438956135a4bac615502fc353e94a2
Antropovi · Jun 28, 2022 · eb685c2 · eb685c2
1 parent eef3f79
commit eb685c2
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 15 deletions.
diff --git 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 "83771d462b221f093a5cf9c7b747fdbdc8cc9464")
+    set(ODBCABSTRACTION_GIT_TAG "5a8660d0b815489d981e73560e81ee1f036358a3")
   endif()
 endif()
 

diff --git 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:=83771d462b221f093a5cf9c7b747fdbdc8cc9464}"
+ODBCABSTRACTION_GIT_TAG="${ODBCABSTRACTION_GIT_TAG:=5a8660d0b815489d981e73560e81ee1f036358a3}"
 
 cmake \
   -GNinja \

diff --git 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:=83771d462b221f093a5cf9c7b747fdbdc8cc9464}"
+ODBCABSTRACTION_GIT_TAG="${ODBCABSTRACTION_GIT_TAG:=5a8660d0b815489d981e73560e81ee1f036358a3}"
 
 cmake \
   -GNinja \

diff --git 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:=83771d462b221f093a5cf9c7b747fdbdc8cc9464}"
+ODBCABSTRACTION_GIT_TAG="${ODBCABSTRACTION_GIT_TAG:=5a8660d0b815489d981e73560e81ee1f036358a3}"
 
 cmake \
   -DCMAKE_BUILD_TYPE=Release \

diff --git 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="83771d462b221f093a5cf9c7b747fdbdc8cc9464"
+if NOT DEFINED ODBCABSTRACTION_GIT_TAG SET ODBCABSTRACTION_GIT_TAG="5a8660d0b815489d981e73560e81ee1f036358a3"
 
 cmake ..^
     -DARROW_GIT_REPOSITORY=%ARROW_GIT_REPOSITORY%^

diff --git 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="83771d462b221f093a5cf9c7b747fdbdc8cc9464"
+if NOT DEFINED ODBCABSTRACTION_GIT_TAG SET ODBCABSTRACTION_GIT_TAG="5a8660d0b815489d981e73560e81ee1f036358a3"
 
 cmake ..^
     -DARROW_GIT_REPOSITORY=%ARROW_GIT_REPOSITORY%^

diff --git a/src/arrow-odbc/CMakeLists.txt b/src/arrow-odbc/CMakeLists.txt
@@ -34,6 +34,14 @@ find_package(OpenSSL REQUIRED)
 # Add gRPC dependencies needed by Arrow Flight. Should be pre-installed.
 find_package(gRPC 1.36 CONFIG REQUIRED)
 
+# Define the version number information.
+if(DEFINED ENV{WARPDRIVE_BUILD_VERSION})
+  set(WARPDRIVE_BUILD_VERSION "$ENV{WARPDRIVE_BUILD_VERSION}")
+else()
+  set(WARPDRIVE_BUILD_VERSION "${WARPDRIVE_VERSION_MAJOR}.${WARPDRIVE_VERSION_MINOR}.${WARPDRIVE_VERSION_PATCH}.0")
+endif()
+add_compile_definitions(WARPDRIVE_BUILD_VERSION="${WARPDRIVE_BUILD_VERSION}")
+
 if (MSVC)
   # the following definitions stop arrow from using __declspec when staticly linking and will break on windows without them
   add_compile_definitions(ARROW_STATIC ARROW_FLIGHT_STATIC)
@@ -89,17 +97,9 @@ if (MSVC)
 
   # Add version info resources
   # More info at: https://docs.microsoft.com/en-us/windows/win32/menurc/versioninfo-resource
-
-  if(DEFINED ENV{WARPDRIVE_BUILD_VERSION})
-    set(WARPDRIVE_BUILD_VERSION "$ENV{WARPDRIVE_BUILD_VERSION}")
-  else()
-    set(WARPDRIVE_BUILD_VERSION "${WARPDRIVE_VERSION_MAJOR}.${WARPDRIVE_VERSION_MINOR}.${WARPDRIVE_VERSION_PATCH}.0")
-  endif()
-
   set(WARPDRIVE_RC_PRODUCTVERSION "${WARPDRIVE_BUILD_VERSION}")
   string(REPLACE "." "," WARPDRIVE_RC_FILEVERSION "${WARPDRIVE_RC_PRODUCTVERSION}")
   configure_file(version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/version.rc @ONLY)
-
   list(APPEND ARROW_ODBC_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
 endif()
 

diff --git a/src/arrow-odbc/main.cc b/src/arrow-odbc/main.cc
@@ -14,5 +14,7 @@
  * @brief Create a Driver object
  */
 std::shared_ptr<driver::odbcabstraction::Driver> CreateDriver() {
-    return std::shared_ptr<driver::odbcabstraction::Driver>(new driver::flight_sql::FlightSqlDriver());
+    auto driver = std::shared_ptr<driver::odbcabstraction::Driver>(new driver::flight_sql::FlightSqlDriver());
+    driver->SetVersion(WARPDRIVE_BUILD_VERSION);
+    return driver;
 }