diff --git a/VERSION b/VERSION index 23f4358d..7ce9068a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.7.4-stable+timestamp.2013.11.16.04.09.31 +Version 2.7.4-stable+timestamp.2013.11.16.11.51.18 diff --git a/gluon/dal.py b/gluon/dal.py index 5d4bf5bc..ea583da7 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -5875,12 +5875,12 @@ class MongoDBAdapter(NoSQLAdapter): return {'$not': self.expand(first)} def AND(self,first,second): - # pymongo expects: .find({'$or': [{'name':'1'}, {'name':'2'}]}) - return {'$and': [self.expand(first),self.expend(second)]} + # pymongo expects: .find({'$and': [{'x':'1'}, {'y':'2'}]}) + return {'$and': [self.expand(first),self.expand(second)]} def OR(self,first,second): # pymongo expects: .find({'$or': [{'name':'1'}, {'name':'2'}]}) - return {'$or': [self.expand(first),self.expend(second)]} + return {'$or': [self.expand(first),self.expand(second)]} def BELONGS(self, first, second): if isinstance(second, str):