Address Sutou's comments

Author: alinaliBQ

.github/workflows/cpp.yml

@@ -479,7 +479,7 @@ jobs:
       - name: Register Flight SQL ODBC Driver
         shell: cmd
         run: |
-          call "cpp\src\arrow\flight\sql\odbc\install\install_amd64.cmd" ${{github.workspace}}\build\cpp\%ARROW_BUILD_TYPE%\libarrow_flight_sql_odbc.dll
+          call "cpp\src\arrow\flight\sql\odbc\install\install_odbc.cmd" ${{ github.workspace }}\build\cpp\%ARROW_BUILD_TYPE%\libarrow_flight_sql_odbc.dll
       - name: Test
         shell: msys2 {0}
         run: |

cpp/src/arrow/flight/sql/odbc/CMakeLists.txt

@@ -37,8 +37,7 @@ add_subdirectory(odbc_impl)
 
 arrow_install_all_headers("arrow/flight/sql/odbc")
 
-# Compile entry_points.cc before odbc_api.cc due to conflict from sql.h and flight/types.h
-set(ARROW_FLIGHT_SQL_ODBC_SRCS odbc_api.cc entry_points.cc)
+set(ARROW_FLIGHT_SQL_ODBC_SRCS entry_points.cc odbc_api.cc )
 
 if(WIN32)
   list(APPEND ARROW_FLIGHT_SQL_ODBC_SRCS odbc.def)

cpp/src/arrow/flight/sql/odbc/odbc_impl/accessors/string_array_accessor.cc

