chore: merge master, resolve conflicts

graphene_sqlalchemy/fields.py

@@ -11,8 +11,7 @@
 from graphql_relay import connection_from_array_slice
 
 from .batching import get_batch_resolver
-from .utils import (EnumValue, get_query, get_session,
-                    is_sqlalchemy_version_less_than)
+from .utils import EnumValue, get_query, get_session, is_sqlalchemy_version_less_than
 
 if not is_sqlalchemy_version_less_than("1.4"):
     from sqlalchemy.ext.asyncio import AsyncSession

graphene_sqlalchemy/tests/conftest.py

@@ -42,7 +42,7 @@ def test_db_url(async_session: bool):
 async def session_factory(async_session: bool, test_db_url: str):
     if async_session:
         if is_sqlalchemy_version_less_than("1.4"):
-            pytest.skip(f"Async Sessions only work in sql alchemy 1.4 and above")
+            pytest.skip("Async Sessions only work in sql alchemy 1.4 and above")
         engine = create_async_engine(test_db_url)
         async with engine.begin() as conn:
             await conn.run_sync(Base.metadata.create_all)

graphene_sqlalchemy/tests/models_batching.py

@@ -2,8 +2,17 @@
 
 import enum
 
-from sqlalchemy import (Column, Date, Enum, ForeignKey, Integer, String, Table,
-                        func, select)
+from sqlalchemy import (
+    Column,
+    Date,
+    Enum,
+    ForeignKey,
+    Integer,
+    String,
+    Table,
+    func,
+    select,
+)
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import column_property, relationship
 
@@ -62,3 +71,21 @@ class Article(Base):
     headline = Column(String(100))
     pub_date = Column(Date())
     reporter_id = Column(Integer(), ForeignKey("reporters.id"))
+    readers = relationship(
+        "Reader", secondary="articles_readers", back_populates="articles"
+    )
+
+
+class Reader(Base):
+    __tablename__ = "readers"
+    id = Column(Integer(), primary_key=True)
+    name = Column(String(100))
+    articles = relationship(
+        "Article", secondary="articles_readers", back_populates="readers"
+    )
+
+
+class ArticleReader(Base):
+    __tablename__ = "articles_readers"
+    article_id = Column(Integer(), ForeignKey("articles.id"), primary_key=True)
+    reader_id = Column(Integer(), ForeignKey("readers.id"), primary_key=True)