Skip to content

feat: support DML query overrides and client-side ingest sorting #278

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

Merged
Mandukhai-Alimaa merged 2 commits into from
Aug 5, 2026
Merged

feat: support DML query overrides and client-side ingest sorting #278

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
e9c60cb
feat: support DML query overrides and client-side ingest sorting
Mandukhai-Alimaa Jul 29, 2026
157dd68
Merge branch 'main' into feat/cassandra-compat
Mandukhai-Alimaa Jul 29, 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
61 changes: 47 additions & 14 deletions adbc_drivers_validation/tests/ingest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,14 @@ def make_table_name(prefix: str, query: Query | str) -> str:
return _SANITIZE_TABLE_NAME.sub("_", f"{prefix}_{suffix}")


def _sort_table_by_first_column(table: pyarrow.Table) -> pyarrow.Table:
# Sort locally because some vendors, such as Cassandra, do not support
# ORDER BY here.
if table.num_rows <= 1 or len(table.schema) == 0:
return table
return table.sort_by([(table.schema[0].name, "ascending")])


class TestIngest:
def test_create(
self,
Expand All @@ -142,14 +150,17 @@ def test_create(
fields = []
for field in data.schema:
fields.append(driver.quote_identifier(field.name))
select = f"SELECT {', '.join(fields)} FROM {driver.quote_identifier(table_name)} ORDER BY {fields[0]} ASC"
select = (
f"SELECT {', '.join(fields)} FROM {driver.quote_identifier(table_name)}"
)
with conn.cursor() as cursor:
with driver.setup_statement(query, cursor):
result = execute_query_without_prepare(cursor, select)

# TODO: we should also inspect the type name and make sure it matches the
# metadata
expected = subquery.expected()
result = _sort_table_by_first_column(result)
expected = _sort_table_by_first_column(subquery.expected())
compare.compare_tables(expected, result, query.metadata())
subschema = pyarrow.schema(list(result.schema)[1:])
utils.assert_field_type_name(driver, "query", query, subschema)
Expand Down Expand Up @@ -190,7 +201,7 @@ def test_append(

idx = driver.quote_identifier("idx")
value = driver.quote_identifier("value")
select = f"SELECT {idx}, {value} FROM {driver.quote_identifier(table_name)} ORDER BY {idx} ASC"
select = f"SELECT {idx}, {value} FROM {driver.quote_identifier(table_name)}"
with conn.cursor() as cursor:
result = execute_query_without_prepare(cursor, select)

Expand All @@ -202,8 +213,12 @@ def test_append(
},
schema=expected.schema,
)
result = _sort_table_by_first_column(result)
expected = _sort_table_by_first_column(
pyarrow.concat_tables([expected, expected2])
)
compare.compare_tables(
pyarrow.concat_tables([expected, expected2]),
expected,
result,
query.metadata(),
)
Expand Down Expand Up @@ -263,7 +278,7 @@ def test_createappend(

idx = driver.quote_identifier("idx")
value = driver.quote_identifier("value")
select = f"SELECT {idx}, {value} FROM {driver.quote_identifier(table_name)} ORDER BY {idx} ASC"
select = f"SELECT {idx}, {value} FROM {driver.quote_identifier(table_name)}"
with conn.cursor() as cursor:
result = execute_query_without_prepare(cursor, select)

Expand All @@ -277,8 +292,12 @@ def test_createappend(
},
schema=expected.schema,
)
result = _sort_table_by_first_column(result)
expected = _sort_table_by_first_column(
pyarrow.concat_tables([expected, expected2])
)
compare.compare_tables(
pyarrow.concat_tables([expected, expected2]),
expected,
result,
query.metadata(),
)
Expand Down Expand Up @@ -373,7 +392,8 @@ def test_replace(

idx = driver.quote_identifier("idx")
value = driver.quote_identifier("value")
select = f"SELECT {idx}, {value} FROM {driver.quote_identifier(table_name)} ORDER BY {idx} ASC"
# The final replacement contains one row, so ordering is unnecessary.
select = f"SELECT {idx}, {value} FROM {driver.quote_identifier(table_name)}"
with conn.cursor() as cursor:
result = execute_query_without_prepare(cursor, select)

Expand Down Expand Up @@ -403,11 +423,12 @@ def test_replace_noop(

idx = driver.quote_identifier("idx")
value = driver.quote_identifier("value")
select = f"SELECT {idx}, {value} FROM {driver.quote_identifier(table_name)} ORDER BY {idx} ASC"
select = f"SELECT {idx}, {value} FROM {driver.quote_identifier(table_name)}"
with conn.cursor() as cursor:
result = execute_query_without_prepare(cursor, select)

expected = subquery.expected()
result = _sort_table_by_first_column(result)
expected = _sort_table_by_first_column(subquery.expected())
compare.compare_tables(expected, result, query.metadata())

def test_not_null(
Expand Down Expand Up @@ -818,7 +839,9 @@ def test_create_multiple_batches(
fields = []
for field in data.schema:
fields.append(driver.quote_identifier(field.name))
select = f"SELECT {', '.join(fields)} FROM {driver.quote_identifier(table_name)} ORDER BY {fields[0]} ASC"
select = (
f"SELECT {', '.join(fields)} FROM {driver.quote_identifier(table_name)}"
)
with conn.cursor() as cursor:
result = execute_query_without_prepare(cursor, select)

Expand All @@ -837,8 +860,10 @@ def test_create_multiple_batches(
)
expected_tables.append(expected_i)

result = _sort_table_by_first_column(result)
expected = _sort_table_by_first_column(pyarrow.concat_tables(expected_tables))
compare.compare_tables(
pyarrow.concat_tables(expected_tables),
expected,
result,
query.metadata(),
)
Expand Down Expand Up @@ -881,7 +906,9 @@ def test_create_large_batch(
fields = []
for field in data.schema:
fields.append(driver.quote_identifier(field.name))
select = f"SELECT {', '.join(fields)} FROM {driver.quote_identifier(table_name)} ORDER BY {fields[0]} ASC"
select = (
f"SELECT {', '.join(fields)} FROM {driver.quote_identifier(table_name)}"
)
with conn.cursor() as cursor:
result = execute_query_without_prepare(cursor, select)

Expand All @@ -900,8 +927,10 @@ def test_create_large_batch(
)
expected_tables.append(expected_i)

result = _sort_table_by_first_column(result)
expected = _sort_table_by_first_column(pyarrow.concat_tables(expected_tables))
compare.compare_tables(
pyarrow.concat_tables(expected_tables),
expected,
result,
query.metadata(),
)
Expand Down Expand Up @@ -979,7 +1008,9 @@ def test_ingest_then_query(
fields = []
for field in data.schema:
fields.append(driver.quote_identifier(field.name))
select = f"SELECT {', '.join(fields)} FROM {driver.quote_identifier(table_name)} ORDER BY {fields[0]} ASC"
select = (
f"SELECT {', '.join(fields)} FROM {driver.quote_identifier(table_name)}"
)

with conn.cursor() as cursor:
driver.try_drop_table(cursor, table_name=table_name)
Expand All @@ -992,4 +1023,6 @@ def test_ingest_then_query(

result = execute_query_without_prepare(cursor, select)

result = _sort_table_by_first_column(result)
expected = _sort_table_by_first_column(expected)
compare.compare_tables(expected, result, query.metadata())
15 changes: 12 additions & 3 deletions adbc_drivers_validation/tests/statement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,10 @@ def test_rows_affected(
assert rows_affected == -1

cursor.adbc_statement.set_sql_query(
f"INSERT INTO {quoted_name} (id) VALUES (1)"
driver.query_override(
"TestStatement.test_rows_affected.insert",
f"INSERT INTO {quoted_name} (id) VALUES (1)",
)
)
rows_affected = cursor.adbc_statement.execute_update()
if driver.features.statement_rows_affected:
Expand All @@ -257,7 +260,10 @@ def test_rows_affected(
assert rows_affected == -1

cursor.adbc_statement.set_sql_query(
f"UPDATE {quoted_name} SET id = id + 1 WHERE id = 1"
driver.query_override(
"TestStatement.test_rows_affected.update",
f"UPDATE {quoted_name} SET id = id + 1 WHERE id = 1",
)
)
rows_affected = cursor.adbc_statement.execute_update()
if driver.features.statement_rows_affected:
Expand All @@ -269,7 +275,10 @@ def test_rows_affected(
assert rows_affected == -1

cursor.adbc_statement.set_sql_query(
f"DELETE FROM {quoted_name} WHERE id = 2"
driver.query_override(
"TestStatement.test_rows_affected.delete",
f"DELETE FROM {quoted_name} WHERE id = 2",
)
)
rows_affected = cursor.adbc_statement.execute_update()
if driver.features.statement_rows_affected:
Expand Down
Loading