Skip to content

Refactor odbcabstraction and odbc_impl #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
justing-bq merged 1 commit into from
Oct 2, 2025
Merged

Refactor odbcabstraction and odbc_impl #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions cpp/src/arrow/flight/sql/odbc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ endif()

add_definitions(-DUNICODE=1)

add_subdirectory(flight_sql)
add_subdirectory(odbcabstraction)
add_subdirectory(odbc_impl)
add_subdirectory(tests)

arrow_install_all_headers("arrow/flight/sql/odbc")
Expand Down Expand Up @@ -90,7 +89,6 @@ add_arrow_lib(arrow_flight_sql_odbc
SHARED_PRIVATE_LINK_LIBS
${ODBC_LIBRARIES}
${ODBCINST}
odbcabstraction
arrow_odbc_spi_impl)

foreach(LIB_TARGET ${ARROW_FLIGHT_SQL_ODBC_LIBRARIES})
Expand Down
10 changes: 5 additions & 5 deletions cpp/src/arrow/flight/sql/odbc/entry_points.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// under the License.

// platform.h includes windows.h, so it needs to be included first
#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/platform.h"
#include "arrow/flight/sql/odbc/odbc_impl/platform.h"

#ifdef _WIN32
# include <windows.h>
Expand All @@ -30,10 +30,10 @@
#include "arrow/flight/sql/odbc/odbc_api.h"
#include "arrow/flight/sql/odbc/visibility.h"

#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/odbc_impl/odbc_connection.h"
#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/odbc_impl/odbc_descriptor.h"
#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/odbc_impl/odbc_environment.h"
#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/odbc_impl/odbc_statement.h"
#include "arrow/flight/sql/odbc/odbc_impl/odbc_connection.h"
#include "arrow/flight/sql/odbc/odbc_impl/odbc_descriptor.h"
#include "arrow/flight/sql/odbc/odbc_impl/odbc_environment.h"
#include "arrow/flight/sql/odbc/odbc_impl/odbc_statement.h"

#include "arrow/util/logging.h"

Expand Down
26 changes: 13 additions & 13 deletions cpp/src/arrow/flight/sql/odbc/odbc_api.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@
// under the License.

// flight_sql_connection.h needs to be included first due to conflicts with windows.h
#include "arrow/flight/sql/odbc/flight_sql/flight_sql_connection.h"

#include "arrow/flight/sql/odbc/flight_sql/include/flight_sql/config/configuration.h"
#include "arrow/flight/sql/odbc/flight_sql/include/flight_sql/flight_sql_driver.h"
#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/diagnostics.h"
#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/odbc_impl/attribute_utils.h"
#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/odbc_impl/encoding_utils.h"
#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/odbc_impl/odbc_connection.h"
#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/odbc_impl/odbc_descriptor.h"
#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/odbc_impl/odbc_environment.h"
#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/odbc_impl/odbc_statement.h"
#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/spi/connection.h"
#include "arrow/flight/sql/odbc/odbc_impl/flight_sql_connection.h"

#include "arrow/flight/sql/odbc/odbc_impl/attribute_utils.h"
#include "arrow/flight/sql/odbc/odbc_impl/config/configuration.h"
#include "arrow/flight/sql/odbc/odbc_impl/diagnostics.h"
#include "arrow/flight/sql/odbc/odbc_impl/encoding_utils.h"
#include "arrow/flight/sql/odbc/odbc_impl/flight_sql_driver.h"
#include "arrow/flight/sql/odbc/odbc_impl/odbc_connection.h"
#include "arrow/flight/sql/odbc/odbc_impl/odbc_descriptor.h"
#include "arrow/flight/sql/odbc/odbc_impl/odbc_environment.h"
#include "arrow/flight/sql/odbc/odbc_impl/odbc_statement.h"
#include "arrow/flight/sql/odbc/odbc_impl/spi/connection.h"
#include "arrow/util/logging.h"

#if defined _WIN32 || defined _WIN64
// For displaying DSN Window
# include "arrow/flight/sql/odbc/flight_sql/system_dsn.h"
# include "arrow/flight/sql/odbc/odbc_impl/system_dsn.h"
#endif

// odbc_api includes windows.h, which needs to be put behind winsock2.h.
Expand Down
57 changes: 42 additions & 15 deletions ...flight/sql/odbc/flight_sql/CMakeLists.txt → .../flight/sql/odbc/odbc_impl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
# under the License.

