Merge branch 'master' into drop_py2_support
This commit is contained in:
		| @@ -805,18 +805,6 @@ class TestIndexes(unittest.TestCase): | ||||
|         info = Log.objects._collection.index_information() | ||||
|         assert 3600 == info["created_1"]["expireAfterSeconds"] | ||||
|  | ||||
|     def test_index_drop_dups_silently_ignored(self): | ||||
|         class Customer(Document): | ||||
|             cust_id = IntField(unique=True, required=True) | ||||
|             meta = { | ||||
|                 "indexes": ["cust_id"], | ||||
|                 "index_drop_dups": True, | ||||
|                 "allow_inheritance": False, | ||||
|             } | ||||
|  | ||||
|         Customer.drop_collection() | ||||
|         Customer.objects.first() | ||||
|  | ||||
|     def test_unique_and_indexes(self): | ||||
|         """Ensure that 'unique' constraints aren't overridden by | ||||
|         meta.indexes. | ||||
| @@ -1057,10 +1045,6 @@ class TestIndexes(unittest.TestCase): | ||||
|                 del index_info[key][ | ||||
|                     "ns" | ||||
|                 ]  # drop the index namespace - we don't care about that here, MongoDB 3+ | ||||
|             if "dropDups" in index_info[key]: | ||||
|                 del index_info[key][ | ||||
|                     "dropDups" | ||||
|                 ]  # drop the index dropDups - it is deprecated in MongoDB 3+ | ||||
|  | ||||
|         assert index_info == { | ||||
|             "txt_1": {"key": [("txt", 1)], "background": False}, | ||||
|   | ||||
| @@ -522,7 +522,6 @@ class TestInheritance(MongoDBTestCase): | ||||
|  | ||||
|         defaults = { | ||||
|             "index_background": True, | ||||
|             "index_drop_dups": True, | ||||
|             "index_opts": {"hello": "world"}, | ||||
|             "allow_inheritance": True, | ||||
|             "queryset_class": "QuerySet", | ||||
|   | ||||
| @@ -1,5 +1,6 @@ | ||||
| # -*- coding: utf-8 -*- | ||||
| import pytest | ||||
| from bson import InvalidDocument | ||||
|  | ||||
| from mongoengine import * | ||||
| from mongoengine.base import BaseDict | ||||
| @@ -19,22 +20,24 @@ class TestDictField(MongoDBTestCase): | ||||
|         post = BlogPost(info=info).save() | ||||
|         assert get_as_pymongo(post) == {"_id": post.id, "info": info} | ||||
|  | ||||
|     def test_general_things(self): | ||||
|         """Ensure that dict types work as expected.""" | ||||
|     def test_validate_invalid_type(self): | ||||
|         class BlogPost(Document): | ||||
|             info = DictField() | ||||
|  | ||||
|         BlogPost.drop_collection() | ||||
|  | ||||
|         invalid_infos = ["my post", ["test", "test"], {1: "test"}] | ||||
|         for invalid_info in invalid_infos: | ||||
|             with pytest.raises(ValidationError): | ||||
|                 BlogPost(info=invalid_info).validate() | ||||
|  | ||||
|     def test_keys_with_dots_or_dollars(self): | ||||
|         class BlogPost(Document): | ||||
|             info = DictField() | ||||
|  | ||||
|         BlogPost.drop_collection() | ||||
|  | ||||
|         post = BlogPost() | ||||
|         post.info = "my post" | ||||
|         with pytest.raises(ValidationError): | ||||
|             post.validate() | ||||
|  | ||||
|         post.info = ["test", "test"] | ||||
|         with pytest.raises(ValidationError): | ||||
|             post.validate() | ||||
|  | ||||
|         post.info = {"$title": "test"} | ||||
|         with pytest.raises(ValidationError): | ||||
| @@ -48,25 +51,34 @@ class TestDictField(MongoDBTestCase): | ||||
|         with pytest.raises(ValidationError): | ||||
|             post.validate() | ||||
|  | ||||
|         post.info = {1: "test"} | ||||
|         with pytest.raises(ValidationError): | ||||
|             post.validate() | ||||
|  | ||||
|         post.info = {"nested": {"the.title": "test"}} | ||||
|         if get_mongodb_version() < MONGODB_36: | ||||
|             with pytest.raises(ValidationError): | ||||
|                 post.validate() | ||||
|             # MongoDB < 3.6 rejects dots | ||||
|             # To avoid checking the mongodb version from the DictField class | ||||
|             # we rely on MongoDB to reject the data during the save | ||||
|             post.validate() | ||||
|             with pytest.raises(InvalidDocument): | ||||
|                 post.save() | ||||
|         else: | ||||
|             post.validate() | ||||
|  | ||||
|         post.info = {"dollar_and_dot": {"te$st.test": "test"}} | ||||
|         if get_mongodb_version() < MONGODB_36: | ||||
|             with pytest.raises(ValidationError): | ||||
|                 post.validate() | ||||
|             post.validate() | ||||
|             with pytest.raises(InvalidDocument): | ||||
|                 post.save() | ||||
|         else: | ||||
|             post.validate() | ||||
|  | ||||
|         post.info = {"title": "test"} | ||||
|     def test_general_things(self): | ||||
|         """Ensure that dict types work as expected.""" | ||||
|  | ||||
|         class BlogPost(Document): | ||||
|             info = DictField() | ||||
|  | ||||
|         BlogPost.drop_collection() | ||||
|  | ||||
|         post = BlogPost(info={"title": "test"}) | ||||
|         post.save() | ||||
|  | ||||
|         post = BlogPost() | ||||
|   | ||||
| @@ -272,32 +272,47 @@ class TestQueryset(unittest.TestCase): | ||||
|         with pytest.raises(InvalidQueryError): | ||||
|             self.Person.objects(name="User A").with_id(person1.id) | ||||
|  | ||||
|     def test_find_only_one(self): | ||||
|         """Ensure that a query using ``get`` returns at most one result. | ||||
|         """ | ||||
|     def test_get_no_document_exists_raises_doesnotexist(self): | ||||
|         assert self.Person.objects.count() == 0 | ||||
|         # Try retrieving when no objects exists | ||||
|         with pytest.raises(DoesNotExist): | ||||
|             self.Person.objects.get() | ||||
|         with pytest.raises(self.Person.DoesNotExist): | ||||
|             self.Person.objects.get() | ||||
|  | ||||
|     def test_get_multiple_match_raises_multipleobjectsreturned(self): | ||||
|         """Ensure that a query using ``get`` returns at most one result. | ||||
|         """ | ||||
|         assert self.Person.objects().count() == 0 | ||||
|  | ||||
|         person1 = self.Person(name="User A", age=20) | ||||
|         person1.save() | ||||
|         person2 = self.Person(name="User B", age=30) | ||||
|  | ||||
|         p = self.Person.objects.get() | ||||
|         assert p == person1 | ||||
|  | ||||
|         person2 = self.Person(name="User B", age=20) | ||||
|         person2.save() | ||||
|  | ||||
|         # Retrieve the first person from the database | ||||
|         person3 = self.Person(name="User C", age=30) | ||||
|         person3.save() | ||||
|  | ||||
|         # .get called without argument | ||||
|         with pytest.raises(MultipleObjectsReturned): | ||||
|             self.Person.objects.get() | ||||
|         with pytest.raises(self.Person.MultipleObjectsReturned): | ||||
|             self.Person.objects.get() | ||||
|  | ||||
|         # check filtering | ||||
|         with pytest.raises(MultipleObjectsReturned): | ||||
|             self.Person.objects.get(age__lt=30) | ||||
|         with pytest.raises(MultipleObjectsReturned) as exc_info: | ||||
|             self.Person.objects(age__lt=30).get() | ||||
|         assert "2 or more items returned, instead of 1" == str(exc_info.value) | ||||
|  | ||||
|         # Use a query to filter the people found to just person2 | ||||
|         person = self.Person.objects.get(age=30) | ||||
|         assert person.name == "User B" | ||||
|  | ||||
|         person = self.Person.objects.get(age__lt=30) | ||||
|         assert person.name == "User A" | ||||
|         assert person == person3 | ||||
|  | ||||
|     def test_find_array_position(self): | ||||
|         """Ensure that query by array position works. | ||||
| @@ -4461,6 +4476,74 @@ class TestQueryset(unittest.TestCase): | ||||
|         expected = "['A1', 'A2']" | ||||
|         assert expected == "%s" % sorted(names) | ||||
|  | ||||
|     def test_fields(self): | ||||
|         class Bar(EmbeddedDocument): | ||||
|             v = StringField() | ||||
|             z = StringField() | ||||
|  | ||||
|         class Foo(Document): | ||||
|             x = StringField() | ||||
|             y = IntField() | ||||
|             items = EmbeddedDocumentListField(Bar) | ||||
|  | ||||
|         Foo.drop_collection() | ||||
|  | ||||
|         Foo(x="foo1", y=1).save() | ||||
|         Foo(x="foo2", y=2, items=[]).save() | ||||
|         Foo(x="foo3", y=3, items=[Bar(z="a", v="V")]).save() | ||||
|         Foo( | ||||
|             x="foo4", | ||||
|             y=4, | ||||
|             items=[ | ||||
|                 Bar(z="a", v="V"), | ||||
|                 Bar(z="b", v="W"), | ||||
|                 Bar(z="b", v="X"), | ||||
|                 Bar(z="c", v="V"), | ||||
|             ], | ||||
|         ).save() | ||||
|         Foo( | ||||
|             x="foo5", | ||||
|             y=5, | ||||
|             items=[ | ||||
|                 Bar(z="b", v="X"), | ||||
|                 Bar(z="c", v="V"), | ||||
|                 Bar(z="d", v="V"), | ||||
|                 Bar(z="e", v="V"), | ||||
|             ], | ||||
|         ).save() | ||||
|  | ||||
|         foos_with_x = list(Foo.objects.order_by("y").fields(x=1)) | ||||
|  | ||||
|         assert all(o.x is not None for o in foos_with_x) | ||||
|  | ||||
|         foos_without_y = list(Foo.objects.order_by("y").fields(y=0)) | ||||
|  | ||||
|         assert all(o.y is None for o in foos_with_x) | ||||
|  | ||||
|         foos_with_sliced_items = list(Foo.objects.order_by("y").fields(slice__items=1)) | ||||
|  | ||||
|         assert foos_with_sliced_items[0].items == [] | ||||
|         assert foos_with_sliced_items[1].items == [] | ||||
|         assert len(foos_with_sliced_items[2].items) == 1 | ||||
|         assert foos_with_sliced_items[2].items[0].z == "a" | ||||
|         assert len(foos_with_sliced_items[3].items) == 1 | ||||
|         assert foos_with_sliced_items[3].items[0].z == "a" | ||||
|         assert len(foos_with_sliced_items[4].items) == 1 | ||||
|         assert foos_with_sliced_items[4].items[0].z == "b" | ||||
|  | ||||
|         foos_with_elem_match_items = list( | ||||
|             Foo.objects.order_by("y").fields(elemMatch__items={"z": "b"}) | ||||
|         ) | ||||
|  | ||||
|         assert foos_with_elem_match_items[0].items == [] | ||||
|         assert foos_with_elem_match_items[1].items == [] | ||||
|         assert foos_with_elem_match_items[2].items == [] | ||||
|         assert len(foos_with_elem_match_items[3].items) == 1 | ||||
|         assert foos_with_elem_match_items[3].items[0].z == "b" | ||||
|         assert foos_with_elem_match_items[3].items[0].v == "W" | ||||
|         assert len(foos_with_elem_match_items[4].items) == 1 | ||||
|         assert foos_with_elem_match_items[4].items[0].z == "b" | ||||
|  | ||||
|     def test_elem_match(self): | ||||
|         class Foo(EmbeddedDocument): | ||||
|             shape = StringField() | ||||
|   | ||||
		Reference in New Issue
	
	Block a user