Skip to content
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

feat(c): add functions for determining statement/return types #9430

Merged
merged 12 commits into from
Nov 20, 2023
Merged

feat(c): add functions for determining statement/return types #9430

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ba1bb5d
feat(c): add duckdb_logical_type_get_alias()
Mause Sep 5, 2023
3988f3e
feat(c): add duckdb_result_return_type
Mause Sep 7, 2023
0ad34a9
test: add REQUIRE_SUCCESS macro
Mause Sep 7, 2023
94223ac
feat(c): add statement type determination
Mause Sep 17, 2023
16cfaef
test: add statement type test
Mause Oct 16, 2023
0b1c743
add header declarations
Mause Oct 16, 2023
f61fefc
chore: expand macro
Mause Oct 23, 2023
7a55e56
Merge branch 'feature' of https://github.com/duckdb/duckdb into c-api…
Mause Nov 7, 2023
7c52967
No REQUIRE_SUCCESS
Mytherin Nov 8, 2023
15fe801
Merge branch 'feature' into c-api-extensions
Mause Nov 10, 2023
8fc9ceb
attempt to fix compile error on windows
Mause Nov 10, 2023
d454ee9
move functions to proper locations
Mause Nov 11, 2023
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
Prev Previous commit
Next Next commit
chore: expand macro
  • Loading branch information
@Mause
Mause committed Oct 23, 2023
commit f61fefc2c07bf7834b7ef410f9fb19fb6ed5ea26
92 changes: 58 additions & 34 deletions src/main/capi/result-c.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,46 +533,70 @@ duckdb_result_type duckdb_result_return_type(duckdb_result result) {
}
}

#define SHORT(name) \
case duckdb::StatementType::name##_STATEMENT: \
return DUCKDB_STATEMENT_TYPE_##name;

static duckdb_statement_type StatementTypeToC(duckdb::StatementType statement_type) {
switch (statement_type) {
SHORT(SELECT)
SHORT(INVALID)
SHORT(INSERT)
SHORT(UPDATE)
SHORT(EXPLAIN)
SHORT(DELETE)
SHORT(PREPARE)
SHORT(CREATE)
SHORT(EXECUTE)
SHORT(ALTER)
SHORT(TRANSACTION)
SHORT(COPY)
SHORT(ANALYZE)
SHORT(VARIABLE_SET)
SHORT(CREATE_FUNC)
SHORT(DROP)
SHORT(EXPORT)
SHORT(PRAGMA)
SHORT(SHOW)
SHORT(VACUUM)
SHORT(CALL)
SHORT(SET)
SHORT(LOAD)
SHORT(RELATION)
SHORT(EXTENSION)
SHORT(LOGICAL_PLAN)
SHORT(ATTACH)
SHORT(DETACH)
SHORT(MULTI)
case duckdb::StatementType::SELECT_STATEMENT:
return DUCKDB_STATEMENT_TYPE_SELECT;
case duckdb::StatementType::INVALID_STATEMENT:
return DUCKDB_STATEMENT_TYPE_INVALID;
case duckdb::StatementType::INSERT_STATEMENT:
return DUCKDB_STATEMENT_TYPE_INSERT;
case duckdb::StatementType::UPDATE_STATEMENT:
return DUCKDB_STATEMENT_TYPE_UPDATE;
case duckdb::StatementType::EXPLAIN_STATEMENT:
return DUCKDB_STATEMENT_TYPE_EXPLAIN;
case duckdb::StatementType::DELETE_STATEMENT:
return DUCKDB_STATEMENT_TYPE_DELETE;
case duckdb::StatementType::PREPARE_STATEMENT:
return DUCKDB_STATEMENT_TYPE_PREPARE;
case duckdb::StatementType::CREATE_STATEMENT:
return DUCKDB_STATEMENT_TYPE_CREATE;
case duckdb::StatementType::EXECUTE_STATEMENT:
return DUCKDB_STATEMENT_TYPE_EXECUTE;
case duckdb::StatementType::ALTER_STATEMENT:
return DUCKDB_STATEMENT_TYPE_ALTER;
case duckdb::StatementType::TRANSACTION_STATEMENT:
return DUCKDB_STATEMENT_TYPE_TRANSACTION;
case duckdb::StatementType::COPY_STATEMENT:
return DUCKDB_STATEMENT_TYPE_COPY;
case duckdb::StatementType::ANALYZE_STATEMENT:
return DUCKDB_STATEMENT_TYPE_ANALYZE;
case duckdb::StatementType::VARIABLE_SET_STATEMENT:
return DUCKDB_STATEMENT_TYPE_VARIABLE_SET;
case duckdb::StatementType::CREATE_FUNC_STATEMENT:
return DUCKDB_STATEMENT_TYPE_CREATE_FUNC;
case duckdb::StatementType::DROP_STATEMENT:
return DUCKDB_STATEMENT_TYPE_DROP;
case duckdb::StatementType::EXPORT_STATEMENT:
return DUCKDB_STATEMENT_TYPE_EXPORT;
case duckdb::StatementType::PRAGMA_STATEMENT:
return DUCKDB_STATEMENT_TYPE_PRAGMA;
case duckdb::StatementType::SHOW_STATEMENT:
return DUCKDB_STATEMENT_TYPE_SHOW;
case duckdb::StatementType::VACUUM_STATEMENT:
return DUCKDB_STATEMENT_TYPE_VACUUM;
case duckdb::StatementType::CALL_STATEMENT:
return DUCKDB_STATEMENT_TYPE_CALL;
case duckdb::StatementType::SET_STATEMENT:
return DUCKDB_STATEMENT_TYPE_SET;
case duckdb::StatementType::LOAD_STATEMENT:
return DUCKDB_STATEMENT_TYPE_LOAD;
case duckdb::StatementType::RELATION_STATEMENT:
return DUCKDB_STATEMENT_TYPE_RELATION;
case duckdb::StatementType::EXTENSION_STATEMENT:
return DUCKDB_STATEMENT_TYPE_EXTENSION;
case duckdb::StatementType::LOGICAL_PLAN_STATEMENT:
return DUCKDB_STATEMENT_TYPE_LOGICAL_PLAN;
case duckdb::StatementType::ATTACH_STATEMENT:
return DUCKDB_STATEMENT_TYPE_ATTACH;
case duckdb::StatementType::DETACH_STATEMENT:
return DUCKDB_STATEMENT_TYPE_DETACH;
case duckdb::StatementType::MULTI_STATEMENT:
return DUCKDB_STATEMENT_TYPE_MULTI;
default:
return DUCKDB_STATEMENT_TYPE_INVALID;
}
}
#undef SHORT

duckdb_statement_type duckdb_result_statement_type(duckdb_result result) {
if (!result.internal_data || duckdb_result_error(&result) != nullptr) {
Expand Down
Loading