add_library(arrow_odbc_spi_impl
include/flight_sql/flight_sql_driver.h
include/flight_sql/config/configuration.h
include/flight_sql/config/connection_string_parser.h
accessors/binary_array_accessor.cc
accessors/binary_array_accessor.h
accessors/boolean_array_accessor.cc
Expand All @@ -39,11 +36,28 @@ add_library(arrow_odbc_spi_impl
accessors/timestamp_array_accessor.h
address_info.cc
address_info.h
attribute_utils.h
blocking_queue.h
calendar_utils.cc
calendar_utils.h
config/configuration.cc
config/configuration.h
config/connection_string_parser.cc
config/connection_string_parser.h
diagnostics.cc
diagnostics.h
error_codes.h
encoding.cc
encoding.h
encoding_utils.h
exceptions.cc
exceptions.h
flight_sql_auth_method.cc
flight_sql_auth_method.h
flight_sql_connection.cc
flight_sql_connection.h
flight_sql_driver.cc
flight_sql_driver.h
flight_sql_get_tables_reader.cc
flight_sql_get_tables_reader.h
flight_sql_get_type_info_reader.cc
Expand Down Expand Up @@ -72,37 +86,50 @@ add_library(arrow_odbc_spi_impl
get_info_cache.h
json_converter.cc
json_converter.h
odbc_connection.cc
odbc_connection.h
odbc_descriptor.cc
odbc_descriptor.h
odbc_environment.cc
odbc_environment.h
odbc_handle.h
odbc_statement.cc
odbc_statement.h
platform.h
record_batch_transformer.cc
record_batch_transformer.h
scalar_function_reporter.cc
scalar_function_reporter.h
spi/connection.h
spi/driver.h
spi/result_set.h
spi/result_set_metadata.h
spi/statement.h
system_trust_store.cc
system_trust_store.h
config/configuration.cc
config/connection_string_parser.cc
types.h
type_utilities.h
util.cc
util.h)
target_include_directories(arrow_odbc_spi_impl
PUBLIC include include/flight_sql
${CMAKE_SOURCE_DIR}/odbcabstraction/include)
target_include_directories(arrow_odbc_spi_impl PUBLIC include include/odbc_impl)
target_include_directories(arrow_odbc_spi_impl PUBLIC ${CMAKE_CURRENT_LIST_DIR})

if(WIN32)
target_sources(arrow_odbc_spi_impl
PRIVATE include/flight_sql/ui/add_property_window.h
include/flight_sql/ui/custom_window.h
include/flight_sql/ui/dsn_configuration_window.h
include/flight_sql/ui/window.h
PRIVATE ui/add_property_window.cc
ui/add_property_window.h
ui/custom_window.cc
ui/window.cc
ui/custom_window.h
ui/dsn_configuration_window.cc
ui/add_property_window.cc
ui/dsn_configuration_window.h
ui/window.cc
ui/window.h
win_system_dsn.cc
system_dsn.cc
system_dsn.h)
endif()

target_link_libraries(arrow_odbc_spi_impl PUBLIC odbcabstraction arrow_flight_sql_shared
target_link_libraries(arrow_odbc_spi_impl PUBLIC arrow_flight_sql_shared
arrow_compute_shared Boost::locale)

# Link libraries on MINGW64 only
Expand Down
2 changes: 1 addition & 1 deletion ...ht_sql/accessors/binary_array_accessor.cc → ...c_impl/accessors/binary_array_accessor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

#include "arrow/flight/sql/odbc/flight_sql/accessors/binary_array_accessor.h"
#include "arrow/flight/sql/odbc/odbc_impl/accessors/binary_array_accessor.h"

#include <algorithm>
#include <cstdint>
Expand Down
4 changes: 2 additions & 2 deletions ...ght_sql/accessors/binary_array_accessor.h → ...bc_impl/accessors/binary_array_accessor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

#pragma once

#include "arrow/flight/sql/odbc/flight_sql/accessors/types.h"
#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/types.h"
#include "arrow/flight/sql/odbc/odbc_impl/accessors/types.h"
#include "arrow/flight/sql/odbc/odbc_impl/types.h"
#include "arrow/type_fwd.h"

namespace arrow::flight::sql::odbc {
Expand Down
2 changes: 1 addition & 1 deletion ...l/accessors/binary_array_accessor_test.cc → ...l/accessors/binary_array_accessor_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

#include "arrow/flight/sql/odbc/flight_sql/accessors/binary_array_accessor.h"
#include "arrow/flight/sql/odbc/odbc_impl/accessors/binary_array_accessor.h"
#include "arrow/testing/builder.h"
#include "arrow/testing/gtest_util.h"
#include "gtest/gtest.h"
Expand Down
2 changes: 1 addition & 1 deletion ...t_sql/accessors/boolean_array_accessor.cc → ..._impl/accessors/boolean_array_accessor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

#include "arrow/flight/sql/odbc/flight_sql/accessors/boolean_array_accessor.h"
#include "arrow/flight/sql/odbc/odbc_impl/accessors/boolean_array_accessor.h"

namespace arrow::flight::sql::odbc {

Expand Down
6 changes: 3 additions & 3 deletions ...ht_sql/accessors/boolean_array_accessor.h → ...c_impl/accessors/boolean_array_accessor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@

#pragma once

#include "arrow/flight/sql/odbc/flight_sql/accessors/types.h"
#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/diagnostics.h"
#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/types.h"
#include "arrow/flight/sql/odbc/odbc_impl/accessors/types.h"
#include "arrow/flight/sql/odbc/odbc_impl/diagnostics.h"
#include "arrow/flight/sql/odbc/odbc_impl/types.h"
#include "arrow/type_fwd.h"

namespace arrow::flight::sql::odbc {
Expand Down
2 changes: 1 addition & 1 deletion .../accessors/boolean_array_accessor_test.cc → .../accessors/boolean_array_accessor_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

#include "arrow/flight/sql/odbc/flight_sql/accessors/boolean_array_accessor.h"
#include "arrow/flight/sql/odbc/odbc_impl/accessors/boolean_array_accessor.h"
#include "arrow/testing/builder.h"
#include "gtest/gtest.h"

Expand Down
6 changes: 3 additions & 3 deletions ...ht/sql/odbc/flight_sql/accessors/common.h → ...ght/sql/odbc/odbc_impl/accessors/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
#include <cstdint>
#include <cstring>
#include "arrow/array.h"
#include "arrow/flight/sql/odbc/flight_sql/accessors/types.h"
#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/diagnostics.h"
#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/types.h"
#include "arrow/flight/sql/odbc/odbc_impl/accessors/types.h"
#include "arrow/flight/sql/odbc/odbc_impl/diagnostics.h"
#include "arrow/flight/sql/odbc/odbc_impl/types.h"
#include "arrow/scalar.h"

namespace arrow::flight::sql::odbc {
Expand Down
6 changes: 4 additions & 2 deletions ...ight_sql/accessors/date_array_accessor.cc → ...dbc_impl/accessors/date_array_accessor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@
// specific language governing permissions and limitations
// under the License.

#include "arrow/flight/sql/odbc/flight_sql/accessors/date_array_accessor.h"
#include "arrow/flight/sql/odbc/odbc_impl/accessors/date_array_accessor.h"

#include "arrow/flight/sql/odbc/odbc_impl/calendar_utils.h"

#include <time.h>
#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/calendar_utils.h"

using arrow::Date32Array;
using arrow::Date64Array;
Expand Down
4 changes: 2 additions & 2 deletions ...light_sql/accessors/date_array_accessor.h → ...odbc_impl/accessors/date_array_accessor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

#pragma once

#include "arrow/flight/sql/odbc/flight_sql/accessors/types.h"
#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/types.h"
#include "arrow/flight/sql/odbc/odbc_impl/accessors/types.h"
#include "arrow/flight/sql/odbc/odbc_impl/types.h"
#include "arrow/type_fwd.h"

namespace arrow::flight::sql::odbc {
Expand Down
7 changes: 4 additions & 3 deletions ...sql/accessors/date_array_accessor_test.cc → ...mpl/accessors/date_array_accessor_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@
// specific language governing permissions and limitations
// under the License.

#include "arrow/flight/sql/odbc/flight_sql/accessors/date_array_accessor.h"
#include "arrow/flight/sql/odbc/flight_sql/accessors/boolean_array_accessor.h"
#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/calendar_utils.h"
#include "arrow/flight/sql/odbc/odbc_impl/accessors/date_array_accessor.h"

#include "arrow/flight/sql/odbc/odbc_impl/accessors/boolean_array_accessor.h"
#include "arrow/flight/sql/odbc/odbc_impl/calendar_utils.h"
#include "arrow/testing/builder.h"
#include "gtest/gtest.h"

Expand Down
2 changes: 1 addition & 1 deletion ...t_sql/accessors/decimal_array_accessor.cc → ..._impl/accessors/decimal_array_accessor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

#include "arrow/flight/sql/odbc/flight_sql/accessors/decimal_array_accessor.h"
#include "arrow/flight/sql/odbc/odbc_impl/accessors/decimal_array_accessor.h"

#include "arrow/array.h"
#include "arrow/scalar.h"
Expand Down
6 changes: 3 additions & 3 deletions ...ht_sql/accessors/decimal_array_accessor.h → ...c_impl/accessors/decimal_array_accessor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
#pragma once

#include <locale>
#include "arrow/flight/sql/odbc/flight_sql/accessors/types.h"
#include "arrow/flight/sql/odbc/flight_sql/util.h"
#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/types.h"
#include "arrow/flight/sql/odbc/odbc_impl/accessors/types.h"
#include "arrow/flight/sql/odbc/odbc_impl/types.h"
#include "arrow/flight/sql/odbc/odbc_impl/util.h"
#include "arrow/type_fwd.h"

namespace arrow::flight::sql::odbc {
Expand Down
2 changes: 1 addition & 1 deletion .../accessors/decimal_array_accessor_test.cc → .../accessors/decimal_array_accessor_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

#include "arrow/flight/sql/odbc/flight_sql/accessors/decimal_array_accessor.h"
#include "arrow/flight/sql/odbc/odbc_impl/accessors/decimal_array_accessor.h"
#include "arrow/builder.h"
#include "arrow/testing/builder.h"
#include "arrow/util/decimal.h"
Expand Down
16 changes: 8 additions & 8 deletions ...ight/sql/odbc/flight_sql/accessors/main.h → ...light/sql/odbc/odbc_impl/accessors/main.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@

#pragma once

#include "arrow/flight/sql/odbc/flight_sql/accessors/binary_array_accessor.h"
#include "arrow/flight/sql/odbc/flight_sql/accessors/boolean_array_accessor.h"
#include "arrow/flight/sql/odbc/flight_sql/accessors/date_array_accessor.h"
#include "arrow/flight/sql/odbc/flight_sql/accessors/decimal_array_accessor.h"
#include "arrow/flight/sql/odbc/flight_sql/accessors/primitive_array_accessor.h"
#include "arrow/flight/sql/odbc/flight_sql/accessors/string_array_accessor.h"
#include "arrow/flight/sql/odbc/flight_sql/accessors/time_array_accessor.h"
#include "arrow/flight/sql/odbc/flight_sql/accessors/timestamp_array_accessor.h"
#include "arrow/flight/sql/odbc/odbc_impl/accessors/binary_array_accessor.h"
#include "arrow/flight/sql/odbc/odbc_impl/accessors/boolean_array_accessor.h"
#include "arrow/flight/sql/odbc/odbc_impl/accessors/date_array_accessor.h"
#include "arrow/flight/sql/odbc/odbc_impl/accessors/decimal_array_accessor.h"
#include "arrow/flight/sql/odbc/odbc_impl/accessors/primitive_array_accessor.h"
#include "arrow/flight/sql/odbc/odbc_impl/accessors/string_array_accessor.h"
#include "arrow/flight/sql/odbc/odbc_impl/accessors/time_array_accessor.h"
#include "arrow/flight/sql/odbc/odbc_impl/accessors/timestamp_array_accessor.h"
2 changes: 1 addition & 1 deletion ...sql/accessors/primitive_array_accessor.cc → ...mpl/accessors/primitive_array_accessor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

#include "arrow/flight/sql/odbc/flight_sql/accessors/primitive_array_accessor.h"
#include "arrow/flight/sql/odbc/odbc_impl/accessors/primitive_array_accessor.h"

namespace arrow::flight::sql::odbc {

Expand Down
8 changes: 4 additions & 4 deletions ..._sql/accessors/primitive_array_accessor.h → ...impl/accessors/primitive_array_accessor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
#pragma once

#include "arrow/array.h"
#include "arrow/flight/sql/odbc/flight_sql/accessors/common.h"
#include "arrow/flight/sql/odbc/flight_sql/accessors/types.h"
#include "arrow/flight/sql/odbc/flight_sql/flight_sql_result_set.h"
#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/types.h"
#include "arrow/flight/sql/odbc/odbc_impl/accessors/common.h"
#include "arrow/flight/sql/odbc/odbc_impl/accessors/types.h"
#include "arrow/flight/sql/odbc/odbc_impl/flight_sql_result_set.h"
#include "arrow/flight/sql/odbc/odbc_impl/types.h"
#include "arrow/scalar.h"

namespace arrow::flight::sql::odbc {
Expand Down
5 changes: 3 additions & 2 deletions ...ccessors/primitive_array_accessor_test.cc → ...ccessors/primitive_array_accessor_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
// specific language governing permissions and limitations
// under the License.

#include "arrow/flight/sql/odbc/flight_sql/accessors/primitive_array_accessor.h"
#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/diagnostics.h"
#include "arrow/flight/sql/odbc/odbc_impl/accessors/primitive_array_accessor.h"

#include "arrow/flight/sql/odbc/odbc_impl/diagnostics.h"
#include "arrow/testing/builder.h"
#include "gtest/gtest.h"

Expand Down
4 changes: 2 additions & 2 deletions ...ht_sql/accessors/string_array_accessor.cc → ...c_impl/accessors/string_array_accessor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
// specific language governing permissions and limitations
// under the License.

#include "arrow/flight/sql/odbc/flight_sql/accessors/string_array_accessor.h"
#include "arrow/flight/sql/odbc/odbc_impl/accessors/string_array_accessor.h"

#include <boost/locale.hpp>
#include <cstring>
#include "arrow/array.h"
#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/encoding.h"
#include "arrow/flight/sql/odbc/odbc_impl/encoding.h"

namespace arrow::flight::sql::odbc {

Expand Down
Loading
Loading