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

Merge remote-tracking branch 'origin/pr/393' into 393

Browse Source 
Conflicts:
	mongoengine/queryset/queryset.py
	tests/queryset/queryset.py
This commit is contained in:
Ross Lawley 2013-07-10 19:53:13 +00:00
commit 6e89e736b7
2 changed files with 171 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
mongoengine/queryset/base.py
View File

@ -1002,26 +1002,27 @@ class BaseQuerySet(object):
.. versionchanged:: 0.5 - updated to map_reduce as db.eval doesnt work .. versionchanged:: 0.5 - updated to map_reduce as db.eval doesnt work
with sharding. with sharding.
""" """
map_func = Code(""" map_func = """
function() { function() {
function deepFind(obj, path) { var path = '{{~%(field)s}}'.split('.'),
var paths = path.split('.') field = this;
, current = obj
, i;
for (i = 0; i < paths.length; ++i) { for (p in path) {
if (current[paths[i]] == undefined) { if (typeof field != 'undefined')
return undefined; field = field[path[p]];
} else { else
current = current[paths[i]]; break;
}
}
return current;
} }
emit(1, deepFind(this, field) || 0); if (field && field.constructor == Array) {
field.forEach(function(item) {
emit(1, item||0);
});
} else if (typeof field != 'undefined') {
emit(1, field||0);
}
} }
""", scope={'field': field}) """ % dict(field=field)
reduce_func = Code(""" reduce_func = Code("""
function(key, values) { function(key, values) {
@ -1047,28 +1048,27 @@ class BaseQuerySet(object):
.. versionchanged:: 0.5 - updated to map_reduce as db.eval doesnt work .. versionchanged:: 0.5 - updated to map_reduce as db.eval doesnt work
with sharding. with sharding.
""" """
map_func = Code(""" map_func = """
function() { function() {
function deepFind(obj, path) { var path = '{{~%(field)s}}'.split('.'),
var paths = path.split('.') field = this;
, current = obj
, i;
for (i = 0; i < paths.length; ++i) { for (p in path) {
if (current[paths[i]] == undefined) { if (typeof field != 'undefined')
return undefined; field = field[path[p]];
} else { else
current = current[paths[i]]; break;
}
}
return current;
} }
val = deepFind(this, field) if (field && field.constructor == Array) {
if (val !== undefined) field.forEach(function(item) {
emit(1, {t: val || 0, c: 1}); emit(1, {t: item||0, c: 1});
});
} else if (typeof field != 'undefined') {
emit(1, {t: field||0, c: 1});
}
} }
""", scope={'field': field}) """ % dict(field=field)
reduce_func = Code(""" reduce_func = Code("""
function(key, values) { function(key, values) {

139
tests/queryset/queryset.py
View File

@ -2246,6 +2246,145 @@ class QuerySetTest(unittest.TestCase):
self.Person(name='weightless person').save() self.Person(name='weightless person').save()
self.assertEqual(int(self.Person.objects.sum('age')), sum(ages)) self.assertEqual(int(self.Person.objects.sum('age')), sum(ages))
def test_embedded_average(self):
class Pay(EmbeddedDocument):
value = DecimalField()
class Doc(Document):
name = StringField()
pay = EmbeddedDocumentField(
Pay)
Doc.drop_collection()
Doc(name=u"Wilson Junior",
pay=Pay(value=150)).save()
Doc(name=u"Isabella Luanna",
pay=Pay(value=530)).save()
Doc(name=u"Tayza mariana",
pay=Pay(value=165)).save()
Doc(name=u"Eliana Costa",
pay=Pay(value=115)).save()
self.assertEqual(
Doc.objects.average('pay.value'),
240)
def test_embedded_array_average(self):
class Pay(EmbeddedDocument):
values = ListField(DecimalField())
class Doc(Document):
name = StringField()
pay = EmbeddedDocumentField(
Pay)
Doc.drop_collection()
Doc(name=u"Wilson Junior",
pay=Pay(values=[150, 100])).save()
Doc(name=u"Isabella Luanna",
pay=Pay(values=[530, 100])).save()
Doc(name=u"Tayza mariana",
pay=Pay(values=[165, 100])).save()
Doc(name=u"Eliana Costa",
pay=Pay(values=[115, 100])).save()
self.assertEqual(
Doc.objects.average('pay.values'),
170)
def test_array_average(self):
class Doc(Document):
values = ListField(DecimalField())
Doc.drop_collection()
Doc(values=[150, 100]).save()
Doc(values=[530, 100]).save()
Doc(values=[165, 100]).save()
Doc(values=[115, 100]).save()
self.assertEqual(
Doc.objects.average('values'),
170)
def test_embedded_sum(self):
class Pay(EmbeddedDocument):
value = DecimalField()
class Doc(Document):
name = StringField()
pay = EmbeddedDocumentField(
Pay)
Doc.drop_collection()
Doc(name=u"Wilson Junior",
pay=Pay(value=150)).save()
Doc(name=u"Isabella Luanna",
pay=Pay(value=530)).save()
Doc(name=u"Tayza mariana",
pay=Pay(value=165)).save()
Doc(name=u"Eliana Costa",
pay=Pay(value=115)).save()
self.assertEqual(
Doc.objects.sum('pay.value'),
960)
def test_embedded_array_sum(self):
class Pay(EmbeddedDocument):
values = ListField(DecimalField())
class Doc(Document):
name = StringField()
pay = EmbeddedDocumentField(
Pay)
Doc.drop_collection()
Doc(name=u"Wilson Junior",
pay=Pay(values=[150, 100])).save()
Doc(name=u"Isabella Luanna",
pay=Pay(values=[530, 100])).save()
Doc(name=u"Tayza mariana",
pay=Pay(values=[165, 100])).save()
Doc(name=u"Eliana Costa",
pay=Pay(values=[115, 100])).save()
self.assertEqual(
Doc.objects.sum('pay.values'),
1360)
def test_array_sum(self):
class Doc(Document):
values = ListField(DecimalField())
Doc.drop_collection()
Doc(values=[150, 100]).save()
Doc(values=[530, 100]).save()
Doc(values=[165, 100]).save()
Doc(values=[115, 100]).save()
self.assertEqual(
Doc.objects.sum('values'),
1360)
def test_distinct(self): def test_distinct(self):
"""Ensure that the QuerySet.distinct method works. """Ensure that the QuerySet.distinct method works.
""" """