Syntax cleaning

This commit is contained in:
Ross Lawley
2011-12-07 01:34:36 -08:00
parent 216f15602b
commit 112e921ce2
2 changed files with 43 additions and 40 deletions

View File

@@ -2586,6 +2586,7 @@ class DocumentTest(unittest.TestCase):
def test_db_ref_usage(self):
""" DB Ref usage in __raw__ queries """
class User(Document):
name = StringField()
@@ -2608,50 +2609,52 @@ class DocumentTest(unittest.TestCase):
Book.drop_collection()
# Authors
bob = User.objects.create(name = "Bob")
jon = User.objects.create(name = "Jon")
bob = User.objects.create(name="Bob")
jon = User.objects.create(name="Jon")
# Redactors
karl = User.objects.create(name = "Karl")
susan = User.objects.create(name = "Susan")
peter = User.objects.create(name = "Peter")
karl = User.objects.create(name="Karl")
susan = User.objects.create(name="Susan")
peter = User.objects.create(name="Peter")
# Bob
Book.objects.create(name = "1", author = bob, extra = {"a": bob.to_dbref(), "b" : [karl.to_dbref(), susan.to_dbref()]} )
Book.objects.create(name = "2", author = bob, extra = {"a": bob.to_dbref(), "b" : karl.to_dbref()} )
Book.objects.create(name = "3", author = bob, extra = {"a": bob.to_dbref(), "c" : [jon.to_dbref(), peter.to_dbref()] })
Book.objects.create(name = "4", author = bob)
Book.objects.create(name="1", author=bob, extra={"a": bob.to_dbref(), "b": [karl.to_dbref(), susan.to_dbref()]})
Book.objects.create(name="2", author=bob, extra={"a": bob.to_dbref(), "b": karl.to_dbref()} )
Book.objects.create(name="3", author=bob, extra={"a": bob.to_dbref(), "c": [jon.to_dbref(), peter.to_dbref()]})
Book.objects.create(name="4", author=bob)
# Jon
Book.objects.create(name = "5", author = jon)
Book.objects.create(name = "6", author = peter)
Book.objects.create(name = "7", author = jon)
Book.objects.create(name = "8", author = jon)
Book.objects.create(name = "9", author = jon, extra = {"a": peter.to_dbref()})
Book.objects.create(name="5", author=jon)
Book.objects.create(name="6", author=peter)
Book.objects.create(name="7", author=jon)
Book.objects.create(name="8", author=jon)
Book.objects.create(name="9", author=jon, extra={"a": peter.to_dbref()})
# Checks
self.assertEqual(u",".join([str(b) for b in Book.objects.all()] ) , "1,2,3,4,5,6,7,8,9" )
# bob related books
self.assertEqual(u",".join([str(b) for b in Book.objects.filter(
Q(extra__a = bob ) |
Q(author = bob) |
Q(extra__b = bob ) )] ) ,
"1,2,3,4" )
Q(extra__a=bob ) |
Q(author=bob) |
Q(extra__b=bob))]) ,
"1,2,3,4")
# Susan & Karl related books
self.assertEqual(u",".join([str(b) for b in Book.objects.filter(
Q(extra__a__all = [karl, susan] ) |
Q(author__all = [karl, susan ] ) |
Q(extra__b__all = [karl.to_dbref(), susan.to_dbref()] )
Q(extra__a__all=[karl, susan] ) |
Q(author__all=[karl, susan ] ) |
Q(extra__b__all=[karl.to_dbref(), susan.to_dbref()] )
) ] ) , "1" )
# $Where
self.assertEqual(u",".join([str(b) for b in Book.objects.filter(
__raw__ = {
"$where" : """function(){ return this.name == '1' || this.name == '2'; } """
__raw__={
"$where": """
function(){
return this.name == '1' ||
this.name == '2';}"""
}
) ] ) , "1,2" )
) ]), "1,2")
if __name__ == '__main__':
unittest.main()