From a91570768e365c9b81622d8659afa0ca31e87991 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 16 Nov 2013 11:52:18 -0600 Subject: [PATCH] fixed typo --- VERSION | 2 +- gluon/dal.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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):