Ensure that UnsortedSQLAlchemyConnectionField skips sort argument if it gets passed.

Author: PaulSchweizer

graphene_sqlalchemy/batching.py

@@ -95,7 +95,7 @@ async def batch_load_fn(self, parents):
 
 
 def get_batch_resolver(relationship_prop):
-    """get the resolve function for the given relationship."""
+    """Get the resolve function for the given relationship."""
 
     def _get_loader(relationship_prop):
         """Retrieve the cached loader of the given relationship."""

graphene_sqlalchemy/fields.py

@@ -125,13 +125,19 @@ def wrap_resolve(self, parent_resolver):
 # TODO Remove in next major version
 class UnsortedSQLAlchemyConnectionField(SQLAlchemyConnectionField):
     def __init__(self, type_, *args, **kwargs):
-        super(UnsortedSQLAlchemyConnectionField, self).__init__(type_, *args, **kwargs)
+        if "sort" in kwargs and kwargs["sort"] is not None:
+            warnings.warn(
+                "UnsortedSQLAlchemyConnectionField does not support sorting. "
+                "All sorting arguments will be ignored."
+            )
+            kwargs["sort"] = None
         warnings.warn(
             "UnsortedSQLAlchemyConnectionField is deprecated and will be removed in the next "
-            "major version. Use SQLAlchemyConnectionField instead and set `sort = None` "
-            "if you want to disable sorting.",
+            "major version. Use SQLAlchemyConnectionField instead and either don't "
+            "provide the `sort` argument or set it to None if you do not want sorting.",
             DeprecationWarning,
         )
+        super(UnsortedSQLAlchemyConnectionField, self).__init__(type_, *args, **kwargs)
 
 
 class BatchSQLAlchemyConnectionField(SQLAlchemyConnectionField):

graphene_sqlalchemy/tests/test_fields.py

@@ -64,6 +64,14 @@ def test_type_assert_object_has_connection():
 ##
 
 
+def test_unsorted_connection_field_removes_sort_arg_if_passed():
+    editor = UnsortedSQLAlchemyConnectionField(
+        Editor.connection,
+        sort=Editor.sort_argument(has_default=True)
+    )
+    assert "sort" not in editor.args
+
+
 def test_sort_added_by_default():
     field = SQLAlchemyConnectionField(Pet.connection)
     assert "sort" in field.args