diff -r 73760bbb66bd -r 78438ad513ca schema.py --- a/schema.py Wed Apr 07 09:24:00 2010 +0200 +++ b/schema.py Wed Apr 07 14:26:35 2010 +0200 @@ -705,14 +705,14 @@ if eidto is None: # checking constraint for an attribute relation restriction = 'S eid %(s)s, ' + self.restriction - args, ck = {'s': eidfrom}, 's' + args = {'s': eidfrom} else: restriction = 'S eid %(s)s, O eid %(o)s, ' + self.restriction - args, ck = {'s': eidfrom, 'o': eidto}, ('s', 'o') + args = {'s': eidfrom, 'o': eidto} rql = 'Any %s WHERE %s' % (self.mainvars, restriction) if self.distinct_query: rql = 'DISTINCT ' + rql - return session.execute(rql, args, ck, build_descr=False) + return session.execute(rql, args, build_descr=False) class RQLConstraint(RepoEnforcedRQLConstraintMixIn, RQLVocabularyConstraint): @@ -839,9 +839,8 @@ return False if keyarg is None: kwargs.setdefault('u', session.user.eid) - cachekey = kwargs.keys() try: - rset = session.execute(rql, kwargs, cachekey, build_descr=True) + rset = session.execute(rql, kwargs, build_descr=True) except NotImplementedError: self.critical('cant check rql expression, unsupported rql %s', rql) if self.eid is not None: