diff -r ad78b118b124 -r dc351b96f596 server/test/unittest_rql2sql.py --- a/server/test/unittest_rql2sql.py Tue Mar 09 11:01:44 2010 +0100 +++ b/server/test/unittest_rql2sql.py Tue Mar 09 11:05:29 2010 +0100 @@ -1486,26 +1486,26 @@ def test_has_text(self): for t in self._parse(( ('Any X WHERE X has_text "toto tata"', - """SELECT appears0.uid + """SELECT DISTINCT appears0.uid FROM appears AS appears0 WHERE appears0.word_id IN (SELECT word_id FROM word WHERE word in ('toto', 'tata'))"""), ('Any X WHERE X has_text %(text)s', - """SELECT appears0.uid + """SELECT DISTINCT appears0.uid FROM appears AS appears0 WHERE appears0.word_id IN (SELECT word_id FROM word WHERE word in ('hip', 'hop', 'momo'))"""), ('Personne X WHERE X has_text "toto tata"', - """SELECT _X.eid + """SELECT DISTINCT _X.eid FROM appears AS appears0, entities AS _X WHERE appears0.word_id IN (SELECT word_id FROM word WHERE word in ('toto', 'tata')) AND appears0.uid=_X.eid AND _X.type='Personne'"""), ('Any X WHERE X has_text "toto tata", X name "tutu", X is IN (Basket,Folder)', - """SELECT _X.cw_eid + """SELECT DISTINCT _X.cw_eid FROM appears AS appears0, cw_Basket AS _X WHERE appears0.word_id IN (SELECT word_id FROM word WHERE word in ('toto', 'tata')) AND appears0.uid=_X.cw_eid AND _X.cw_name=tutu -UNION ALL -SELECT _X.cw_eid +UNION +SELECT DISTINCT _X.cw_eid FROM appears AS appears0, cw_Folder AS _X WHERE appears0.word_id IN (SELECT word_id FROM word WHERE word in ('toto', 'tata')) AND appears0.uid=_X.cw_eid AND _X.cw_name=tutu """),