Fix syntax error in Batching from signature changes

Author: colelin26

graphene_sqlalchemy/batching.py

@@ -3,6 +3,8 @@
 from sqlalchemy.orm import Session, strategies
 from sqlalchemy.orm.query import QueryContext
 
+from .utils import is_sqlalchemy_version_less_than
+
 
 def get_batch_resolver(relationship_prop):
 
@@ -52,15 +54,30 @@ async def batch_load_fn(self, parents):
             states = [(sqlalchemy.inspect(parent), True) for parent in parents]
 
             # For our purposes, the query_context will only used to get the session
-            query_context = QueryContext(session.query(parent_mapper.entity))
-
-            selectin_loader._load_for_path(
-                query_context,
-                parent_mapper._path_registry,
-                states,
-                None,
-                child_mapper,
-            )
+            query_context = None
+            if is_sqlalchemy_version_less_than('1.4'):
+                query_context = QueryContext(session.query(parent_mapper.entity))
+            else:
+                parent_mapper_query = session.query(parent_mapper.entity)
+                query_context = parent_mapper_query._compile_context()
+
+            if is_sqlalchemy_version_less_than('1.4'):
+                selectin_loader._load_for_path(
+                    query_context,
+                    parent_mapper._path_registry,
+                    states,
+                    None,
+                    child_mapper
+                )
+            else:
+                selectin_loader._load_for_path(
+                    query_context,
+                    parent_mapper._path_registry,
+                    states,
+                    None,
+                    child_mapper,
+                    None
+                )
 
             return [getattr(parent, relationship_prop.key) for parent in parents]
 

graphene_sqlalchemy/tests/test_batching.py

@@ -10,7 +10,8 @@
                       default_connection_field_factory)
 from ..types import ORMField, SQLAlchemyObjectType
 from .models import Article, HairKind, Pet, Reporter
-from .utils import is_sqlalchemy_version_less_than, to_std_dicts
+from ..utils import is_sqlalchemy_version_less_than
+from .utils import to_std_dicts
 
 
 class MockLoggingHandler(logging.Handler):

graphene_sqlalchemy/tests/test_benchmark.py

@@ -4,8 +4,8 @@
 from graphene import relay
 
 from ..types import SQLAlchemyObjectType
+from ..utils import is_sqlalchemy_version_less_than
 from .models import Article, HairKind, Pet, Reporter
-from .utils import is_sqlalchemy_version_less_than
 
 if is_sqlalchemy_version_less_than('1.2'):
     pytest.skip('SQL batching only works for SQLAlchemy 1.2+', allow_module_level=True)

graphene_sqlalchemy/tests/test_converter.py

@@ -47,7 +47,7 @@ class Model(declarative_base()):
     return convert_sqlalchemy_column(column_prop, get_global_registry(), mock_resolver)
 
 
-def _test_should_unknown_sqlalchemy_field_raise_exception():
+def test_should_unknown_sqlalchemy_field_raise_exception():
     # TODO: SQLALchemy does not export types.Binary, remove or update this test
     re_err = "Don't know how to convert the SQLAlchemy field"
     with pytest.raises(Exception, match=re_err):

graphene_sqlalchemy/tests/utils.py

@@ -1,6 +1,3 @@
-import pkg_resources
-
-
 def to_std_dicts(value):
     """Convert nested ordered dicts to normal dicts for better comparison."""
     if isinstance(value, dict):
@@ -9,8 +6,3 @@ def to_std_dicts(value):
         return [to_std_dicts(v) for v in value]
     else:
         return value
-
-
-def is_sqlalchemy_version_less_than(version_string):
-    """Check the installed SQLAlchemy version"""
-    return pkg_resources.get_distribution('SQLAlchemy').parsed_version < pkg_resources.parse_version(version_string)

graphene_sqlalchemy/utils.py

@@ -1,6 +1,7 @@
 import re
 import warnings
 
+import pkg_resources
 from sqlalchemy.exc import ArgumentError
 from sqlalchemy.orm import class_mapper, object_mapper
 from sqlalchemy.orm.exc import UnmappedClassError, UnmappedInstanceError
@@ -140,3 +141,8 @@ def sort_argument_for_model(cls, has_default=True):
         enum.default = None
 
     return Argument(List(enum), default_value=enum.default)
+
+
+def is_sqlalchemy_version_less_than(version_string):
+    """Check the installed SQLAlchemy version"""
+    return pkg_resources.get_distribution('SQLAlchemy').parsed_version < pkg_resources.parse_version(version_string)