Skip to content

feat(c/driver/sqlite): ensure batch rows option can be retrieved #4645

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

Open
lidavidm wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat(c/driver/sqlite): ensure batch rows option can be retrieved #4645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52e95c1
feat(c/driver/sqlite): ensure batch rows option can be retrieved
lidavidm Aug 4, 2026
1c30ea7
fix r
lidavidm Aug 4, 2026
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
16 changes: 12 additions & 4 deletions c/driver/framework/base_driver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,19 @@ class Option {
return std::visit(
[&](auto&& value) -> AdbcStatusCode {
using T = std::decay_t<decltype(value)>;
if constexpr (std::is_same_v<T, std::string>) {
size_t value_size_with_terminator = value.size() + 1;
if constexpr (std::is_same_v<T, std::string> || std::is_same_v<T, int64_t>) {
std::string formatted;
std::string_view string_value;
if constexpr (std::is_same_v<T, std::string>) {
string_value = value;
} else {
formatted = std::to_string(value);
string_value = formatted;
Comment on lines +178 to +179

@paleolimbot paleolimbot Aug 4, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Are there any locale concerns here (i.e., doubles getting exported as 123,456 instead of 123.456)? to_chars() might be better (although I think there was a thing where some gcc versions don't include it?)

}
size_t value_size_with_terminator = string_value.size() + 1;
if (*length >= value_size_with_terminator) {
std::memcpy(out, value.data(), value.size());
out[value.size()] = 0;
std::memcpy(out, string_value.data(), string_value.size());
out[string_value.size()] = 0;
}
*length = value_size_with_terminator;
return ADBC_STATUS_OK;
Expand Down
71 changes: 71 additions & 0 deletions c/driver/sqlite/sqlite_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,77 @@ TEST(SqliteUriWrapper, SqliteUriFilename) {
adbc_validation::IsOkStatus(&error));
}

TEST(SqliteOptions, BatchRowsGetOption) {
struct AdbcError error = ADBC_ERROR_INIT;
adbc_validation::Handle<struct AdbcDatabase> database;
adbc_validation::Handle<struct AdbcConnection> connection;
adbc_validation::Handle<struct AdbcStatement> statement;
constexpr const char* kBatchRows = "adbc.sqlite.query.batch_rows";

ASSERT_THAT(AdbcDatabaseNew(&database.value, &error),
adbc_validation::IsOkStatus(&error));

int64_t int_value = 0;
ASSERT_THAT(AdbcDatabaseGetOptionInt(&database.value, kBatchRows, &int_value, &error),
adbc_validation::IsOkStatus(&error));
EXPECT_EQ(1024, int_value);

char too_small[2] = {'x', 'x'};
size_t length = sizeof(too_small);
ASSERT_THAT(
AdbcDatabaseGetOption(&database.value, kBatchRows, too_small, &length, &error),
adbc_validation::IsOkStatus(&error));
EXPECT_EQ(5, length);
EXPECT_THAT(too_small, ::testing::ElementsAre('x', 'x'));

ASSERT_THAT(AdbcDatabaseSetOption(&database.value, kBatchRows, "41", &error),
adbc_validation::IsOkStatus(&error));
char string_value[3] = {};
length = sizeof(string_value);
ASSERT_THAT(
AdbcDatabaseGetOption(&database.value, kBatchRows, string_value, &length, &error),
adbc_validation::IsOkStatus(&error));
EXPECT_EQ(3, length);
EXPECT_STREQ("41", string_value);

ASSERT_THAT(AdbcDatabaseInit(&database.value, &error),
adbc_validation::IsOkStatus(&error));
ASSERT_THAT(AdbcConnectionNew(&connection.value, &error),
adbc_validation::IsOkStatus(&error));
ASSERT_THAT(AdbcConnectionInit(&connection.value, &database.value, &error),
adbc_validation::IsOkStatus(&error));
ASSERT_THAT(
AdbcConnectionGetOptionInt(&connection.value, kBatchRows, &int_value, &error),
adbc_validation::IsOkStatus(&error));
EXPECT_EQ(41, int_value);

ASSERT_THAT(AdbcStatementNew(&connection.value, &statement.value, &error),
adbc_validation::IsOkStatus(&error));
ASSERT_THAT(AdbcStatementGetOptionInt(&statement.value, kBatchRows, &int_value, &error),
adbc_validation::IsOkStatus(&error));
EXPECT_EQ(41, int_value);

ASSERT_THAT(AdbcStatementSetOptionInt(&statement.value, kBatchRows, 42, &error),
adbc_validation::IsOkStatus(&error));
char statement_value[3] = {};
length = sizeof(statement_value);
ASSERT_THAT(AdbcStatementGetOption(&statement.value, kBatchRows, statement_value,
&length, &error),
adbc_validation::IsOkStatus(&error));
EXPECT_EQ(3, length);
EXPECT_STREQ("42", statement_value);

ASSERT_THAT(AdbcStatementSetOption(&statement.value, "adbc.statement.bind_by_name",
ADBC_OPTION_VALUE_ENABLED, &error),
adbc_validation::IsOkStatus(&error));
char bind_by_name[sizeof(ADBC_OPTION_VALUE_ENABLED)] = {};
length = sizeof(bind_by_name);
ASSERT_THAT(AdbcStatementGetOption(&statement.value, "adbc.statement.bind_by_name",
bind_by_name, &length, &error),
adbc_validation::IsOkStatus(&error));
EXPECT_STREQ(ADBC_OPTION_VALUE_ENABLED, bind_by_name);
}

class SqliteStatementTest : public ::testing::Test,
public adbc_validation::StatementTest {
public:
Expand Down
7 changes: 7 additions & 0 deletions python/adbc_driver_sqlite/tests/test_lowlevel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,13 @@ def test_options(sqlite):
adbc_driver_sqlite.StatementOptions.BATCH_ROWS.value: "1",
}
)
assert (
stmt.get_option(adbc_driver_sqlite.StatementOptions.BATCH_ROWS.value) == "1"
)
assert (
stmt.get_option_int(adbc_driver_sqlite.StatementOptions.BATCH_ROWS.value)
== 1
)
stmt.set_sql_query("SELECT 1")
stream, _ = stmt.execute_query()
reader = pyarrow.RecordBatchReader._import_from_c(stream.address)
Expand Down
15 changes: 6 additions & 9 deletions r/adbcdrivermanager/tests/testthat/test-options.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,34 +251,31 @@ test_that("void driver errors getting bytes option of incorrect type", {
)
})

test_that("void driver errors getting integer option of incorrect type", {
test_that("void driver errors getting integer option as bytes", {
db <- adbc_database_init(adbc_driver_void())
adbc_database_set_options(db, list("some_key" = 123L))

expect_error(
adbc_database_get_option(db, "some_key"),
class = "adbc_status_not_found"
)

expect_error(
adbc_database_get_option_bytes(db, "some_key"),
class = "adbc_status_not_found"
)


})

test_that("void driver can get integer option of compatible type", {
db <- adbc_database_init(adbc_driver_void())
adbc_database_set_options(db, list("some_key" = 123L))

expect_identical(
adbc_database_get_option(db, "some_key"),
"123"
)

expect_identical(
adbc_database_get_option_double(db, "some_key"),
123.0
)
})


test_that("void driver errors getting double option of incorrect type", {
db <- adbc_database_init(adbc_driver_void())
adbc_database_set_options(db, list("some_key" = 123.4))
Expand Down
Loading