sqlakit 0.7.3__tar.gz → 0.8.0__tar.gz

{sqlakit-0.7.3 → sqlakit-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlakit
-Version: 0.7.3
+Version: 0.8.0
 Summary: A toolkit for SQLAlchemy applications.
 Keywords: sqlalchemy,database,orm,sql,asyncio
 Author: Anton Ruhlov

{sqlakit-0.7.3 → sqlakit-0.8.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sqlakit"
-version = "0.7.3"
+version = "0.8.0"
 description = "A toolkit for SQLAlchemy applications."
 readme = "README.md"
 license = "MIT"
@@ -32,6 +32,9 @@ dependencies = ["sqlalchemy>=2.0.22"]
 name = "Anton Ruhlov"
 email = "antonruhlov@gmail.com"
 
+[project.entry-points.pytest11]
+sqlakit = "sqlakit.pytest_plugin"
+
 [project.urls]
 Repository = "https://github.com/antonrh/sqlakit"
 Documentation = "https://github.com/antonrh/sqlakit"
@@ -61,6 +64,14 @@ filterwarnings = [
     "ignore:unclosed database:ResourceWarning",
 ]
 addopts = "-p pytester"
+norecursedirs = [
+    "examples/testing_plugin",
+    "tests/projects",
+    ".*",
+    "build",
+    "dist",
+    "node_modules",
+]
 
 [tool.ruff]
 include = [
@@ -116,6 +127,8 @@ ignore = [
     "ARG001",
     "TC003",
 ]
+"examples/testing_plugin/*.py" = ["S101"]
+"tests/projects/**/*.py" = ["INP001"]
 
 [tool.ty.src]
 include = [

{sqlakit-0.7.3 → sqlakit-0.8.0}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "sqlakit"
-version = "0.7.3"
+version = "0.8.0"
 description = "A toolkit for SQLAlchemy applications."
 readme = "README.md"
 license = "MIT"
@@ -25,6 +25,9 @@ dependencies = [
     "sqlalchemy>=2.0.22",
 ]
 
+[project.entry-points.pytest11]
+sqlakit = "sqlakit.pytest_plugin"
+
 [project.urls]
 Repository = "https://github.com/antonrh/sqlakit"
 Documentation = "https://github.com/antonrh/sqlakit"
@@ -92,6 +95,15 @@ filterwarnings = [
 ]
 # `pytester` runs the conftest the docs show, in a session of its own.
 addopts = "-p pytester"
+# The example is a project of its own, run by tests/examples, not collected here.
+norecursedirs = [
+    "examples/testing_plugin",  # a project of its own, run by tests/examples
+    "tests/projects",           # the projects the plugin tests copy
+    ".*",
+    "build",
+    "dist",
+    "node_modules",
+]
 
 [tool.ruff]
 include = [
@@ -148,6 +160,12 @@ ignore = [
     "ARG001",   # FastAPI hands handlers a request they may not use
     "TC003",    # examples keep their imports where a reader expects them
 ]
+"examples/testing_plugin/*.py" = [
+    "S101",     # the example is a test suite, and tests assert
+]
+"tests/projects/**/*.py" = [
+    "INP001",   # a project the tests copy, not a package of this one
+]
 
 [tool.ty.src]
 include = [

sqlakit-0.8.0/sqlakit/pytest_plugin.py

@@ -0,0 +1,285 @@
+"""The `db` marker, and the fixtures behind it.
+
+Installed with the library, so a project writes the two lines that say which
+database and which tables, and nothing else:
+
+```python title="conftest.py"
+import pytest
+
+from app.db import db
+from app.models import Model
+
+
+@pytest.fixture(scope="session")
+def sqlakit_db() -> Databases:
+    return db
+
+
+@pytest.fixture(scope="session")
+def sqlakit_metadata() -> sa.MetaData:
+    return Model.metadata
+```
+
+A test marked `db` runs in a transaction that rolls back, on every database.
+`using` narrows that to the ones a test works on:
+
+```python
+@pytest.mark.db(using="warehouse")
+@pytest.mark.db(using=["default", "warehouse"])
+```
+
+Every other test connects to nothing, and reaching for a session there raises
+`MissingSessionError` rather than opening one.
+"""
+
+from __future__ import annotations
+
+import asyncio
+import inspect
+import warnings
+from contextlib import AsyncExitStack, ExitStack, contextmanager
+from typing import TYPE_CHECKING, Any
+
+import pytest
+
+from ._registry import db as importable_db
+
+if TYPE_CHECKING:
+    from collections.abc import AsyncIterator, Iterator
+
+    import sqlalchemy as sa
+
+MARKER = "db"
+SYNC_FIXTURE = "_sqlakit_transaction"
+ASYNC_FIXTURE = "_sqlakit_async_transaction"
+
+
+def pytest_addoption(parser: pytest.Parser) -> None:
+    parser.addini(
+        "sqlakit",
+        "give the tests marked `db` a database, and the rest none",
+        type="bool",
+        default=False,
+    )
+
+
+def pytest_configure(config: pytest.Config) -> None:
+    if config.getini("sqlakit"):
+        config.addinivalue_line("markers", f"{MARKER}: the test needs a database")
+
+
+def pytest_collection_modifyitems(
+    config: pytest.Config, items: list[pytest.Item]
+) -> None:
+    """Give a database to the marked tests and to nothing else.
+
+    The fixture is added here rather than with `usefixtures` because an async
+    one cannot be fetched from a synchronous fixture, and `pytest` reads
+    `fixturenames` at this moment.
+    """
+    if not config.getini("sqlakit"):
+        return
+    for item in items:
+        if not isinstance(item, pytest.Function):
+            continue
+        if item.get_closest_marker(MARKER) is None:
+            continue
+        awaited = inspect.iscoroutinefunction(item.function)
+        item.fixturenames.append(ASYNC_FIXTURE if awaited else SYNC_FIXTURE)
+
+
+@pytest.fixture(scope="session")
+def sqlakit_db(sqlakit_base: Any) -> Any:  # noqa: ANN401
+    """Return the database the marked tests run on.
+
+    The one the models live on, which is the importable registry unless they
+    were given a `Database` of their own. Override it for a project with no
+    model layer.
+    """
+    if sqlakit_base is None:
+        if not importable_db.is_configured:
+            pytest.fail(
+                "sqlakit has no database to test on. Define `sqlakit_base` with "
+                "the base your models inherit, or `sqlakit_db` with the database "
+                "itself.",
+                pytrace=False,
+            )
+        return importable_db
+    database = getattr(sqlakit_base, "db", None)
+    if database is None:
+        pytest.fail(
+            f"`sqlakit_base` returned `{sqlakit_base.__name__}`, which is not on "
+            "the model layer and names no database. Return the base your models "
+            "inherit, or define `sqlakit_db` instead.",
+            pytrace=False,
+        )
+    return database
+
+
+@pytest.fixture(scope="session")
+def sqlakit_base() -> Any | None:  # noqa: ANN401
+    """Return the declarative base of the models under test, or None.
+
+    Every alias gets the tables of the models pointed at it, so a project on
+    more than one database says this and nothing else.
+    """
+    return None
+
+
+@pytest.fixture(scope="session")
+def sqlakit_metadata() -> sa.MetaData | None:
+    """Return the tables to create for the session, or None to create none.
+
+    For metadata outside the model layer. None suits a suite running against a
+    schema built elsewhere, by migrations or by a fixture of the project's own.
+    """
+    return None
+
+
+@pytest.fixture(scope="session")
+def sqlakit_schema(
+    sqlakit_db: Any,  # noqa: ANN401
+    sqlakit_base: Any,  # noqa: ANN401
+    sqlakit_metadata: sa.MetaData | None,
+) -> Iterator[None]:
+    """Build the schema for the session, and take it down after.
+
+    Override it to build the schema another way, `Alembic` against a server
+    `pytest-docker` started among them:
+
+    ```python
+    @pytest.fixture(scope="session")
+    def sqlakit_schema(alembic_config, _postgres):
+        alembic.command.upgrade(alembic_config, "head")
+
+    Yield:
+        alembic.command.downgrade(alembic_config, "base")
+    ```
+
+    """
+    with _entered(_schema_blocks(sqlakit_db, sqlakit_base, sqlakit_metadata)):
+        yield
+
+
+@pytest.fixture(scope="session")
+def sqlakit_seed(sqlakit_schema: None) -> None:  # noqa: ARG001 - after the schema
+    """Write the rows every test starts from, committed, once for the session.
+
+    A test's own writes roll back around it, and these stay:
+
+    ```python
+    @pytest.fixture(scope="session")
+    def sqlakit_seed(sqlakit_schema):
+        with db.transaction():
+            Plan(name="free").save()
+    ```
+
+    It runs when the first marked test does, so a suite that needs no database
+    writes nothing.
+    """
+    return
+
+
+@pytest.fixture
+def _sqlakit_transaction(
+    request: pytest.FixtureRequest,
+    sqlakit_db: Any,  # noqa: ANN401
+    sqlakit_seed: None,  # noqa: ARG001 - requested so the rows are there
+) -> Iterator[None]:
+    with ExitStack() as stack:
+        for block in _rolled_back(sqlakit_db, _asked_for(request)):
+            stack.enter_context(block)
+        yield
+
+
+@pytest.fixture
+async def _sqlakit_async_transaction(
+    request: pytest.FixtureRequest,
+    sqlakit_db: Any,  # noqa: ANN401
+    sqlakit_seed: None,  # noqa: ARG001 - requested so the rows are there
+) -> AsyncIterator[None]:
+    async with AsyncExitStack() as stack:
+        for block in _rolled_back(sqlakit_db, _asked_for(request)):
+            await stack.enter_async_context(block)
+        yield
+
+
+@contextmanager
+def _entered(blocks: list[Any]) -> Iterator[None]:
+    """Hold these blocks open, awaiting them when that is what they need.
+
+    An `asyncio` database builds its schema in a coroutine, and this fixture is
+    not one: a session of its own runs it, which the tests never touch. They
+    open their transactions on the loop `anyio` gives them.
+    """
+    if not any(hasattr(block, "__aenter__") for block in blocks):
+        with ExitStack() as stack:
+            for block in blocks:
+                stack.enter_context(block)
+            yield
+        return
+
+    stack = AsyncExitStack()
+    loop = asyncio.new_event_loop()
+    try:
+        for block in blocks:
+            loop.run_until_complete(stack.enter_async_context(block))
+        yield
+    finally:
+        loop.run_until_complete(stack.aclose())
+        loop.close()
+
+
+def _schema_blocks(
+    db: Any,  # noqa: ANN401
+    base: Any,  # noqa: ANN401
+    metadata: sa.MetaData | None,
+) -> list[Any]:
+    """Return the blocks that create the schema, one per database.
+
+    The model layer knows which tables belong on which alias, so a registry
+    gets one block per alias. Without it there is one metadata, and one
+    database to put it on.
+    """
+    if base is not None:
+        aliases = getattr(db, "aliases", None) or (None,)
+        return [base.provisioned_tables(alias) for alias in aliases]
+    if metadata is not None:
+        return [db.provisioned_tables(metadata)]
+    warnings.warn(
+        "sqlakit creates no tables: neither `sqlakit_base` nor "
+        "`sqlakit_metadata` is defined. Define one, or replace "
+        "`sqlakit_schema` with the fixture that builds your schema.",
+        stacklevel=2,
+    )
+    return []
+
+
+def _asked_for(request: pytest.FixtureRequest) -> tuple[Any, ...]:
+    """Return the databases the marker asks for, by name or in person."""
+    marker = request.node.get_closest_marker(MARKER)
+    using = None if marker is None else marker.kwargs.get("using")
+    if using is None:
+        return ()
+    if isinstance(using, str) or not isinstance(using, (list, tuple, set, frozenset)):
+        return (using,)
+    return tuple(using)
+
+
+def _rolled_back(db: Any, using: tuple[Any, ...]) -> list[Any]:  # noqa: ANN401
+    """Return the blocks that undo what a test writes.
+
+    A marker with no ``using`` opens every database, which for most projects is
+    the one they have. Naming one is how a project on several stops paying for
+    a connection to each in the tests that read one.
+    """
+    if not using:
+        return [
+            db.transactions(rollback=True)
+            if len(getattr(db, "aliases", ()) or ()) > 1
+            else db.transaction(rollback=True)
+        ]
+    return [
+        (db[one] if isinstance(one, str) else one).transaction(rollback=True)
+        for one in using
+    ]