Merge branch 'ref_field_to_mongo_bug' of https://github.com/yakxxx/mongoengine

Conflicts:
	AUTHORS
This commit is contained in:
Ross Lawley 2012-12-10 09:20:20 +00:00
commit d7fd6a4628
3 changed files with 12 additions and 1 deletions

View File

@ -126,3 +126,4 @@ that much better:
* Garry Polley
* Adrian Scott
* Peter Teichman
* Jakub Kot

View File

@ -778,7 +778,7 @@ class ReferenceField(BaseField):
def to_mongo(self, document):
if isinstance(document, DBRef):
if not self.dbref:
return DBRef.id
return document.id
return document
elif not self.dbref and isinstance(document, basestring):
return document

View File

@ -1105,6 +1105,16 @@ class FieldTest(unittest.TestCase):
p = Person.objects.get(name="Ross")
self.assertEqual(p.parent, p1)
def test_dbref_to_mongo(self):
class Person(Document):
name = StringField()
parent = ReferenceField('self', dbref=False)
p1 = Person._from_son({'name': "Yakxxx",
'parent': "50a234ea469ac1eda42d347d"})
mongoed = p1.to_mongo()
self.assertTrue(isinstance(mongoed['parent'], ObjectId))
def test_objectid_reference_fields(self):
class Person(Document):