pub/mongoengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed document equality: documents in different collections can have equal ids.

Browse Source
This commit is contained in:
tprimozi 2014-02-13 18:12:33 +00:00
parent c5c7378c63
commit 0523c2ea4b
2 changed files with 43 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mongoengine/base/document.py
View File

@ -216,7 +216,7 @@ class BaseDocument(object):
if isinstance(other, self.__class__) and hasattr(other, 'id'): if isinstance(other, self.__class__) and hasattr(other, 'id'):
return self.id == other.id return self.id == other.id
if isinstance(other, DBRef): if isinstance(other, DBRef):
return self.id == other.id return self._get_collection_name() == other.collection and self.id == other.id
return False return False
def __ne__(self, other): def __ne__(self, other):

50
tests/document/instance.py
View File

@ -2456,27 +2456,61 @@ class InstanceTest(unittest.TestCase):
class Test2(Document): class Test2(Document):
name = StringField() name = StringField()
class Test3(Document):
name = StringField()
class Test(Document): class Test(Document):
name = StringField() name = StringField()
test2 = ReferenceField('Test2') test2 = ReferenceField('Test2')
test3 = ReferenceField('Test3')
Test.drop_collection() Test.drop_collection()
Test2.drop_collection() Test2.drop_collection()
Test3.drop_collection()
t2 = Test2(name='a') t2 = Test2(name='a')
t2.save() t2.save()
t = Test(name='b', test2 = t2) t3 = Test3(name='x')
t3.id = t2.id
t3.save()
t = Test(name='b', test2=t2, test3=t3)
f = Test._from_son(t.to_mongo()) f = Test._from_son(t.to_mongo())
dbref = f._data['test2'] dbref2 = f._data['test2']
obj = f.test2 obj2 = f.test2
self.assertTrue(isinstance(dbref, DBRef)) self.assertTrue(isinstance(dbref2, DBRef))
self.assertTrue(isinstance(obj, Test2)) self.assertTrue(isinstance(obj2, Test2))
self.assertTrue(obj.id == dbref.id) self.assertTrue(obj2.id == dbref2.id)
self.assertTrue(obj == dbref) self.assertTrue(obj2 == dbref2)
self.assertTrue(dbref == obj) self.assertTrue(dbref2 == obj2)
dbref3 = f._data['test3']
obj3 = f.test3
self.assertTrue(isinstance(dbref3, DBRef))
self.assertTrue(isinstance(obj3, Test3))
self.assertTrue(obj3.id == dbref3.id)
self.assertTrue(obj3 == dbref3)
self.assertTrue(dbref3 == obj3)
self.assertTrue(obj2.id == obj3.id)
self.assertTrue(dbref2.id == dbref3.id)
self.assertFalse(dbref2 == dbref3)
self.assertFalse(dbref3 == dbref2)
self.assertTrue(dbref2 != dbref3)
self.assertTrue(dbref3 != dbref2)
self.assertFalse(obj2 == dbref3)
self.assertFalse(dbref3 == obj2)
self.assertTrue(obj2 != dbref3)
self.assertTrue(dbref3 != obj2)
self.assertFalse(obj3 == dbref2)
self.assertFalse(dbref2 == obj3)
self.assertTrue(obj3 != dbref2)
self.assertTrue(dbref2 != obj3)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()