Skip to content
Merged
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
2 changes: 1 addition & 1 deletion c/driver/postgresql/validation/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ dependencies = [
]

[tool.uv.sources]
adbc-drivers-validation = { git = "https://github.com/adbc-drivers/validation", rev = "32a647736227f3b020776dd493153aa6eb3bff19" }
adbc-drivers-validation = { git = "https://github.com/adbc-drivers/validation", rev = "551046350f8225c5e115ecefec27f86f71e3a4aa" }
1 change: 1 addition & 0 deletions c/driver/postgresql/validation/tests/postgresql.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ class PostgreSQLQuirks(model.DriverQuirks):
statement_execute_schema=True,
statement_get_parameter_schema=True,
statement_rows_affected=True,
statement_rows_affected_ddl=False,
current_catalog="postgres",
current_schema="public",
supported_xdbc_fields=[],
Expand Down
72 changes: 1 addition & 71 deletions c/driver/postgresql/validation/tests/test_statement.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,83 +15,13 @@
# specific language governing permissions and limitations
# under the License.

from adbc_drivers_validation import model
from adbc_drivers_validation.tests.statement import TestStatement as BaseTestStatement
from adbc_drivers_validation.tests.statement import TestStatement # noqa: F401
from adbc_drivers_validation.tests.statement import (
generate_tests,
)

import adbc_driver_manager

from . import postgresql


class TestStatement(BaseTestStatement):
"""PostgreSQL-specific statement tests with overrides."""

# TODO(https://github.com/adbc-drivers/validation/issues/140):
# Remove this override once validation framework supports separate
# statement_ddl_rows_affected flag. PostgreSQL returns -1 for DDL
# but exact counts for DML, which doesn't fit the current binary flag.
def test_rows_affected(
self,
driver: model.DriverQuirks,
conn: adbc_driver_manager.dbapi.Connection,
) -> None:
"""Override to accept -1 for CREATE TABLE"""
table_name = "test_rows_affected"
with conn.cursor() as cursor:
cursor.adbc_statement.set_sql_query(
driver.drop_table(table_name="test_rows_affected")
)
try:
cursor.adbc_statement.execute_update()
except adbc_driver_manager.Error as e:
if not driver.is_table_not_found(table_name=table_name, error=e):
raise

cursor.adbc_statement.set_sql_query(f"CREATE TABLE {table_name} (id INT)")
rows_affected = cursor.adbc_statement.execute_update()

# PostgreSQL returns -1 for CREATE TABLE
assert rows_affected == -1

cursor.adbc_statement.set_sql_query(
f"INSERT INTO {table_name} (id) VALUES (1)"
)
rows_affected = cursor.adbc_statement.execute_update()
if driver.features.statement_rows_affected:
assert rows_affected == 1
else:
assert rows_affected == -1

cursor.adbc_statement.set_sql_query(
f"UPDATE {table_name} SET id = id + 1 WHERE id = 1"
)
rows_affected = cursor.adbc_statement.execute_update()
if driver.features.statement_rows_affected:
assert rows_affected == 1
else:
assert rows_affected == -1

cursor.adbc_statement.set_sql_query(
f"DELETE FROM {table_name} WHERE id = 2"
)
rows_affected = cursor.adbc_statement.execute_update()
if driver.features.statement_rows_affected:
assert rows_affected == 1
else:
assert rows_affected == -1

cursor.adbc_statement.set_sql_query(
driver.drop_table(table_name="test_rows_affected")
)
try:
cursor.adbc_statement.execute_update()
except adbc_driver_manager.Error as e:
if not driver.is_table_not_found(table_name=table_name, error=e):
raise


def pytest_generate_tests(metafunc) -> None:
return generate_tests(postgresql.QUIRKS, metafunc)
4 changes: 2 additions & 2 deletions c/driver/postgresql/validation/uv.lock

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

Loading