merge master

Author: erikwrede

graphene_sqlalchemy/tests/models.py

@@ -26,11 +26,10 @@
 from graphene_sqlalchemy.utils import SQL_VERSION_HIGHER_EQUAL_THAN_1_4, SQL_VERSION_HIGHER_EQUAL_THAN_2
 
 # fmt: off
-import sqlalchemy
 if SQL_VERSION_HIGHER_EQUAL_THAN_2:
-    from sqlalchemy.sql.sqltypes import HasExpressionLookup # noqa  # isort:skip
+    from sqlalchemy.sql.sqltypes import HasExpressionLookup  # noqa  # isort:skip
 else:
-    from sqlalchemy.sql.sqltypes import _LookupExpressionAdapter as HasExpressionLookup # noqa  # isort:skip
+    from sqlalchemy.sql.sqltypes import _LookupExpressionAdapter as HasExpressionLookup  # noqa  # isort:skip
 # fmt: on
 
 PetKind = Enum("cat", "dog", name="pet_kind")

graphene_sqlalchemy/types.py

@@ -408,13 +408,15 @@ class SQLAlchemyObjectType(SQLAlchemyBase, ObjectType):
 
     Usage:
 
-        class MyModel(Base):
-            id = Column(Integer(), primary_key=True)
-            name = Column(String())
+        .. code-block:: python
 
-        class MyType(SQLAlchemyObjectType):
-            class Meta:
-                model = MyModel
+            class MyModel(Base):
+                id = Column(Integer(), primary_key=True)
+                name = Column(String())
+
+            class MyType(SQLAlchemyObjectType):
+                class Meta:
+                    model = MyModel
     """
 
     @classmethod
@@ -450,30 +452,32 @@ class SQLAlchemyInterface(SQLAlchemyBase, Interface):
 
     Usage (using joined table inheritance):
 
-        class MyBaseModel(Base):
-            id = Column(Integer(), primary_key=True)
-            type = Column(String())
-            name = Column(String())
+        .. code-block:: python
 
-        __mapper_args__ = {
-            "polymorphic_on": type,
-        }
+            class MyBaseModel(Base):
+                id = Column(Integer(), primary_key=True)
+                type = Column(String())
+                name = Column(String())
 
-        class MyChildModel(Base):
-            date = Column(Date())
+            __mapper_args__ = {
+                "polymorphic_on": type,
+            }
 
-        __mapper_args__ = {
-            "polymorphic_identity": "child",
-        }
+            class MyChildModel(Base):
+                date = Column(Date())
 
-        class MyBaseType(SQLAlchemyInterface):
-            class Meta:
-                model = MyBaseModel
+            __mapper_args__ = {
+                "polymorphic_identity": "child",
+            }
 
-        class MyChildType(SQLAlchemyObjectType):
-            class Meta:
-                model = MyChildModel
-                interfaces = (MyBaseType,)
+            class MyBaseType(SQLAlchemyInterface):
+                class Meta:
+                    model = MyBaseModel
+
+            class MyChildType(SQLAlchemyObjectType):
+                class Meta:
+                    model = MyChildModel
+                    interfaces = (MyBaseType,)
     """
 
     @classmethod

graphene_sqlalchemy/utils.py

@@ -27,12 +27,18 @@ def is_graphene_version_less_than(version_string):  # pragma: no cover
 
 SQL_VERSION_HIGHER_EQUAL_THAN_1_4 = False
 
-if not is_sqlalchemy_version_less_than("1.4"):
+if not is_sqlalchemy_version_less_than("1.4"):  # pragma: no cover
     from sqlalchemy.ext.asyncio import AsyncSession
 
     SQL_VERSION_HIGHER_EQUAL_THAN_1_4 = True
 
 
+SQL_VERSION_HIGHER_EQUAL_THAN_2 = False
+
+if not is_sqlalchemy_version_less_than("2.0.0b1"):  # pragma: no cover
+    SQL_VERSION_HIGHER_EQUAL_THAN_2 = True
+
+
 def get_session(context):
     return context.get("session")