dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Key.from_path -> self.keyfunc, thanks Quint

Browse Source
This commit is contained in:
mdipierro
2014-09-02 10:10:14 -05:00
parent 5fc7dee4cc
commit d73c668f2d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.9.6-stable+timestamp.2014.09.01.20.55.31 Version 2.9.6-stable+timestamp.2014.09.02.10.10.07
gluon/dal.py
+5 -5
View File
@@ -5137,35 +5137,35 @@ class GoogleDatastoreAdapter(NoSQLAdapter):
return [GAEF(first.name, '!=', self.represent(second, first.type), lambda a, b:a!=b)] return [GAEF(first.name, '!=', self.represent(second, first.type), lambda a, b:a!=b)]
else: else:
if not second is None: if not second is None:
second = Key.from_path(first._tablename, long(second)) second = self.keyfunc(first._tablename, long(second))
return [GAEF(first.name, '!=', second, lambda a, b:a!=b)] return [GAEF(first.name, '!=', second, lambda a, b:a!=b)]
def LT(self, first, second=None): def LT(self, first, second=None):
if first.type != 'id': if first.type != 'id':
return [GAEF(first.name, '<', self.represent(second, first.type), lambda a, b:a<b)] return [GAEF(first.name, '<', self.represent(second, first.type), lambda a, b:a<b)]
else: else:
second = Key.from_path(first._tablename, long(second)) second = self.keyfunc(first._tablename, long(second))
return [GAEF(first.name, '<', second, lambda a, b:a<b)] return [GAEF(first.name, '<', second, lambda a, b:a<b)]
def LE(self, first, second=None): def LE(self, first, second=None):
if first.type != 'id': if first.type != 'id':
return [GAEF(first.name, '<=', self.represent(second, first.type), lambda a, b:a<=b)] return [GAEF(first.name, '<=', self.represent(second, first.type), lambda a, b:a<=b)]
else: else:
second = Key.from_path(first._tablename, long(second)) second = self.keyfunc(first._tablename, long(second))
return [GAEF(first.name, '<=', second, lambda a, b:a<=b)] return [GAEF(first.name, '<=', second, lambda a, b:a<=b)]
def GT(self, first, second=None): def GT(self, first, second=None):
if first.type != 'id' or second==0 or second == '0': if first.type != 'id' or second==0 or second == '0':
return [GAEF(first.name, '>', self.represent(second, first.type), lambda a, b:a>b)] return [GAEF(first.name, '>', self.represent(second, first.type), lambda a, b:a>b)]
else: else:
second = Key.from_path(first._tablename, long(second)) second = self.keyfunc(first._tablename, long(second))
return [GAEF(first.name, '>', second, lambda a, b:a>b)] return [GAEF(first.name, '>', second, lambda a, b:a>b)]
def GE(self, first, second=None): def GE(self, first, second=None):
if first.type != 'id': if first.type != 'id':
return [GAEF(first.name, '>=', self.represent(second, first.type), lambda a, b:a>=b)] return [GAEF(first.name, '>=', self.represent(second, first.type), lambda a, b:a>=b)]
else: else:
second = Key.from_path(first._tablename, long(second)) second = self.keyfunc(first._tablename, long(second))
return [GAEF(first.name, '>=', second, lambda a, b:a>=b)] return [GAEF(first.name, '>=', second, lambda a, b:a>=b)]
def INVERT(self, first): def INVERT(self, first):