diff -r f627ab500fda -r 5ad3154a8810 server/test/unittest_rql2sql.py --- a/server/test/unittest_rql2sql.py Mon May 02 20:41:46 2011 +0200 +++ b/server/test/unittest_rql2sql.py Tue May 10 18:50:13 2011 +0200 @@ -835,9 +835,9 @@ WHERE _X.cw_eid=12''' ), ("Any P WHERE X eid 12, P? concerne X, X todo_by S", - '''SELECT rel_concerne0.eid_from -FROM todo_by_relation AS rel_todo_by1 LEFT OUTER JOIN concerne_relation AS rel_concerne0 ON (rel_concerne0.eid_to=12) -WHERE rel_todo_by1.eid_from=12''' + '''SELECT rel_concerne1.eid_from +FROM todo_by_relation AS rel_todo_by0 LEFT OUTER JOIN concerne_relation AS rel_concerne1 ON (rel_concerne1.eid_to=12) +WHERE rel_todo_by0.eid_from=12''' ), ('Any GN, TN ORDERBY GN WHERE T tags G?, T name TN, G name GN', @@ -931,6 +931,10 @@ WHERE _S.cw_ambiguous_inlined=_A.cw_eid) AS _T0 ON (_X.cw_multisource_inlined_rel=_T0.C0)''' ), + ('Any X,T,OT WHERE X tags T, OT? tags X, X is Tag, X eid 123', + '''SELECT rel_tags0.eid_from, rel_tags0.eid_to, rel_tags1.eid_from +FROM tags_relation AS rel_tags0 LEFT OUTER JOIN tags_relation AS rel_tags1 ON (rel_tags1.eid_to=123) +WHERE rel_tags0.eid_from=123'''), ] VIRTUAL_VARS = [ @@ -1601,7 +1605,7 @@ '''SELECT 1 WHERE NOT (EXISTS(SELECT 1 FROM in_group_relation AS rel_in_group0))''') - def test_nonregr_subquery_missing_join(self): + def test_nonregr_outer_join_multiple(self): self._check('Any COUNT(P1148),G GROUPBY G ' 'WHERE G owned_by D, D eid 1122, K1148 bookmarked_by P1148, ' 'K1148 eid 1148, P1148? in_group G', @@ -1611,7 +1615,7 @@ GROUP BY _G.cw_eid''' ) - def test_nonregr_subquery_missing_join2(self): + def test_nonregr_outer_join_multiple2(self): self._check('Any COUNT(P1148),G GROUPBY G ' 'WHERE G owned_by D, D eid 1122, K1148 bookmarked_by P1148?, ' 'K1148 eid 1148, P1148? in_group G',