Run tests against sqlalchemy 1.4 as well. (#44)

* Run tests against sqlalchemy 1.4 as well.

* Run tests when noxfile changed.

* Update test without async_sessionmaker in 1.4

* Fix tests to run on 1.4

Author: mattalbr

.github/workflows/test.yml

@@ -15,6 +15,7 @@ on:
       - "pyproject.toml"
       - "poetry.lock"
       - ".github/workflows/test.yml"
+      - "noxfile.py"
 
 jobs:
   generate-jobs-tests:

noxfile.py

@@ -18,8 +18,8 @@
 ]
 
 
-@session(python=PYTHON_VERSIONS, name="Tests", tags=["tests"])
-def tests(session: Session) -> None:
+@session(python=PYTHON_VERSIONS, name="SQLAlchemy 2.0 Tests", tags=["tests"])
+def tests_sqlalchemy_latest(session: Session) -> None:
     session.run_always(
         "poetry",
         "run",
@@ -39,6 +39,29 @@ def tests(session: Session) -> None:
     )
 
 
+# No need for now to run 1.4 against all 5 python versions.
+@session(python="3.11", name="Sqlalchemy 1.4 Tests", tags=["tests"])
+def tests_sqlalchemy_1_4(session: Session) -> None:
+    session.run_always(
+        "poetry",
+        "run",
+        "pip",
+        "install",
+        "--upgrade",
+        "pip",
+        "setuptools",
+        "wheel",
+        external=True,
+    )
+    session.run_always("poetry", "install", external=True)
+    session._session.install("sqlalchemy~=1.4")
+
+    session.run(
+        "pytest",
+        *COMMON_PYTEST_OPTIONS,
+    )
+
+
 @session(name="Mypy", tags=["lint"])
 def mypy(session: Session) -> None:
     session.run_always("poetry", "install", external=True)

tests/conftest.py

@@ -18,7 +18,7 @@
 from sqlalchemy import orm
 from sqlalchemy.engine import Engine
 from sqlalchemy.ext import asyncio
-from sqlalchemy.ext.asyncio import AsyncAttrs, create_async_engine
+from sqlalchemy.ext.asyncio import create_async_engine
 from sqlalchemy.ext.asyncio.engine import AsyncEngine
 from testing.postgresql import Postgresql, PostgresqlFactory
 
@@ -97,13 +97,13 @@ def async_engine(request) -> AsyncEngine:
 
 
 @pytest.fixture
-def async_sessionmaker(async_engine) -> asyncio.async_sessionmaker:
-    return asyncio.async_sessionmaker(async_engine)
+def async_sessionmaker(async_engine):
+    if SQLA2:
+        return asyncio.async_sessionmaker(async_engine)
+    else:
+        return lambda **kwargs: asyncio.AsyncSession(async_engine, **kwargs)
 
 
 @pytest.fixture
 def base():
-    class Base(AsyncAttrs, orm.DeclarativeBase):
-        pass
-
-    return Base
+    return orm.declarative_base()

tests/test_loader.py

@@ -14,12 +14,14 @@ class Employee(base):
         name = Column(String, nullable=False)
         department_id = Column(Integer, ForeignKey("department.id"))
         department = relationship("Department", back_populates="employees")
+        __mapper_args__ = {"eager_defaults": True}
 
     class Department(base):
         __tablename__ = "department"
         id = Column(Integer, autoincrement=True, primary_key=True)
         name = Column(String, nullable=False)
         employees = relationship("Employee", back_populates="department")
+        __mapper_args__ = {"eager_defaults": True}
 
     return Employee, Department
 
@@ -112,7 +114,7 @@ async def test_loader_with_async_session(
     async with async_engine.begin() as conn:
         await conn.run_sync(base.metadata.create_all)
 
-    async with async_sessionmaker() as session:
+    async with async_sessionmaker(expire_on_commit=False) as session:
         e1 = Employee(name="e1")
         e2 = Employee(name="e2")
         d1 = Department(name="d1")
@@ -126,10 +128,10 @@ async def test_loader_with_async_session(
         e1.department = d2
         e2.department = d1
         await session.commit()
-        d2_id = await d2.awaitable_attrs.id
+        d2_id = d2.id
         department_loader_key = tuple(
             [
-                await getattr(e1.awaitable_attrs, local.key)
+                getattr(e1, local.key)
                 for local, _ in Employee.department.property.local_remote_pairs
             ]
         )