Skip to content
Open
Show file tree
Hide file tree
Changes from 4 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
18 changes: 18 additions & 0 deletions c/driver_manager/adbc_driver_manager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1764,6 +1764,12 @@ AdbcStatusCode StatementSetSubstraitPlan(struct AdbcStatement*, const uint8_t*,
return ADBC_STATUS_NOT_IMPLEMENTED;
}

AdbcStatusCode StatementRequestSchema(struct AdbcStatement*, struct ArrowSchema*,
struct AdbcError* error) {
SetError(error, "AdbcStatementRequestSchema not implemented");
return ADBC_STATUS_NOT_IMPLEMENTED;
}

/// Temporary state while the database is being configured.
struct TempDatabase {
std::unordered_map<std::string, std::string> options;
Expand Down Expand Up @@ -3159,6 +3165,17 @@ AdbcStatusCode AdbcStatementSetSubstraitPlan(struct AdbcStatement* statement,
error);
}

AdbcStatusCode AdbcStatementRequestSchema(struct AdbcStatement* statement,
struct ArrowSchema* schema,
struct AdbcError* error) {
if (!statement->private_driver) {
SetError(error, "AdbcStatementRequestSchema: must call AdbcStatementNew first");
return ADBC_STATUS_INVALID_STATE;
}
INIT_ERROR(error, statement);
return statement->private_driver->StatementRequestSchema(statement, schema, error);
}

const char* AdbcStatusCodeMessage(AdbcStatusCode code) {
#define CASE(CONSTANT) \
case ADBC_STATUS_##CONSTANT: \
Expand Down Expand Up @@ -3346,6 +3363,7 @@ AdbcStatusCode AdbcLoadDriverFromInitFunc(AdbcDriverInitFunc init_func, int vers
FILL_DEFAULT(driver, StatementSetOption);
FILL_DEFAULT(driver, StatementSetSqlQuery);
FILL_DEFAULT(driver, StatementSetSubstraitPlan);
FILL_DEFAULT(driver, StatementRequestSchema);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be in a separate block that checks the version

}
if (version >= ADBC_VERSION_1_1_0) {
auto* driver = reinterpret_cast<struct AdbcDriver*>(raw_driver);
Expand Down
34 changes: 34 additions & 0 deletions c/include/arrow-adbc/adbc.h
Original file line number Diff line number Diff line change
Expand Up @@ -1255,6 +1255,10 @@ struct ADBC_EXPORT AdbcDriver {
AdbcStatusCode (*StatementSetOptionInt)(struct AdbcStatement*, const char*, int64_t,
struct AdbcError*);

// ADBC 1.2
AdbcStatusCode (*StatementRequestSchema)(struct AdbcStatement*, struct ArrowSchema*,
struct AdbcError*);

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's already a block for 1.2.0 below

/// @}

/// \defgroup adbc-1.2.0 ADBC API Revision 1.2.0
Expand Down Expand Up @@ -2293,6 +2297,36 @@ AdbcStatusCode AdbcStatementExecuteSchema(struct AdbcStatement* statement,
struct ArrowSchema* schema,
struct AdbcError* error);

/// \brief Request the schema of the next statement execution
///
/// Allows the caller to request a specific schema based on prior
/// information or user input. This may be used to ensure a
/// consistent schema when executing queries against a database
/// with row-based types (e.g., SQLite) or a database whose types
/// are implemented with row-based parameters where Arrow prefers
/// type-level parameters (e.g., NUMERIC for PostgreSQL).
///
/// The provided schema is a request and not a guarantee (i.e.,
/// callers must use the schema provided by the output stream to
/// interpret the result).
///
/// Calling AdbcStatementRequestSchema() must not affect the result
/// of AdbcStatementExecuteSchema (which always infers its result
/// from the input query).
///
/// \since ADBC API revision 1.2.0
///
/// \param[in] statement The statement to execute.
/// \param[in] schema The requested schema.
/// \param[out] error An optional location to return an error
/// message if necessary.
///
/// \return ADBC_STATUS_NOT_IMPLEMENTED if the driver does not support this.
ADBC_EXPORT
AdbcStatusCode AdbcStatementRequestSchema(struct AdbcStatement* statement,
struct ArrowSchema* schema,
struct AdbcError* error);

/// \brief Turn this statement into a prepared statement to be
/// executed multiple times.
///
Expand Down
34 changes: 34 additions & 0 deletions go/adbc/drivermgr/arrow-adbc/adbc.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading