fix: sort many args (#468)

* fix: sort many args

* fix: test model

* version: 1.16.7

beanie/__init__.py

@@ -26,7 +26,7 @@
 from beanie.odm.views import View
 from beanie.odm.union_doc import UnionDoc
 
-__version__ = "1.16.6"
+__version__ = "1.16.7"
 __all__ = [
     # ODM
     "Document",

beanie/odm/fields.py

@@ -94,6 +94,8 @@ def __hash__(self):
         return hash(str(self))
 
     def __eq__(self, other):
+        if isinstance(other, ExpressionField):
+            return super(ExpressionField, self).__eq__(other)
         return Eq(field=self, other=other)
 
     def __gt__(self, other):

docs/changelog.md

@@ -2,6 +2,16 @@
 
 Beanie project
 
+## [1.16.7] - 2023-01-03
+
+### Fix
+
+- sort many args
+
+### Implementation
+
+- PR <https://github.com/roman-right/beanie/pull/468>
+
 ## [1.16.6] - 2022-12-27
 
 ### Feature
@@ -1214,4 +1224,6 @@ how specific type should be presented in the database
 
 [1.15.5]: https://pypi.org/project/beanie/1.15.5
 
-[1.16.6]: https://pypi.org/project/beanie/1.16.6
+[1.16.6]: https://pypi.org/project/beanie/1.16.6
+
+[1.16.7]: https://pypi.org/project/beanie/1.16.7

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "beanie"
-version = "1.16.6"
+version = "1.16.7"
 description = "Asynchronous Python ODM for MongoDB"
 authors = ["Roman <[email protected]>"]
 license = "Apache-2.0"

tests/odm/conftest.py

@@ -106,6 +106,8 @@ async def preset_documents(point):
             optional=optional,
         )
 
+        const = "TEST"
+
         sample = Sample(
             timestamp=timestamp,
             increment=i,
@@ -116,7 +118,9 @@ async def preset_documents(point):
             optional=optional,
             union=union,
             geo=geo,
+            const=const,
         )
+
         docs.append(sample)
     await Sample.insert_many(documents=docs)
 

tests/odm/models.py

@@ -63,6 +63,7 @@ class Sample(Document):
     optional: Optional[Option2]
     union: Union[Option1, Option2]
     geo: GeoObject
+    const: str = "TEST"
 
 
 class SubDocument(BaseModel):

tests/odm/query/test_find.py

@@ -207,6 +207,18 @@ async def test_sort(preset_documents):
         assert i_buf >= a.integer
         i_buf = a.integer
 
+    result = (
+        await Sample.find_many(Sample.integer > 1)
+        .sort([Sample.const, -Sample.integer])
+        .to_list()
+    )
+    i_buf = None
+    for a in result:
+        if i_buf is None:
+            i_buf = a.integer
+        assert i_buf >= a.integer
+        i_buf = a.integer
+
     with pytest.raises(TypeError):
         Sample.find_many(Sample.integer > 1, sort=1)
 

tests/test_beanie.py

@@ -2,4 +2,4 @@
 
 
 def test_version():
-    assert __version__ == "1.16.6"
+    assert __version__ == "1.16.7"