Implement SQLAllocEnv

Fix cmake build

Author: alinaliBQ

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

@@ -64,7 +64,7 @@ add_arrow_lib(arrow_flight_sql_odbc
               SHARED_INSTALL_INTERFACE_LIBS ArrowFlight::arrow_flight_sql_shared
               STATIC_LINK_LIBS arrow_flight_sql_static
               STATIC_INSTALL_INTERFACE_LIBS ArrowFlight::arrow_flight_sql_static
-              SHARED_PRIVATE_LINK_LIBS ODBC::ODBC)
+              SHARED_PRIVATE_LINK_LIBS ODBC::ODBC odbcabstraction arrow_odbc_spi_impl)
 
 foreach(LIB_TARGET ${ARROW_FLIGHT_SQL_ODBC_LIBRARIES})
   target_compile_definitions(${LIB_TARGET} PRIVATE ARROW_FLIGHT_SQL_ODBC_EXPORTING)

cpp/src/arrow/flight/sql/odbc/odbc_api.cc

@@ -16,11 +16,12 @@
 // under the License.
 
 
-#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/odbc_impl/odbc_environment.h"
+#include <arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/odbc_impl/odbc_environment.h>
+#include <arrow/flight/sql/odbc/flight_sql/include/flight_sql/flight_sql_driver.h>
 
 // odbc_api includes windows.h, which needs to be put behind winsock2.h.
 // odbc_environment.h includes winsock2.h
-#include "arrow/flight/sql/odbc/odbc_api.h"
+#include <arrow/flight/sql/odbc/odbc_api.h>
 
 namespace arrow
 {
@@ -30,20 +31,23 @@ namespace arrow
 
     switch (type)
     {
-      case SQL_HANDLE_ENV:
-        
-        // TODO: uncomment below code after flightsqlodbc is fixed
-        // using ODBCEnvironment;
-        // *result = reinterpret_cast< SQLHENV >(new ODBCEnvironment());
+      case SQL_HANDLE_ENV: {
+        using ODBC::ODBCEnvironment;
+        using driver::flight_sql::FlightSqlDriver;
 
-        // return SQL_SUCCESS
-        return SQL_INVALID_HANDLE;
-
-      case SQL_HANDLE_DBC:
+        std::shared_ptr< FlightSqlDriver > odbc_driver = std::shared_ptr< FlightSqlDriver >();
+        *result = reinterpret_cast< SQLHENV >(new ODBCEnvironment(odbc_driver));
+    
+        return SQL_SUCCESS;
+      }
+      
+      case SQL_HANDLE_DBC: {
         return SQL_INVALID_HANDLE;
+      }
 
-      case SQL_HANDLE_STMT:
+      case SQL_HANDLE_STMT: {
         return SQL_INVALID_HANDLE;
+      }
 
       default:
         break;

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

@@ -52,10 +52,13 @@ const boost::xpressive::sregex CONNECTION_STR_REGEX(
 // entries in the properties.
 void loadPropertiesFromDSN(const std::string& dsn,
                            Connection::ConnPropertyMap& properties) {
+  // TODO - fix build errors with configuration window
+  /*
   const size_t BUFFER_SIZE = 1024 * 10;
   std::vector<char> outputBuffer;
   outputBuffer.resize(BUFFER_SIZE, '\0');
   SQLSetConfigMode(ODBC_BOTH_DSN);
+
   SQLGetPrivateProfileString(dsn.c_str(), NULL, "", &outputBuffer[0], BUFFER_SIZE,
                              "odbc.ini");
 
@@ -81,14 +84,17 @@ void loadPropertiesFromDSN(const std::string& dsn,
   for (auto& key : keys) {
     outputBuffer.clear();
     outputBuffer.resize(BUFFER_SIZE, '\0');
+    
     SQLGetPrivateProfileString(dsn.c_str(), key.c_str(), "", &outputBuffer[0],
                                BUFFER_SIZE, "odbc.ini");
+
     std::string value = std::string(&outputBuffer[0]);
     auto propIter = properties.find(key);
     if (propIter == properties.end()) {
       properties.emplace(std::make_pair(std::move(key), std::move(value)));
     }
   }
+  */
 }
 
 }  // namespace