Use arrow-adbc in includes

apache · Jul 5, 2024 · 851e1c1 · 851e1c1
1 parent ce397a9
commit 851e1c1
Show file tree

Hide file tree

Showing 62 changed files with 69 additions and 63 deletions.
diff --git a/c/CMakeLists.txt b/c/CMakeLists.txt
@@ -35,7 +35,8 @@ add_subdirectory(vendor/nanoarrow)
 add_subdirectory(driver/common)
 add_subdirectory(driver/framework)
 
-install(FILES "${REPOSITORY_ROOT}/c/include/adbc.h" DESTINATION include/arrow-adbc)
+install(FILES "${REPOSITORY_ROOT}/c/include/arrow-adbc/adbc.h"
+        DESTINATION include/arrow-adbc)
 
 if(ADBC_BUILD_TESTS)
   add_subdirectory(validation)

diff --git a/c/driver/common/driver_base.h b/c/driver/common/driver_base.h
@@ -23,7 +23,7 @@
 #include <utility>
 #include <vector>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 
 // This file defines a developer-friendly way to create an ADBC driver, currently intended
 // for testing the R driver manager. It handles errors, option getting/setting, and

diff --git a/c/driver/common/driver_test.cc b/c/driver/common/driver_test.cc
@@ -18,7 +18,7 @@
 #include <gtest/gtest.h>
 #include <cstring>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 #include "driver_base.h"
 
 // Self-contained version of the Handle

diff --git a/c/driver/common/utils.c b/c/driver/common/utils.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 
 static size_t kErrorBufferSize = 1024;
 

diff --git a/c/driver/common/utils.h b/c/driver/common/utils.h
@@ -22,7 +22,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 #include "nanoarrow/nanoarrow.h"
 
 #ifdef __cplusplus

diff --git a/c/driver/flightsql/dremio_flightsql_test.cc b/c/driver/flightsql/dremio_flightsql_test.cc
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest-matchers.h>
 #include <gtest/gtest-param-test.h>

diff --git a/c/driver/flightsql/sqlite_flightsql_test.cc b/c/driver/flightsql/sqlite_flightsql_test.cc
@@ -20,7 +20,7 @@
 #include <random>
 #include <thread>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest-matchers.h>
 #include <gtest/gtest-param-test.h>

diff --git a/c/driver/framework/base_connection.h b/c/driver/framework/base_connection.h
@@ -24,7 +24,7 @@
 #include <utility>
 #include <vector>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 #include <nanoarrow/nanoarrow.h>
 #include <nanoarrow/nanoarrow.hpp>
 

diff --git a/c/driver/framework/base_database.h b/c/driver/framework/base_database.h
@@ -20,7 +20,7 @@
 #include <string_view>
 #include <utility>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 
 #include "driver/framework/base_driver.h"
 #include "driver/framework/status.h"

diff --git a/c/driver/framework/base_driver.h b/c/driver/framework/base_driver.h
@@ -28,7 +28,7 @@
 #include <variant>
 #include <vector>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 #include <fmt/core.h>
 #include <fmt/format.h>
 

diff --git a/c/driver/framework/catalog.h b/c/driver/framework/catalog.h
@@ -25,7 +25,7 @@
 #include <variant>
 #include <vector>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 
 #include "driver/framework/status.h"
 

diff --git a/c/driver/framework/status.h b/c/driver/framework/status.h
@@ -25,7 +25,7 @@
 #include <variant>
 #include <vector>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 #include <fmt/core.h>
 
 /// \file status.h

diff --git a/c/driver/postgresql/connection.cc b/c/driver/postgresql/connection.cc
@@ -28,7 +28,7 @@
 #include <utility>
 #include <vector>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 #include <libpq-fe.h>
 
 #include "database.h"

diff --git a/c/driver/postgresql/connection.h b/c/driver/postgresql/connection.h
@@ -20,7 +20,7 @@
 #include <cstdint>
 #include <memory>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 #include <libpq-fe.h>
 
 #include "postgres_type.h"

diff --git a/c/driver/postgresql/database.cc b/c/driver/postgresql/database.cc
@@ -23,7 +23,7 @@
 #include <utility>
 #include <vector>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 #include <libpq-fe.h>
 #include <nanoarrow/nanoarrow.h>
 

diff --git a/c/driver/postgresql/database.h b/c/driver/postgresql/database.h
@@ -21,7 +21,7 @@
 #include <memory>
 #include <string>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 #include <libpq-fe.h>
 
 #include "postgres_type.h"

diff --git a/c/driver/postgresql/error.h b/c/driver/postgresql/error.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 #include <libpq-fe.h>
 
 namespace adbcpq {

diff --git a/c/driver/postgresql/postgres_util.h b/c/driver/postgresql/postgres_util.h
@@ -33,7 +33,7 @@
 #include <libkern/OSByteOrder.h>
 #endif
 
-#include "adbc.h"
+#include "arrow-adbc/adbc.h"
 
 namespace adbcpq {
 

diff --git a/c/driver/postgresql/postgresql.cc b/c/driver/postgresql/postgresql.cc
@@ -20,7 +20,7 @@
 #include <cstring>
 #include <memory>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 
 #include "connection.h"
 #include "database.h"

diff --git a/c/driver/postgresql/postgresql_benchmark.cc b/c/driver/postgresql/postgresql_benchmark.cc
@@ -20,7 +20,7 @@
 #include <benchmark/benchmark.h>
 #include <nanoarrow/nanoarrow.hpp>
 
-#include "adbc.h"
+#include "arrow-adbc/adbc.h"
 #include "validation/adbc_validation_util.h"
 
 #define _ADBC_BENCHMARK_RETURN_NOT_OK_IMPL(NAME, EXPR) \

diff --git a/c/driver/postgresql/postgresql_test.cc b/c/driver/postgresql/postgresql_test.cc
@@ -24,7 +24,7 @@
 #include <optional>
 #include <variant>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 #include <gtest/gtest-param-test.h>
 #include <gtest/gtest.h>
 #include <nanoarrow/nanoarrow.h>

diff --git a/c/driver/postgresql/result_helper.h b/c/driver/postgresql/result_helper.h
@@ -23,7 +23,7 @@
 #include <utility>
 #include <vector>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 #include <libpq-fe.h>
 
 namespace adbcpq {

diff --git a/c/driver/postgresql/statement.cc b/c/driver/postgresql/statement.cc
@@ -32,7 +32,7 @@
 #include <utility>
 #include <vector>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 #include <libpq-fe.h>
 #include <nanoarrow/nanoarrow.hpp>
 

diff --git a/c/driver/postgresql/statement.h b/c/driver/postgresql/statement.h
@@ -22,7 +22,7 @@
 #include <string>
 #include <vector>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 #include <libpq-fe.h>
 #include <nanoarrow/nanoarrow.h>
 

diff --git a/c/driver/snowflake/snowflake_test.cc b/c/driver/snowflake/snowflake_test.cc
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest-matchers.h>
 #include <gtest/gtest-param-test.h>

diff --git a/c/driver/sqlite/sqlite.cc b/c/driver/sqlite/sqlite.cc
@@ -18,7 +18,7 @@
 #include <cstdarg>
 #include <limits>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 #include <nanoarrow/nanoarrow.h>
 #include <sqlite3.h>
 #include <nanoarrow/nanoarrow.hpp>

diff --git a/c/driver/sqlite/sqlite_test.cc b/c/driver/sqlite/sqlite_test.cc
@@ -21,7 +21,7 @@
 #include <string>
 #include <string_view>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest-matchers.h>
 #include <gtest/gtest-param-test.h>

diff --git a/c/driver/sqlite/statement_reader.c b/c/driver/sqlite/statement_reader.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <time.h>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 #include <nanoarrow/nanoarrow.h>
 #include <sqlite3.h>
 

diff --git a/c/driver/sqlite/statement_reader.h b/c/driver/sqlite/statement_reader.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 #include <nanoarrow/nanoarrow.h>
 #include <sqlite3.h>
 

diff --git a/c/driver_manager/adbc_driver_manager.cc b/c/driver_manager/adbc_driver_manager.cc
@@ -16,7 +16,7 @@
 // under the License.
 
 #include "adbc_driver_manager.h"
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 
 #include <algorithm>
 #include <array>

diff --git a/c/driver_manager/adbc_driver_manager.h b/c/driver_manager/adbc_driver_manager.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/c/driver_manager/adbc_driver_manager_test.cc b/c/driver_manager/adbc_driver_manager_test.cc
@@ -22,8 +22,8 @@
 #include <string>
 #include <vector>
 
-#include "adbc.h"
 #include "adbc_driver_manager.h"
+#include "arrow-adbc/adbc.h"
 #include "validation/adbc_validation.h"
 #include "validation/adbc_validation_util.h"
 

diff --git a/c/driver_manager/adbc_version_100.h b/c/driver_manager/adbc_version_100.h
@@ -17,7 +17,7 @@
 
 // A dummy version 1.0.0 ADBC driver to test compatibility.
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/c/driver_manager/adbc_version_100_compatibility_test.cc b/c/driver_manager/adbc_version_100_compatibility_test.cc
@@ -20,9 +20,9 @@
 
 #include <memory>
 
-#include "adbc.h"
 #include "adbc_driver_manager.h"
 #include "adbc_version_100.h"
+#include "arrow-adbc/adbc.h"
 #include "validation/adbc_validation_util.h"
 
 namespace adbc {

diff --git a/c/include/adbc.h → c/include/arrow-adbc/adbc.h b/c/include/adbc.h → c/include/arrow-adbc/adbc.h
diff --git a/c/integration/duckdb/duckdb_test.cc b/c/integration/duckdb/duckdb_test.cc
@@ -17,7 +17,7 @@
 
 #include <cstdlib>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 #include <driver_manager/adbc_driver_manager.h>
 #include <duckdb/common/adbc/adbc-init.hpp>
 

diff --git a/c/meson.build b/c/meson.build
@@ -34,7 +34,7 @@ add_project_arguments('-Wno-unused-parameter', '-Wno-reorder', language: 'cpp')
 
 c_dir = include_directories('.')
 include_dir = include_directories('include')
-install_headers('include/adbc.h', subdir: 'arrow-adbc')
+install_headers('include/arrow-adbc/adbc.h', subdir: 'arrow-adbc')
 driver_dir = include_directories('driver')
 nanoarrow_dep = dependency('nanoarrow')
 fmt_dep = dependency('fmt')

diff --git a/c/validation/adbc_validation.cc b/c/validation/adbc_validation.cc
@@ -29,7 +29,7 @@
 #include <variant>
 #include <vector>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest-matchers.h>
 #include <gtest/gtest.h>

diff --git a/c/validation/adbc_validation.h b/c/validation/adbc_validation.h
@@ -23,7 +23,7 @@
 #include <variant>
 #include <vector>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 #include <gtest/gtest.h>
 #include <nanoarrow/nanoarrow.h>
 

diff --git a/c/validation/adbc_validation_connection.cc b/c/validation/adbc_validation_connection.cc
@@ -19,7 +19,7 @@
 
 #include <cstring>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 

diff --git a/c/validation/adbc_validation_database.cc b/c/validation/adbc_validation_database.cc
@@ -19,7 +19,7 @@
 
 #include <cstring>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 

diff --git a/c/validation/adbc_validation_statement.cc b/c/validation/adbc_validation_statement.cc
@@ -19,7 +19,7 @@
 
 #include <cstring>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <nanoarrow/nanoarrow.h>

diff --git a/c/validation/adbc_validation_util.cc b/c/validation/adbc_validation_util.cc
@@ -16,7 +16,7 @@
 // under the License.
 
 #include "adbc_validation_util.h"
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 
 #include "adbc_validation.h"
 

diff --git a/c/validation/adbc_validation_util.h b/c/validation/adbc_validation_util.h
@@ -27,7 +27,7 @@
 #include <utility>
 #include <vector>
 
-#include <adbc.h>
+#include <arrow-adbc/adbc.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <nanoarrow/nanoarrow.h>

diff --git a/docs/source/driver/flight_sql.rst b/docs/source/driver/flight_sql.rst
@@ -91,7 +91,7 @@ the :cpp:class:`AdbcDatabase`.
 
       .. code-block:: cpp
 
-         #include "adbc.h"
+         #include "arrow-adbc/adbc.h"
 
          // Ignoring error handling
          struct AdbcDatabase database;