Skip to content

Commit 6feeb97

Browse files
committed
fix test
1 parent 28249a8 commit 6feeb97

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

graphene_sqlalchemy/tests/test_batching.py

+7-5
Original file line numberDiff line numberDiff line change
@@ -604,8 +604,6 @@ class Meta:
604604
batching = False
605605
connection_field_factory = BatchSQLAlchemyConnectionField.from_relationship
606606

607-
articles = ORMField(batching=False)
608-
609607
class ArticleType(SQLAlchemyObjectType):
610608
class Meta:
611609
model = Article
@@ -637,7 +635,13 @@ def resolve_reporters(self, info):
637635
""", context_value={"session": session})
638636
messages = sqlalchemy_logging_handler.messages
639637

640-
select_statements = [message for message in messages if 'SELECT' in message and 'FROM articles' in message]
638+
if is_sqlalchemy_version_less_than('1.3'):
639+
# The batched SQL statement generated is different in 1.2.x
640+
# SQLAlchemy 1.3+ optimizes out a JOIN statement in `selectin`
641+
# See https://git.io/JewQu
642+
select_statements = [message for message in messages if 'SELECT' in message and 'JOIN articles' in message]
643+
else:
644+
select_statements = [message for message in messages if 'SELECT' in message and 'FROM articles' in message]
641645
assert len(select_statements) == 1
642646

643647

@@ -657,8 +661,6 @@ class Meta:
657661
batching = True
658662
connection_field_factory = default_connection_field_factory
659663

660-
articles = ORMField(batching=True)
661-
662664
class ArticleType(SQLAlchemyObjectType):
663665
class Meta:
664666
model = Article

0 commit comments

Comments
 (0)