diff --git a/VERSION b/VERSION index 5e372771..5b654a16 100644 --- a/VERSION +++ b/VERSION @@ -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 diff --git a/gluon/dal.py b/gluon/dal.py index 86586631..ae137270 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -5137,35 +5137,35 @@ class GoogleDatastoreAdapter(NoSQLAdapter): return [GAEF(first.name, '!=', self.represent(second, first.type), lambda a, b:a!=b)] else: 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)] def LT(self, first, second=None): if first.type != 'id': return [GAEF(first.name, '<', self.represent(second, first.type), lambda a, b:a', self.represent(second, first.type), lambda a, b:a>b)] 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)] def GE(self, first, second=None): if first.type != 'id': return [GAEF(first.name, '>=', self.represent(second, first.type), lambda a, b:a>=b)] 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)] def INVERT(self, first):