@@ -24,7 +24,7 @@
 namespace arrow::flight::sql::odbc {
 namespace {
 
-#if defined _WIN32 || defined _WIN64
+#if defined _WIN32
 std::string Utf8ToCLocale(const char* utf8_str, int len) {
   thread_local boost::locale::generator g;
   g.locale_cache_enabled(true);
@@ -36,7 +36,7 @@ std::string Utf8ToCLocale(const char* utf8_str, int len) {
 template <typename CHAR_TYPE>
 inline RowStatus MoveSingleCellToCharBuffer(
     std::vector<uint8_t>& buffer, int64_t& last_retrieved_arrow_row,
-#if defined _WIN32 || defined _WIN64
+#if defined _WIN32
     std::string& clocale_str,
 #endif
     ColumnBinding* binding, StringArray* array, int64_t arrow_row, int64_t i,
@@ -57,7 +57,7 @@ inline RowStatus MoveSingleCellToCharBuffer(
     value = buffer.data();
     size_in_bytes = buffer.size();
   } else {
-#if defined _WIN32 || defined _WIN64
+#if defined _WIN32
     // Convert to C locale string
     if (last_retrieved_arrow_row != arrow_row) {
       clocale_str = Utf8ToCLocale(raw_value, raw_value_length);
@@ -124,7 +124,7 @@ RowStatus StringArrayFlightSqlAccessor<TARGET_TYPE, CHAR_TYPE>::MoveSingleCellIm
     ColumnBinding* binding, int64_t arrow_row, int64_t i, int64_t& value_offset,
     bool update_value_offset, Diagnostics& diagnostics) {
   return MoveSingleCellToCharBuffer<CHAR_TYPE>(buffer_, last_arrow_row_,
-#if defined _WIN32 || defined _WIN64
+#if defined _WIN32
                                                clocale_str_,
 #endif
                                                binding, this->GetArray(), arrow_row, i,

cpp/src/arrow/flight/sql/odbc/odbc_impl/accessors/string_array_accessor.h

@@ -41,7 +41,7 @@ class StringArrayFlightSqlAccessor
 
  private:
   std::vector<uint8_t> buffer_;
-#if defined _WIN32 || defined _WIN64
+#if defined _WIN32
   std::string clocale_str_;
 #endif
   int64_t last_arrow_row_;

cpp/src/arrow/flight/sql/odbc/odbc_impl/flight_sql_connection.cc

@@ -212,7 +212,7 @@ boost::optional<int32_t> FlightSqlConnection::GetStringColumnLength(
 }
 
 bool FlightSqlConnection::GetUseWideChar(const ConnPropertyMap& conn_property_map) {
-#if defined _WIN32 || defined _WIN64
+#if defined _WIN32
   // Windows should use wide chars by default
   bool default_value = true;
 #else

cpp/src/arrow/flight/sql/odbc/odbc_impl/system_trust_store.cc

@@ -17,7 +17,7 @@
 
 #include "arrow/flight/sql/odbc/odbc_impl/system_trust_store.h"
 
-#if defined _WIN32 || defined _WIN64
+#if defined _WIN32
 
 namespace arrow::flight::sql::odbc {
 bool SystemTrustStore::HasNext() {

cpp/src/arrow/flight/sql/odbc/odbc_impl/system_trust_store.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#if defined _WIN32 || defined _WIN64
+#if defined _WIN32
 
 #  include <windows.h>
 

cpp/src/arrow/flight/sql/odbc/odbc_impl/ui/custom_window.cc

@@ -19,11 +19,12 @@
 // before Windowsx.h and commctrl.h
 #include "arrow/flight/sql/odbc/odbc_impl/platform.h"
 
+#include "arrow/util/logging.h"
+
 #include <Windowsx.h>
 #include <commctrl.h>
 
 #include <wtypes.h>
-#include <cassert>
 #include <sstream>
 
 #include "arrow/flight/sql/odbc/odbc_impl/exceptions.h"
@@ -53,7 +54,7 @@ LRESULT CALLBACK CustomWindow::WndProc(HWND hwnd, UINT msg, WPARAM wparam,
 
   switch (msg) {
     case WM_NCCREATE: {
-      assert(lparam != NULL);
+      ARROW_DCHECK_NE(lparam, NULL);
 
       CREATESTRUCT* create_struct = reinterpret_cast<CREATESTRUCT*>(lparam);
 
@@ -65,7 +66,7 @@ LRESULT CALLBACK CustomWindow::WndProc(HWND hwnd, UINT msg, WPARAM wparam,
     }
 
     case WM_CREATE: {
-      assert(window != NULL);
+      ARROW_DCHECK_NE(window, NULL);
 
       window->SetHandle(hwnd);
 

…light/sql/odbc/install/install_amd64.cmd …/flight/sql/odbc/script/install_odbc.cmdcpp/src/arrow/flight/sql/odbc/install/install_amd64.cmd renamed to cpp/src/arrow/flight/sql/odbc/script/install_odbc.cmd cpp/src/arrow/flight/sql/odbc/install/install_amd64.cmd renamed to cpp/src/arrow/flight/sql/odbc/script/install_odbc.cmd

@@ -17,37 +17,37 @@
 
 @echo off
 
-set ODBC_AMD64=%1
+set ODBC_64BIT=%1
 
 @REM enable delayed variable expansion to make environment variables enclosed with "!" to be evaluated 
 @REM when the command is executed instead of when the command is parsed
 setlocal enableextensions enabledelayedexpansion
 
-if [%ODBC_AMD64%] == [] (
-	echo error: 64-bit driver is not specified. Call format: install_amd64 abs_path_to_64_bit_driver
+if [%ODBC_64BIT%] == [] (
+	echo error: 64-bit driver is not specified. Call format: install_odbc abs_path_to_64_bit_driver
 	pause
 	exit /b 1
 )
 
-if exist %ODBC_AMD64% (
-	for %%i IN (%ODBC_AMD64%) DO IF EXIST %%~si\NUL (
+if exist %ODBC_64BIT% (
+	for %%i IN (%ODBC_64BIT%) DO IF EXIST %%~si\NUL (
 		echo warning: The path you have specified seems to be a directory. Note that you have to specify path to driver file itself instead.
 	)
-	echo Installing 64-bit driver: %ODBC_AMD64%
+	echo Installing 64-bit driver: %ODBC_64BIT%
 	reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\Apache Arrow Flight SQL ODBC Driver" /v DriverODBCVer /t REG_SZ /d "03.80" /f
 	reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\Apache Arrow Flight SQL ODBC Driver" /v UsageCount /t REG_DWORD /d 00000001 /f
-	reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\Apache Arrow Flight SQL ODBC Driver" /v Driver /t REG_SZ /d %ODBC_AMD64% /f
-	reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\Apache Arrow Flight SQL ODBC Driver" /v Setup /t REG_SZ /d %ODBC_AMD64% /f
+	reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\Apache Arrow Flight SQL ODBC Driver" /v Driver /t REG_SZ /d %ODBC_64BIT% /f
+	reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\Apache Arrow Flight SQL ODBC Driver" /v Setup /t REG_SZ /d %ODBC_64BIT% /f
 	reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers" /v "Apache Arrow Flight SQL ODBC Driver" /t REG_SZ /d "Installed" /f
 
-	IF !ERRORLEVEL! NEQ 0 (
+	if !ERRORLEVEL! NEQ 0 (
 		echo Error occurred while registering 64-bit driver. Exiting.
 		echo ERRORLEVEL: !ERRORLEVEL!
 		exit !ERRORLEVEL!
 	)
 ) else (
-	echo 64-bit driver can not be found: %ODBC_AMD64%
-	echo Call format: install_amd64 abs_path_to_64_bit_driver
+	echo 64-bit driver can not be found: %ODBC_64BIT%
+	echo Call format: install_odbc abs_path_to_64_bit_driver
 	pause
 	exit /b 1
 )