diff -r 43fa67acd9d0 -r 9f37de24251f server/sources/rql2sql.py --- a/server/sources/rql2sql.py Fri Mar 20 14:01:11 2009 +0100 +++ b/server/sources/rql2sql.py Fri Mar 20 14:23:08 2009 +0100 @@ -802,7 +802,7 @@ else: join += ')' if not rhsconst: - rhstable = self._var_table(rhsvar) + rhstable = rhsvar._q_sqltable if rhstable: assert rhstable is not None, rhsvar join += ' %s OUTER JOIN %s ON (%s.%s=%s)' % ( @@ -967,7 +967,10 @@ """get the sql name for a subquery column alias""" if colalias.name in self._varmap: sql = self._varmap[colalias.name] - self.add_table(sql.split('.', 1)[0]) + table = sql.split('.', 1)[0] + colalias._q_sqltable = table + colalias._q_sql = sql + self.add_table(table) return sql return colalias._q_sql