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

Store ordered list of field names, and return the ordered list when iterating a document instance.

Browse Source
This commit is contained in:
Alice Bevan-McGregor 2013-04-03 15:00:34 -04:00
parent 9f58bc9207
commit 32d5c0c946
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mongoengine/base.py
View File

@ -560,8 +560,11 @@ class DocumentMetaclass(type):
# Set _fields and db_field maps # Set _fields and db_field maps
attrs['_fields'] = doc_fields attrs['_fields'] = doc_fields
attrs['_db_field_map'] = dict([(k, getattr(v, 'db_field', k)) attrs['_fields_ordered'] = tuple(i[1]
for k, v in doc_fields.iteritems()]) for i in sorted((v.creation_counter, v.name)
for v in doc_fields.itervalues()))
attrs['_db_field_map'] = dict((k, getattr(v, 'db_field', k))
for k, v in doc_fields.iteritems())
attrs['_reverse_db_field_map'] = dict( attrs['_reverse_db_field_map'] = dict(
(v, k) for k, v in attrs['_db_field_map'].iteritems()) (v, k) for k, v in attrs['_db_field_map'].iteritems())
@ -1302,7 +1305,10 @@ class BaseDocument(object):
return value return value
def __iter__(self): def __iter__(self):
return iter(self._fields) if 'id' in self._fields and 'id' not in self._fields_ordered:
return iter(('id', ) + self._fields_ordered)
return iter(self._fields_ordered)
def __getitem__(self, name): def __getitem__(self, name):
"""Dictionary-style field access, return a field's value if present. """Dictionary-style field access, return a field's value if present.