Skip to content

Commit 380e405

Browse files
authored
Enable ODBC build on Windows Glib & Ruby workflows
* Fix `boost::get` issue on GLib workflow * Fix GLib build issue with conflicts Compile entry_points.cc before odbc_api.cc due to conflict from sql.h and flight/types.h.
1 parent bc78dc8 commit 380e405

File tree

5 files changed

+10
-1
lines changed

5 files changed

+10
-1
lines changed

.github/workflows/ruby.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ jobs:
219219
ARROW_DATASET: ON
220220
ARROW_FLIGHT: ON
221221
ARROW_FLIGHT_SQL: ON
222+
ARROW_FLIGHT_SQL_ODBC: ON
222223
ARROW_GANDIVA: ON
223224
ARROW_GCS: ON
224225
ARROW_HDFS: OFF
@@ -331,6 +332,7 @@ jobs:
331332
ARROW_DEPENDENCY_USE_SHARED: OFF
332333
ARROW_FLIGHT: ON
333334
ARROW_FLIGHT_SQL: ON
335+
ARROW_FLIGHT_SQL_ODBC: ON
334336
ARROW_GANDIVA: OFF
335337
ARROW_GLIB_VAPI: "false"
336338
ARROW_HDFS: OFF

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ set(ODBC_PACKAGE_VERSION_PATCH "0")
6161
set(ODBC_PACKAGE_NAME "Apache Arrow Flight SQL ODBC")
6262
set(ODBC_PACKAGE_VENDOR "Apache Arrow")
6363

64-
set(ARROW_FLIGHT_SQL_ODBC_SRCS entry_points.cc odbc_api.cc)
64+
# Compile entry_points.cc before odbc_api.cc due to conflict from sql.h and flight/types.h
65+
set(ARROW_FLIGHT_SQL_ODBC_SRCS odbc_api.cc entry_points.cc)
6566

6667
if(WIN32)
6768
set(VER_FILEVERSION

cpp/src/arrow/flight/sql/odbc/flight_sql/flight_sql_statement_get_columns.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18+
#pragma once
19+
1820
#include <optional>
1921
#include "arrow/array/builder_binary.h"
2022
#include "arrow/array/builder_primitive.h"

cpp/src/arrow/flight/sql/odbc/flight_sql/flight_sql_statement_get_type_info.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18+
#pragma once
19+
1820
#include <optional>
1921
#include "arrow/array/builder_binary.h"
2022
#include "arrow/array/builder_primitive.h"

cpp/src/arrow/flight/sql/odbc/flight_sql/utils.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717

1818
#pragma once
1919

20+
#include <boost/variant.hpp>
2021
#include <boost/xpressive/xpressive.hpp>
22+
2123
#include <codecvt>
2224
#include <functional>
2325
#include <optional>

0 commit comments

Comments
 (0)