equal
deleted
inserted
replaced
1010 expression = 'S eid %(s)s, ' + self.expression |
1010 expression = 'S eid %(s)s, ' + self.expression |
1011 args = {'s': eidfrom} |
1011 args = {'s': eidfrom} |
1012 else: |
1012 else: |
1013 expression = 'S eid %(s)s, O eid %(o)s, ' + self.expression |
1013 expression = 'S eid %(s)s, O eid %(o)s, ' + self.expression |
1014 args = {'s': eidfrom, 'o': eidto} |
1014 args = {'s': eidfrom, 'o': eidto} |
|
1015 if 'U' in self.rqlst.defined_vars: |
|
1016 expression = 'U eid %(u)s, ' + expression |
|
1017 args['u'] = session.user.eid |
1015 rql = 'Any %s WHERE %s' % (','.join(sorted(self.mainvars)), expression) |
1018 rql = 'Any %s WHERE %s' % (','.join(sorted(self.mainvars)), expression) |
1016 if self.distinct_query: |
1019 if self.distinct_query: |
1017 rql = 'DISTINCT ' + rql |
1020 rql = 'DISTINCT ' + rql |
1018 return session.execute(rql, args, build_descr=False) |
1021 return session.execute(rql, args, build_descr=False) |
1019 |
1022 |