Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ add_library(arrow_odbc_spi_impl
system_trust_store.cc
system_trust_store.h
types.h
type_fwd.h
type_utilities.h
util.cc
util.h)
Expand Down
7 changes: 1 addition & 6 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_connection.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,14 @@

#include <arrow/flight/sql/odbc/odbc_impl/spi/connection.h>
#include "arrow/flight/sql/odbc/odbc_impl/odbc_handle.h"
#include "arrow/flight/sql/odbc/odbc_impl/type_fwd.h"

#include <sql.h>
#include <map>
#include <memory>
#include <optional>
#include <vector>

namespace ODBC {
class ODBCEnvironment;
class ODBCDescriptor;
class ODBCStatement;
} // namespace ODBC

/**
* @brief An abstraction over an ODBC connection handle. This also wraps an SPI
* Connection.
Expand Down
7 changes: 1 addition & 6 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_descriptor.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#pragma once

#include "arrow/flight/sql/odbc/odbc_impl/odbc_handle.h"
#include "arrow/flight/sql/odbc/odbc_impl/type_fwd.h"

#include <sql.h>
#include <sqlext.h>
Expand All @@ -26,13 +27,7 @@
#include <string>
#include <vector>

namespace arrow::flight::sql::odbc {
class ResultSetMetadata;
} // namespace arrow::flight::sql::odbc

namespace ODBC {
class ODBCConnection;
class ODBCStatement;

struct DescriptorRecord {
std::string base_column_name;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#pragma once

#include "arrow/flight/sql/odbc/odbc_impl/odbc_handle.h"
#include "arrow/flight/sql/odbc/odbc_impl/type_fwd.h"

#include <sql.h>
#include <memory>
Expand All @@ -28,7 +29,6 @@ class Driver;
} // namespace arrow::flight::sql::odbc

namespace ODBC {
class ODBCConnection;

/**
* @brief An abstraction over an ODBC environment handle.
Expand Down
8 changes: 1 addition & 7 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/odbc_statement.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,14 @@
#pragma once

#include "arrow/flight/sql/odbc/odbc_impl/odbc_handle.h"
#include "arrow/flight/sql/odbc/odbc_impl/type_fwd.h"

#include <arrow/flight/sql/odbc/odbc_impl/platform.h>
#include <sql.h>
#include <memory>
#include <string>

namespace arrow::flight::sql::odbc {
class Statement;
class ResultSet;
} // namespace arrow::flight::sql::odbc

namespace ODBC {
class ODBCConnection;
class ODBCDescriptor;

/**
* @brief An abstraction over an ODBC connection handle. This also wraps an SPI
Expand Down
3 changes: 1 addition & 2 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/spi/connection.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

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

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

Expand All @@ -42,8 +43,6 @@ struct CaseInsensitiveComparator {
// PropertyMap is case-insensitive for keys.
typedef std::map<std::string, std::string, CaseInsensitiveComparator> PropertyMap;

class Statement;

/// \brief High-level representation of an ODBC connection.
class Connection {
protected:
Expand Down
3 changes: 1 addition & 2 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/spi/result_set.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,12 @@
#include "arrow/flight/sql/odbc/odbc_impl/platform.h"

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

#include <sqltypes.h>

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

class ResultSetMetadata;

class ResultSet {
protected:
ResultSet() = default;
Expand Down
6 changes: 2 additions & 4 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/spi/statement.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,9 @@
#include <optional>
#include <vector>

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

class ResultSet;
#include "arrow/flight/sql/odbc/odbc_impl/type_fwd.h"

class ResultSetMetadata;
namespace arrow::flight::sql::odbc {

/// \brief High-level representation of an ODBC statement.
class Statement {
Expand Down
31 changes: 31 additions & 0 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/type_fwd.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

#pragma once

namespace arrow::flight::sql::odbc {
class Statement;
class ResultSet;
class ResultSetMetadata;
}

namespace ODBC {
class ODBCEnvironment;
class ODBCDescriptor;
class ODBCStatement;
class ODBCConnection;
}