# HG changeset patch # User Sylvain Thénault # Date 1341835043 -7200 # Node ID 1931953226f29e4b24d60ca5acee4b418cc95753 # Parent 1c5f3c66ec5359404dcadcd4afe18dbb0956bce6 [rql2sql] remove debug print and fix bug introduced in 8469:69ad9a509bc3 diff -r 1c5f3c66ec53 -r 1931953226f2 server/sources/rql2sql.py --- a/server/sources/rql2sql.py Mon Jul 09 12:24:05 2012 +0200 +++ b/server/sources/rql2sql.py Mon Jul 09 13:57:23 2012 +0200 @@ -1298,12 +1298,11 @@ principal = 1 else: principal = var.stinfo.get('principal') - print relation, principal # we've to return some sql if: # 1. visited relation is ored # 2. variable's principal is not this relation and not 1. if ored or (principal is not None and principal is not relation - and not principal.ored()): + and not getattr(principal, 'ored', lambda : 0)()): # we have to generate unification expression if principal is relation: # take care if ored case and principal is the relation to