merge
authorSandrine Ribeau <sandrine.ribeau@logilab.fr>
Tue, 06 Jan 2009 12:53:47 -0800
changeset 338 25aae8a15532
parent 337 eb329d0db467 (current diff)
parent 334 f75b6d4e3ff1 (diff)
child 339 c0a0ce6c0428
child 343 50073bc6df5e
merge
--- a/server/test/data/schema/Affaire.py	Tue Jan 06 12:52:52 2009 -0800
+++ b/server/test/data/schema/Affaire.py	Tue Jan 06 12:53:47 2009 -0800
@@ -20,6 +20,9 @@
                                 default='text/rest', constraints=[format_constraint])
     descr = String(fulltextindexed=True,
                    description=_('more detailed description'))
+
+    duration = Int()
+    invoiced = Int()
         
     wf_info_for = ObjectRelation('TrInfo', cardinality='1*', composite='object')
     depends_on = SubjectRelation('Affaire')
--- a/server/test/data/schema/custom.py	Tue Jan 06 12:52:52 2009 -0800
+++ b/server/test/data/schema/custom.py	Tue Jan 06 12:53:47 2009 -0800
@@ -4,3 +4,18 @@
     permissions = {'read': ('managers', 'users', 'guests'),
                    'delete': ('managers',),
                    'add': ('managers',)}
+
+class fiche(RelationType):
+    inlined = True
+    subject = 'Personne'
+    object = 'Card'
+    cardinality = '??'
+
+class multisource_rel(RelationDefinition):
+    subject = ('Card', 'Note')
+    object = 'Note'
+
+
+class see_also(RelationDefinition):
+    subject = ('Bookmark', 'Note')
+    object = ('Bookmark', 'Note')
--- a/server/test/data/schema/relations.rel	Tue Jan 06 12:52:52 2009 -0800
+++ b/server/test/data/schema/relations.rel	Tue Jan 06 12:53:47 2009 -0800
@@ -41,3 +41,5 @@
 Personne require_permission EPermission
 
 EPermission require_state State
+
+Note migrated_from Note
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/server/test/data/site_erudi.py	Tue Jan 06 12:53:47 2009 -0800
@@ -0,0 +1,20 @@
+from logilab.common.adbh import FunctionDescr
+from rql.utils import register_function
+
+try:
+    class DUMB_SORT(FunctionDescr):
+        supported_backends = ('sqlite',)
+
+    register_function(DUMB_SORT)
+
+
+    def init_sqlite_connexion(cnx):
+        def dumb_sort(something):
+            return something
+        cnx.create_function("DUMB_SORT", 1, dumb_sort)
+
+    from cubicweb.server import sqlutils
+    sqlutils.SQL_CONNECT_HOOKS['sqlite'].append(init_sqlite_connexion)
+except:
+    # already registered
+    pass
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/server/test/unittest_msplanner.py	Tue Jan 06 12:53:47 2009 -0800
@@ -0,0 +1,1737 @@
+from logilab.common.decorators import clear_cache
+from cubicweb.devtools import init_test_database
+from cubicweb.devtools.repotest import BasePlannerTC, do_monkey_patch, undo_monkey_patch, test_plan
+
+class _SetGenerator(object):
+    """singleton to easily create set using "s[0]" or "s[0,1,2]" for instance
+    """
+    def __getitem__(self, key):
+        try:
+            it = iter(key)
+        except TypeError:
+            it = (key,)
+        return set(it)
+s = _SetGenerator()
+
+from cubicweb.schema import ERQLExpression
+from cubicweb.server.sources import AbstractSource
+from cubicweb.server.msplanner import MSPlanner, PartPlanInformation
+
+class FakeUserROSource(AbstractSource):
+    uri = 'zzz'
+    support_entities = {'EUser': False}
+    support_relations = {}
+    def syntax_tree_search(self, *args, **kwargs):
+        return []
+
+        
+class FakeCardSource(AbstractSource):
+    uri = 'ccc'
+    support_entities = {'Card': True, 'Note': True, 'State': True}
+    support_relations = {'in_state': True, 'multisource_rel': True}
+    dont_cross_relations = set(('fiche',))
+    
+    def syntax_tree_search(self, *args, **kwargs):
+        return []
+
+X_ALL_SOLS = sorted([{'X': 'Affaire'}, {'X': 'Basket'}, {'X': 'Bookmark'},
+                     {'X': 'Card'}, {'X': 'Comment'}, {'X': 'Division'},
+                     {'X': 'ECache'}, {'X': 'EConstraint'}, {'X': 'EConstraintType'},
+                     {'X': 'EEType'}, {'X': 'EFRDef'}, {'X': 'EGroup'},
+                     {'X': 'ENFRDef'}, {'X': 'EPermission'}, {'X': 'EProperty'},
+                     {'X': 'ERType'}, {'X': 'EUser'}, {'X': 'Email'},
+                     {'X': 'EmailAddress'}, {'X': 'EmailPart'}, {'X': 'EmailThread'},
+                     {'X': 'File'}, {'X': 'Folder'}, {'X': 'Image'},
+                     {'X': 'Note'}, {'X': 'Personne'}, {'X': 'RQLExpression'},
+                     {'X': 'Societe'}, {'X': 'State'}, {'X': 'SubDivision'},
+                     {'X': 'Tag'}, {'X': 'TrInfo'}, {'X': 'Transition'}])
+
+# keep cnx so it's not garbage collected and the associated session is closed
+repo, cnx = init_test_database('sqlite')
+
+class BaseMSPlannerTC(BasePlannerTC):
+    """test planner related feature on a 3-sources repository:
+    
+    * system source supporting everything
+    * ldap source supporting EUser
+    * rql source supporting Card
+    """
+    repo = repo
+    
+    def setUp(self):
+        #_QuerierTC.setUp(self)
+        self.o = repo.querier
+        self.session = repo._sessions.values()[0]
+        self.pool = self.session.set_pool()
+        self.schema = self.o.schema
+        # hijack Affaire security
+        affreadperms = list(self.schema['Affaire']._groups['read'])
+        self.prevrqlexpr_affaire = affreadperms[-1]
+        # add access to type attribute so S can't be invariant
+        affreadperms[-1] = ERQLExpression('X concerne S?, S owned_by U, S type "X"')
+        self.schema['Affaire']._groups['read'] = tuple(affreadperms)
+        # hijack EUser security
+        userreadperms = list(self.schema['EUser']._groups['read'])
+        self.prevrqlexpr_user = userreadperms[-1]
+        userreadperms[-1] = ERQLExpression('X owned_by U')
+        self.schema['EUser']._groups['read'] = tuple(userreadperms)
+        
+        self.sources = self.o._repo.sources
+        self.system = self.sources[-1]
+        self.sources.append(FakeUserROSource(self.o._repo, self.o.schema,
+                                             {'uri': 'ldapuser'}))
+        repo.sources_by_uri['ldapuser'] = self.sources[-1]
+        self.ldap = self.sources[-1]
+        self.sources.append(FakeCardSource(self.o._repo, self.o.schema,
+                                           {'uri': 'cards'}))
+        repo.sources_by_uri['cards'] = self.sources[-1]
+        self.rql = self.sources[-1]
+        do_monkey_patch()
+        
+    def tearDown(self):
+        undo_monkey_patch()
+        del self.sources[-1]
+        del self.sources[-1]
+        del repo.sources_by_uri['ldapuser']
+        del repo.sources_by_uri['cards']
+        # restore hijacked security
+        self.restore_orig_affaire_security()
+        self.restore_orig_euser_security()
+        
+    def restore_orig_affaire_security(self):
+        affreadperms = list(self.schema['Affaire']._groups['read'])
+        affreadperms[-1] = self.prevrqlexpr_affaire
+        self.schema['Affaire']._groups['read'] = tuple(affreadperms)
+        clear_cache(self.schema['Affaire'], 'ERSchema_get_rqlexprs')
+        
+    def restore_orig_euser_security(self):
+        userreadperms = list(self.schema['EUser']._groups['read'])
+        userreadperms[-1] = self.prevrqlexpr_user
+        self.schema['EUser']._groups['read'] = tuple(userreadperms)
+        clear_cache(self.schema['EUser'], 'ERSchema_get_rqlexprs')
+
+                  
+class PartPlanInformationTC(BaseMSPlannerTC):
+
+    def _test(self, rql, *args):
+        if len(args) == 3:
+            kwargs, sourcesvars, needsplit = args
+        else:
+            sourcesvars, needsplit = args
+            kwargs = None
+        plan = self._prepare_plan(rql, kwargs)
+        union = plan.rqlst
+        plan.preprocess(union)
+        ppi = PartPlanInformation(plan, union.children[0])
+        for sourcevars in ppi._sourcesvars.itervalues():
+            for var in sourcevars.keys():
+                solindices = sourcevars.pop(var)
+                sourcevars[var._ms_table_key()] = solindices
+        self.assertEquals(ppi._sourcesvars, sourcesvars)
+        self.assertEquals(ppi.needsplit, needsplit)
+
+        
+    def test_simple_system_only(self):
+        """retrieve entities only supported by the system source"""
+        self._test('EGroup X',
+                   {self.system: {'X': s[0]}}, False)
+        
+    def test_simple_system_ldap(self):
+        """retrieve EUser X from both sources and return concatenation of results
+        """
+        self._test('EUser X',
+                   {self.system: {'X': s[0]}, self.ldap: {'X': s[0]}}, False)
+        
+    def test_simple_system_rql(self):
+        """retrieve Card X from both sources and return concatenation of results
+        """
+        self._test('Any X, XT WHERE X is Card, X title XT',
+                   {self.system: {'X': s[0]}, self.rql: {'X': s[0]}}, False)
+        
+    def test_simple_eid_specified(self):
+        """retrieve EUser X from system source (eid is specified, can locate the entity)
+        """
+        ueid = self.session.user.eid
+        self._test('Any X,L WHERE X eid %(x)s, X login L', {'x': ueid},
+                   {self.system: {'X': s[0]}}, False)
+        
+    def test_simple_eid_invariant(self):
+        """retrieve EUser X from system source (eid is specified, can locate the entity)
+        """
+        ueid = self.session.user.eid
+        self._test('Any X WHERE X eid %(x)s', {'x': ueid},
+                   {}, False)
+        
+    def test_simple_invariant(self):
+        """retrieve EUser X from system source only (X is invariant and in_group not supported by ldap source)
+        """
+        self._test('Any X WHERE X is EUser, X in_group G, G name "users"',
+                   {self.system: {'X': s[0], 'G': s[0], 'in_group': s[0]}}, False)
+        
+    def test_security_has_text(self):
+        """retrieve EUser X from system source only (has_text not supported by ldap source)
+        """
+        # specify EUser instead of any since the way this test is written we aren't well dealing
+        # with ambigous query (eg only considering the first solution)
+        self._test('EUser X WHERE X has_text "bla"',
+                   {self.system: {'X': s[0]}}, False)
+        
+    def test_complex_base(self):
+        """
+        1. retrieve Any X, L WHERE X is EUser, X login L from system and ldap sources, store
+           concatenation of results into a temporary table
+        2. return the result of Any X, L WHERE X is TMP, X login L, X in_group G,
+           G name 'users' on the system source
+        """
+        self._test('Any X,L WHERE X is EUser, X in_group G, X login L, G name "users"',
+                   {self.system: {'X': s[0], 'G': s[0], 'in_group': s[0]},
+                    self.ldap : {'X': s[0]}}, True)
+
+    def test_complex_invariant_ordered(self):
+        """
+        1. retrieve Any X,AA WHERE X modification_date AA from system and ldap sources, store
+           concatenation of results into a temporary table
+        2. return the result of Any X,AA ORDERBY AA WHERE %s owned_by X, X modification_date AA
+           on the system source   
+        """
+        ueid = self.session.user.eid
+        self._test('Any X,AA ORDERBY AA WHERE E eid %(x)s, E owned_by X, X modification_date AA', {'x': ueid},
+                   {self.system: {'x': s[0], 'X': s[0], 'owned_by': s[0]},
+                    self.ldap : {'X': s[0]}}, True)
+
+    def test_complex_invariant(self):
+        """
+        1. retrieve Any X,L,AA WHERE X login L, X modification_date AA from system and ldap sources, store
+           concatenation of results into a temporary table
+        2. return the result of Any X,L,AA WHERE %s owned_by X, X login L, X modification_date AA
+           on the system source   
+        """
+        ueid = self.session.user.eid
+        self._test('Any X,L,AA WHERE E eid %(x)s, E owned_by X, X login L, X modification_date AA', {'x': ueid},
+                   {self.system: {'x': s[0], 'X': s[0], 'owned_by': s[0]},
+                    self.ldap : {'X': s[0]}}, True)
+
+    def test_complex_ambigous(self):
+        """retrieve EUser X from system and ldap sources, Person X from system source only
+        """
+        self._test('Any X,F WHERE X firstname F',
+                   {self.system: {'X': s[0, 1]},
+                    self.ldap: {'X': s[0]}}, True)
+
+    def test_complex_multiple(self):
+        """
+        1. retrieve Any X,A,Y,B WHERE X login A, Y login B from system and ldap sources, store
+           cartesian product of results into a temporary table
+        2. return the result of Any X,Y WHERE X login 'syt', Y login 'adim'
+           on the system source   
+        """
+        ueid = self.session.user.eid
+        self._test('Any X,Y WHERE X login "syt", Y login "adim"', {'x': ueid},
+                   {self.system: {'Y': s[0], 'X': s[0]},
+                    self.ldap: {'Y': s[0], 'X': s[0]}}, True)
+        
+    def test_complex_aggregat(self):
+        solindexes = set(range(len([e for e in self.schema.entities() if not e.is_final()])))
+        self._test('Any MAX(X)',
+                   {self.system: {'X': solindexes}}, False)
+                   
+    def test_complex_optional(self):
+        ueid = self.session.user.eid
+        self._test('Any U WHERE WF wf_info_for X, X eid %(x)s, WF owned_by U?, WF from_state FS', {'x': ueid},
+                   {self.system: {'WF': s[0], 'FS': s[0], 'U': s[0], 'from_state': s[0], 'owned_by': s[0], 'wf_info_for': s[0]}}, False)
+
+    def test_exists4(self):
+        """
+        State S could come from both rql source and system source,
+        but since X cannot come from the rql source, the solution
+        {self.rql : 'S'} must be removed
+        """
+        self._test('Any G,L WHERE X in_group G, X login L, G name "managers", '
+                   'EXISTS(X copain T, T login L, T login in ("comme", "cochon")) OR '
+                   'EXISTS(X in_state S, S name "pascontent", NOT X copain T2, T2 login "billy")',
+                   {self.system: {'X': s[0], 'S': s[0], 'T2': s[0], 'T': s[0], 'G': s[0], 'copain': s[0], 'in_group': s[0]}, 
+                    self.ldap: {'X': s[0], 'T2': s[0], 'T': s[0]}}, True)
+
+    def test_relation_need_split(self):
+        self._test('Any X, S WHERE X in_state S',
+                   {self.system: {'X': s[0, 1, 2], 'S': s[0, 1, 2]},
+                     self.rql: {'X': s[2], 'S': s[2]}}, True)
+
+    def test_relation_restriction_ambigous_need_split(self):
+        self._test('Any X,T WHERE X in_state S, S name "pending", T tags X',
+                   {self.system: {'X': s[0, 1, 2], 'S': s[0, 1, 2], 'T': s[0, 1, 2], 'tags': s[0, 1, 2]},
+                    self.rql: {'X': s[2], 'S': s[2]}}, True)
+
+    def test_simplified_var(self):
+        repo._type_source_cache[999999] = ('Note', 'cards', 999999)
+        self._test('Any U WHERE U in_group G, (G name IN ("managers", "logilab") OR (X require_permission P?, P name "bla", P require_group G)), X eid %(x)s, U eid %(u)s',
+                   {'x': 999999, 'u': self.session.user.eid},
+                   {self.system: {'P': s[0], 'G': s[0], 'X': s[0], 'require_permission': s[0], 'in_group': s[0], 'P': s[0], 'require_group': s[0]}}, False)
+        
+    def test_delete_relation1(self):
+        ueid = self.session.user.eid
+        self._test('Any X, Y WHERE X created_by Y, X eid %(x)s, NOT Y eid %(y)s',
+                   {'x': ueid, 'y': ueid},
+                   {self.system: {'Y': s[0], 'created_by': s[0]}}, False)
+                   
+
+        
+class MSPlannerTC(BaseMSPlannerTC):
+    
+    def setUp(self):
+        BaseMSPlannerTC.setUp(self)
+        self.planner = MSPlanner(self.o.schema, self.o._rqlhelper)
+
+    _test = test_plan
+
+    def test_simple_system_only(self):
+        """retrieve entities only supported by the system source
+        """
+        self._test('EGroup X',
+                   [('OneFetchStep', [('Any X WHERE X is EGroup', [{'X': 'EGroup'}])],
+                     None, None, [self.system], {}, [])])
+
+    def test_simple_system_only_limit(self):
+        """retrieve entities only supported by the system source
+        """
+        self._test('EGroup X LIMIT 10',
+                   [('OneFetchStep', [('Any X LIMIT 10 WHERE X is EGroup', [{'X': 'EGroup'}])],
+                     10, None, [self.system], {}, [])])
+
+    def test_simple_system_only_limit_offset(self):
+        """retrieve entities only supported by the system source
+        """
+        self._test('EGroup X LIMIT 10 OFFSET 10',
+                   [('OneFetchStep', [('Any X LIMIT 10 OFFSET 10 WHERE X is EGroup', [{'X': 'EGroup'}])],
+                     10, 10, [self.system], {}, [])])
+        
+    def test_simple_system_ldap(self):
+        """retrieve EUser X from both sources and return concatenation of results
+        """
+        self._test('EUser X',
+                   [('OneFetchStep', [('Any X WHERE X is EUser', [{'X': 'EUser'}])],
+                     None, None, [self.ldap, self.system], {}, [])])
+        
+    def test_simple_system_ldap_limit(self):
+        """retrieve EUser X from both sources and return concatenation of results
+        """
+        self._test('EUser X LIMIT 10',
+                   [('OneFetchStep', [('Any X LIMIT 10 WHERE X is EUser', [{'X': 'EUser'}])],
+                     10, None, [self.ldap, self.system], {}, [])])
+
+    def test_simple_system_ldap_limit_offset(self):
+        """retrieve EUser X from both sources and return concatenation of results
+        """
+        self._test('EUser X LIMIT 10 OFFSET 10',
+                   [('OneFetchStep', [('Any X LIMIT 10 OFFSET 10 WHERE X is EUser', [{'X': 'EUser'}])],
+                     10, 10, [self.ldap, self.system], {}, [])])
+
+    def test_simple_system_ldap_ordered_limit_offset(self):
+        """retrieve EUser X from both sources and return concatenation of results
+        """
+        self._test('EUser X ORDERBY X LIMIT 10 OFFSET 10',
+                   [('AggrStep', 'Any X ORDERBY X', 10, 10, 'table0', None, [
+                       ('FetchStep', [('Any X WHERE X is EUser', [{'X': 'EUser'}])],
+                        [self.ldap, self.system], {}, {'X': 'table0.C0'}, []),
+                       ]),
+                   ])
+    def test_simple_system_ldap_aggregat(self):
+        """retrieve EUser X from both sources and return concatenation of results
+        """
+        # COUNT(X) is kept in sub-step and transformed into SUM(X) in the AggrStep
+        self._test('Any COUNT(X) WHERE X is EUser',
+                   [('AggrStep', 'Any COUNT(X)', None, None, 'table0', None, [
+                       ('FetchStep', [('Any COUNT(X) WHERE X is EUser', [{'X': 'EUser'}])],
+                        [self.ldap, self.system], {}, {'COUNT(X)': 'table0.C0'}, []),
+                       ]),
+                   ])
+        
+    def test_simple_system_rql(self):
+        """retrieve Card X from both sources and return concatenation of results
+        """
+        self._test('Any X, XT WHERE X is Card, X title XT',
+                   [('OneFetchStep', [('Any X,XT WHERE X is Card, X title XT', [{'X': 'Card', 'XT': 'String'}])],
+                     None, None, [self.rql, self.system], {}, [])])
+        
+    def test_simple_eid_specified(self):
+        """retrieve EUser X from system source (eid is specified, can locate the entity)
+        """
+        ueid = self.session.user.eid
+        self._test('Any X,L WHERE X eid %(x)s, X login L',
+                   [('OneFetchStep', [('Any X,L WHERE X eid %s, X login L'%ueid, [{'X': 'EUser', 'L': 'String'}])],
+                     None, None, [self.system], {}, [])],
+                   {'x': ueid})
+        
+    def test_simple_eid_invariant(self):
+        """retrieve EUser X from system source (eid is specified, can locate the entity)
+        """
+        ueid = self.session.user.eid
+        self._test('Any X WHERE X eid %(x)s',
+                   [('OneFetchStep', [('Any %s'%ueid, [{}])],
+                     None, None, [self.system], {}, [])],
+                   {'x': ueid})
+        
+    def test_simple_invariant(self):
+        """retrieve EUser X from system source only (X is invariant and in_group not supported by ldap source)
+        """
+        self._test('Any X WHERE X is EUser, X in_group G, G name "users"',
+                   [('OneFetchStep', [('Any X WHERE X is EUser, X in_group G, G name "users"',
+                                       [{'X': 'EUser', 'G': 'EGroup'}])],
+                     None, None, [self.system], {}, [])])
+        
+    def test_complex_base(self):
+        """
+        1. retrieve Any X, L WHERE X is EUser, X login L from system and ldap sources, store
+           concatenation of results into a temporary table
+        2. return the result of Any X, L WHERE X is TMP, X login LX in_group G,
+           G name 'users' on the system source
+        """
+        self._test('Any X,L WHERE X is EUser, X in_group G, X login L, G name "users"',
+                   [('FetchStep', [('Any X,L WHERE X login L, X is EUser', [{'X': 'EUser', 'L': 'String'}])],
+                     [self.ldap, self.system], None,
+                     {'X': 'table0.C0', 'X.login': 'table0.C1', 'L': 'table0.C1'}, []),
+                    ('OneFetchStep', [('Any X,L WHERE X in_group G, X login L, G name "users", G is EGroup, X is EUser',
+                                       [{'X': 'EUser', 'L': 'String', 'G': 'EGroup'}])],
+                     None, None, [self.system],
+                     {'X': 'table0.C0', 'X.login': 'table0.C1', 'L': 'table0.C1'}, [])
+                    ])
+
+    def test_complex_base_limit_offset(self):
+        """
+        1. retrieve Any X, L WHERE X is EUser, X login L from system and ldap sources, store
+           concatenation of results into a temporary table
+        2. return the result of Any X, L WHERE X is TMP, X login LX in_group G,
+           G name 'users' on the system source
+        """
+        self._test('Any X,L LIMIT 10 OFFSET 10 WHERE X is EUser, X in_group G, X login L, G name "users"',
+                   [('FetchStep', [('Any X,L WHERE X login L, X is EUser', [{'X': 'EUser', 'L': 'String'}])],
+                     [self.ldap, self.system], None,
+                     {'X': 'table0.C0', 'X.login': 'table0.C1', 'L': 'table0.C1'}, []),
+                    ('OneFetchStep', [('Any X,L LIMIT 10 OFFSET 10 WHERE X in_group G, X login L, G name "users", G is EGroup, X is EUser',
+                                       [{'X': 'EUser', 'L': 'String', 'G': 'EGroup'}])],
+                     10, 10,
+                     [self.system], {'X': 'table0.C0', 'X.login': 'table0.C1', 'L': 'table0.C1'}, [])
+                    ])
+
+    def test_complex_ordered(self):
+        self._test('Any L ORDERBY L WHERE X login L',
+                   [('AggrStep', 'Any L ORDERBY L', None, None, 'table0', None, 
+                     [('FetchStep', [('Any L WHERE X login L, X is EUser',
+                                      [{'X': 'EUser', 'L': 'String'}])],
+                       [self.ldap, self.system], {}, {'X.login': 'table0.C0', 'L': 'table0.C0'}, []),
+                      ])
+                    ])
+
+    def test_complex_ordered_limit_offset(self):
+        self._test('Any L ORDERBY L LIMIT 10 OFFSET 10 WHERE X login L',
+                   [('AggrStep', 'Any L ORDERBY L', 10, 10, 'table0', None, 
+                     [('FetchStep', [('Any L WHERE X login L, X is EUser',
+                                      [{'X': 'EUser', 'L': 'String'}])],
+                       [self.ldap, self.system], {}, {'X.login': 'table0.C0', 'L': 'table0.C0'}, []),
+                      ])
+                    ])
+        
+    def test_complex_invariant_ordered(self):
+        """
+        1. retrieve Any X,AA WHERE X modification_date AA from system and ldap sources, store
+           concatenation of results into a temporary table
+        2. return the result of Any X,AA ORDERBY AA WHERE %s owned_by X, X modification_date AA
+           on the system source
+
+        herrr, this is what is expected by the XXX :(, not the actual result (which is correct anyway)
+        """
+        ueid = self.session.user.eid
+        self._test('Any X,AA ORDERBY AA WHERE E eid %(x)s, E owned_by X, X modification_date AA',
+                   [('FetchStep',
+                     [('Any X,AA WHERE X modification_date AA, X is EUser',
+                       [{'AA': 'Datetime', 'X': 'EUser'}])],
+                     [self.ldap, self.system], None,
+                     {'AA': 'table0.C1', 'X': 'table0.C0', 'X.modification_date': 'table0.C1'}, []),
+                    ('OneFetchStep',
+                     [('Any X,AA ORDERBY AA WHERE 5 owned_by X, X modification_date AA, X is EUser',
+                       [{'AA': 'Datetime', 'X': 'EUser'}])],
+                     None, None, [self.system],
+                     {'AA': 'table0.C1', 'X': 'table0.C0', 'X.modification_date': 'table0.C1'}, []),
+                    ],
+                   {'x': ueid})
+
+    def test_complex_invariant(self):
+        """
+        1. retrieve Any X,L,AA WHERE X login L, X modification_date AA from system and ldap sources, store
+           concatenation of results into a temporary table
+        2. return the result of Any X,L,AA WHERE %s owned_by X, X login L, X modification_date AA
+           on the system source   
+        """
+        ueid = self.session.user.eid
+        self._test('Any X,L,AA WHERE E eid %(x)s, E owned_by X, X login L, X modification_date AA',
+                   [('FetchStep', [('Any X,L,AA WHERE X login L, X modification_date AA, X is EUser',
+                                    [{'AA': 'Datetime', 'X': 'EUser', 'L': 'String'}])],
+                     [self.ldap, self.system], None,
+                     {'AA': 'table0.C2', 'X': 'table0.C0', 'X.login': 'table0.C1', 'X.modification_date': 'table0.C2', 'L': 'table0.C1'}, []),
+                    ('OneFetchStep', [('Any X,L,AA WHERE %s owned_by X, X login L, X modification_date AA, X is EUser'%ueid,
+                                       [{'AA': 'Datetime', 'X': 'EUser', 'L': 'String'}])],
+                     None, None, [self.system],
+                     {'AA': 'table0.C2', 'X': 'table0.C0', 'X.login': 'table0.C1', 'X.modification_date': 'table0.C2', 'L': 'table0.C1'}, [])],
+                   {'x': ueid})
+
+    def test_complex_ambigous(self):
+        """retrieve EUser X from system and ldap sources, Person X from system source only
+        """
+        self._test('Any X,F WHERE X firstname F',
+                   [('UnionStep', None, None, [
+                       ('OneFetchStep', [('Any X,F WHERE X firstname F, X is EUser',
+                                          [{'X': 'EUser', 'F': 'String'}])],
+                        None, None, [self.ldap, self.system], {}, []),
+                       ('OneFetchStep', [('Any X,F WHERE X firstname F, X is Personne',
+                                          [{'X': 'Personne', 'F': 'String'}])],
+                        None, None, [self.system], {}, []),
+                       ]),
+                    ])
+
+    def test_complex_ambigous_limit_offset(self):
+        """retrieve EUser X from system and ldap sources, Person X from system source only
+        """
+        self._test('Any X,F LIMIT 10 OFFSET 10 WHERE X firstname F',
+                   [('UnionStep', 10, 10, [
+                       ('OneFetchStep', [('Any X,F WHERE X firstname F, X is EUser',
+                                          [{'X': 'EUser', 'F': 'String'}])],
+                        None, None,
+                        [self.ldap, self.system], {}, []),
+                       ('OneFetchStep', [('Any X,F WHERE X firstname F, X is Personne',
+                                          [{'X': 'Personne', 'F': 'String'}])],
+                        None, None, [self.system], {}, []),
+                       ]),
+                    ])
+
+    def test_complex_ambigous_ordered(self):
+        """
+        1. retrieve EUser X from system and ldap sources, Person X from system source only, store
+           each result in the same temp table
+        2. return content of the table sorted
+        """
+        self._test('Any X,F ORDERBY F WHERE X firstname F',
+                   [('AggrStep', 'Any X,F ORDERBY F', None, None, 'table0', None, 
+                     [('FetchStep', [('Any X,F WHERE X firstname F, X is EUser',
+                                      [{'X': 'EUser', 'F': 'String'}])],
+                       [self.ldap, self.system], {},
+                       {'X': 'table0.C0', 'X.firstname': 'table0.C1', 'F': 'table0.C1'}, []),
+                      ('FetchStep', [('Any X,F WHERE X firstname F, X is Personne',
+                                      [{'X': 'Personne', 'F': 'String'}])],
+                       [self.system], {},
+                       {'X': 'table0.C0', 'X.firstname': 'table0.C1', 'F': 'table0.C1'}, []),
+                      ]),
+                    ])
+        
+    def test_complex_multiple(self):
+        """
+        1. retrieve Any X,A,Y,B WHERE X login A, Y login B from system and ldap sources, store
+           cartesian product of results into a temporary table
+        2. return the result of Any X,Y WHERE X login 'syt', Y login 'adim'
+           on the system source   
+        """
+        ueid = self.session.user.eid
+        self._test('Any X,Y WHERE X login "syt", Y login "adim"',
+                   [('FetchStep',
+                     [('Any X WHERE X login "syt", X is EUser', [{'X': 'EUser'}])],
+                     [self.ldap, self.system], None,
+                     {'X': 'table0.C0'}, []),
+                    ('FetchStep',
+                     [('Any Y WHERE Y login "adim", Y is EUser', [{'Y': 'EUser'}])],
+                     [self.ldap, self.system], None,
+                     {'Y': 'table1.C0'}, []),
+                    ('OneFetchStep',
+                     [('Any X,Y WHERE X is EUser, Y is EUser', [{'X': 'EUser', 'Y': 'EUser'}])],
+                     None, None, [self.system],
+                     {'X': 'table0.C0', 'Y': 'table1.C0'}, [])
+                    ], {'x': ueid})
+        
+    def test_complex_multiple_limit_offset(self):
+        """
+        1. retrieve Any X,A,Y,B WHERE X login A, Y login B from system and ldap sources, store
+           cartesian product of results into a temporary table
+        2. return the result of Any X,Y WHERE X login 'syt', Y login 'adim'
+           on the system source   
+        """
+        ueid = self.session.user.eid
+        self._test('Any X,Y LIMIT 10 OFFSET 10 WHERE X login "syt", Y login "adim"',
+                   [('FetchStep',
+                     [('Any X WHERE X login "syt", X is EUser', [{'X': 'EUser'}])],
+                     [self.ldap, self.system], None, {'X': 'table0.C0'}, []),
+                    ('FetchStep',
+                     [('Any Y WHERE Y login "adim", Y is EUser', [{'Y': 'EUser'}])],
+                     [self.ldap, self.system], None, {'Y': 'table1.C0'}, []),
+                    ('OneFetchStep',
+                     [('Any X,Y LIMIT 10 OFFSET 10 WHERE X is EUser, Y is EUser', [{'X': 'EUser', 'Y': 'EUser'}])],
+                     10, 10, [self.system],
+                     {'X': 'table0.C0', 'Y': 'table1.C0'}, [])
+                    ], {'x': ueid})
+        
+    def test_complex_aggregat(self):
+        self._test('Any MAX(X)',
+                   [('OneFetchStep',
+                     [('Any MAX(X)', X_ALL_SOLS)],
+                     None, None, [self.system], {}, [])
+                    ])
+        
+    def test_complex_typed_aggregat(self):
+        self._test('Any MAX(X) WHERE X is Card',
+                   [('AggrStep', 'Any MAX(X)', None, None, 'table0',  None,
+                     [('FetchStep',
+                       [('Any MAX(X) WHERE X is Card', [{'X': 'Card'}])],
+                       [self.rql, self.system], {}, {'MAX(X)': 'table0.C0'}, [])
+                      ])
+                    ])
+        
+    def test_complex_greater_eid(self):
+        self._test('Any X WHERE X eid > 12',
+                   [('OneFetchStep',
+                     [('Any X WHERE X eid > 12', X_ALL_SOLS)],
+                     None, None, [self.system], {}, [])
+                    ])
+        
+    def test_complex_greater_typed_eid(self):
+        self._test('Any X WHERE X eid > 12, X is Card',
+                   [('OneFetchStep',
+                     [('Any X WHERE X eid > 12, X is Card', [{'X': 'Card'}])],
+                     None, None, [self.system], {}, [])
+                    ])
+        
+    def test_complex_optional(self):
+        ueid = self.session.user.eid
+        self._test('Any U WHERE WF wf_info_for X, X eid %(x)s, WF owned_by U?, WF from_state FS',
+                   [('OneFetchStep', [('Any U WHERE WF wf_info_for 5, WF owned_by U?, WF from_state FS',
+                                       [{'WF': 'TrInfo', 'FS': 'State', 'U': 'EUser'}])],
+                     None, None, [self.system], {}, [])],
+                   {'x': ueid})
+
+    def test_complex_optional(self):
+        ueid = self.session.user.eid
+        self._test('Any U WHERE WF wf_info_for X, X eid %(x)s, WF owned_by U?, WF from_state FS',
+                   [('OneFetchStep', [('Any U WHERE WF wf_info_for 5, WF owned_by U?, WF from_state FS',
+                                       [{'WF': 'TrInfo', 'FS': 'State', 'U': 'EUser'}])],
+                     None, None, [self.system], {}, [])],
+                   {'x': ueid})
+
+    
+    def test_3sources_ambigous(self):
+        self._test('Any X,T WHERE X owned_by U, U login "syt", X title T',
+                   [('FetchStep', [('Any X,T WHERE X title T, X is Card', [{'X': 'Card', 'T': 'String'}])],
+                     [self.rql, self.system], None,
+                     {'T': 'table0.C1', 'X': 'table0.C0', 'X.title': 'table0.C1'}, []),
+                    ('FetchStep', [('Any U WHERE U login "syt", U is EUser', [{'U': 'EUser'}])],
+                     [self.ldap, self.system], None,
+                     {'U': 'table1.C0'}, []),
+                    ('UnionStep', None, None, [
+                        ('OneFetchStep', [('Any X,T WHERE X owned_by U, X title T, U is EUser, X is IN(Bookmark, EmailThread)',
+                                           [{'T': 'String', 'U': 'EUser', 'X': 'Bookmark'},
+                                            {'T': 'String', 'U': 'EUser', 'X': 'EmailThread'}])],
+                         None, None, [self.system], {'U': 'table1.C0'}, []),
+                        ('OneFetchStep', [('Any X,T WHERE X owned_by U, X title T, U is EUser, X is Card',
+                                           [{'X': 'Card', 'U': 'EUser', 'T': 'String'}])],
+                         None, None, [self.system],
+                         {'X': 'table0.C0', 'X.title': 'table0.C1', 'T': 'table0.C1', 'U': 'table1.C0'}, []),
+                        ]),
+                    ])
+
+    def test_restricted_max(self):
+        # dumb query to emulate the one generated by svnfile.entities.rql_revision_content
+        self._test('Any V, MAX(VR) WHERE V is Card, V creation_date VR, '
+                   '(V creation_date TODAY OR (V creation_date < TODAY AND NOT EXISTS('
+                   'X is Card, X creation_date < TODAY, X creation_date >= VR)))',
+                   [('FetchStep', [('Any VR WHERE X creation_date < TODAY, X creation_date >= VR, X is Card',
+                                    [{'X': 'Card', 'VR': 'Datetime'}])],
+                     [self.rql, self.system], None,
+                     {'VR': 'table0.C0', 'X.creation_date': 'table0.C0'}, []),
+                    ('FetchStep', [('Any V,VR WHERE V creation_date VR, V is Card',
+                                    [{'VR': 'Datetime', 'V': 'Card'}])],
+                     [self.rql, self.system], None,
+                     {'VR': 'table1.C1', 'V': 'table1.C0', 'V.creation_date': 'table1.C1'}, []),
+                    ('OneFetchStep', [('Any V,MAX(VR) WHERE V creation_date VR, (V creation_date TODAY) OR (V creation_date < TODAY, NOT EXISTS(X creation_date >= VR, X is Card)), V is Card',
+                                       [{'X': 'Card', 'VR': 'Datetime', 'V': 'Card'}])],
+                     None, None, [self.system],
+                     {'VR': 'table1.C1', 'V': 'table1.C0', 'V.creation_date': 'table1.C1', 'X.creation_date': 'table0.C0'}, [])
+                    ])
+
+    def test_outer_supported_rel1(self):
+        # both system and rql support all variables, can be 
+        self._test('Any X, R WHERE X is Note, X in_state S, X type R, '
+                   'NOT EXISTS(Y is Note, Y in_state S, Y type R, X identity Y)',
+                   [('OneFetchStep', [('Any X,R WHERE X is Note, X in_state S, X type R, NOT EXISTS(Y is Note, Y in_state S, Y type R, X identity Y), S is State',
+                                       [{'Y': 'Note', 'X': 'Note', 'S': 'State', 'R': 'String'}])],
+                     None, None,
+                     [self.rql, self.system], {}, [])
+                    ])
+
+    def test_not_identity(self):
+        # both system and rql support all variables, can be 
+        self._test('Any X WHERE NOT X identity U, U eid %s' % self.session.user.eid,
+                   [('OneFetchStep',
+                     [('Any X WHERE NOT X identity 5, X is EUser', [{'X': 'EUser'}])],
+                     None, None,
+                     [self.ldap, self.system], {}, [])
+                    ])
+
+    def test_outer_supported_rel2(self):
+        self._test('Any X, MAX(R) GROUPBY X WHERE X in_state S, X login R, '
+                   'NOT EXISTS(Y is Note, Y in_state S, Y type R)',
+                   [('FetchStep', [('Any A,R WHERE Y in_state A, Y type R, A is State, Y is Note',
+                                    [{'Y': 'Note', 'A': 'State', 'R': 'String'}])],
+                     [self.rql, self.system], None,
+                     {'A': 'table0.C0', 'R': 'table0.C1', 'Y.type': 'table0.C1'}, []),
+                    ('FetchStep', [('Any X,R WHERE X login R, X is EUser', [{'X': 'EUser', 'R': 'String'}])],
+                     [self.ldap, self.system], None,
+                     {'X': 'table1.C0', 'X.login': 'table1.C1', 'R': 'table1.C1'}, []),
+                    ('OneFetchStep', [('Any X,MAX(R) GROUPBY X WHERE X in_state S, X login R, NOT EXISTS(Y type R, S identity A, A is State, Y is Note), S is State, X is EUser',
+                                       [{'Y': 'Note', 'X': 'EUser', 'S': 'State', 'R': 'String', 'A': 'State'}])],
+                     None, None, [self.system],
+                     {'A': 'table0.C0', 'X': 'table1.C0', 'X.login': 'table1.C1', 'R': 'table1.C1', 'Y.type': 'table0.C1'}, [])
+                    ])
+            
+    def test_security_has_text(self):
+        # use a guest user
+        self.session = self._user_session()[1]
+        self._test('Any X WHERE X has_text "bla"',
+                   [('FetchStep', [('Any E WHERE E type "X", E is Note', [{'E': 'Note'}])],
+                     [self.rql, self.system], None, {'E': 'table0.C0'}, []),
+                    ('UnionStep', None, None,
+                     [('OneFetchStep',
+                       [(u'Any X WHERE X has_text "bla", (EXISTS(X owned_by 5)) OR ((((EXISTS(D concerne C?, C owned_by 5, C type "X", X identity D, C is Division, D is Affaire)) OR (EXISTS(H concerne G?, G owned_by 5, G type "X", X identity H, G is SubDivision, H is Affaire))) OR (EXISTS(I concerne F?, F owned_by 5, F type "X", X identity I, F is Societe, I is Affaire))) OR (EXISTS(J concerne E?, E owned_by 5, X identity J, E is Note, J is Affaire))), X is Affaire',
+                         [{'C': 'Division', 'E': 'Note', 'D': 'Affaire', 'G': 'SubDivision', 'F': 'Societe', 'I': 'Affaire', 'H': 'Affaire', 'J': 'Affaire', 'X': 'Affaire'}])],
+                       None, None, [self.system], {'E': 'table0.C0'}, []),
+                      ('OneFetchStep',
+                       [('Any X WHERE X has_text "bla", EXISTS(X owned_by 5), X is Basket',
+                         [{'X': 'Basket'}]),
+                        ('Any X WHERE X has_text "bla", EXISTS(X owned_by 5), X is EUser',
+                         [{'X': 'EUser'}]),
+                        ('Any X WHERE X has_text "bla", X is IN(Card, Comment, Division, Email, EmailThread, File, Folder, Image, Note, Personne, Societe, State, SubDivision, Tag, Transition)',
+                         [{'X': 'Card'}, {'X': 'Comment'}, {'X': 'Division'},
+                          {'X': 'Email'}, {'X': 'EmailThread'}, {'X': 'File'},
+                          {'X': 'Folder'}, {'X': 'Image'}, {'X': 'Note'},
+                          {'X': 'Personne'}, {'X': 'Societe'}, {'X': 'State'},
+                          {'X': 'SubDivision'}, {'X': 'Tag'}, {'X': 'Transition'}]),],
+                       None, None, [self.system], {}, []),
+                      ])
+                     ])
+        
+    def test_security_has_text_limit_offset(self):
+        # use a guest user
+        self.session = self._user_session()[1]
+        # note: same as the above query but because of the subquery usage, the display differs (not printing solutions for each union)
+        self._test('Any X LIMIT 10 OFFSET 10 WHERE X has_text "bla"',
+                   [('FetchStep', [('Any E WHERE E type "X", E is Note', [{'E': 'Note'}])],
+                      [self.rql, self.system], None, {'E': 'table1.C0'}, []),
+                     ('UnionFetchStep', [
+                         ('FetchStep', [('Any X WHERE X has_text "bla", (EXISTS(X owned_by 5)) OR ((((EXISTS(D concerne C?, C owned_by 5, C type "X", X identity D, C is Division, D is Affaire)) OR (EXISTS(H concerne G?, G owned_by 5, G type "X", X identity H, G is SubDivision, H is Affaire))) OR (EXISTS(I concerne F?, F owned_by 5, F type "X", X identity I, F is Societe, I is Affaire))) OR (EXISTS(J concerne E?, E owned_by 5, X identity J, E is Note, J is Affaire))), X is Affaire',
+                                            [{'C': 'Division', 'E': 'Note', 'D': 'Affaire', 'G': 'SubDivision', 'F': 'Societe', 'I': 'Affaire', 'H': 'Affaire', 'J': 'Affaire', 'X': 'Affaire'}])],
+                          [self.system], {'E': 'table1.C0'}, {'X': 'table0.C0'}, []),
+                         ('FetchStep',
+                          [('Any X WHERE X has_text "bla", EXISTS(X owned_by 5), X is Basket',
+                         [{'X': 'Basket'}]),
+                        ('Any X WHERE X has_text "bla", EXISTS(X owned_by 5), X is EUser',
+                         [{'X': 'EUser'}]),
+                        ('Any X WHERE X has_text "bla", X is IN(Card, Comment, Division, Email, EmailThread, File, Folder, Image, Note, Personne, Societe, State, SubDivision, Tag, Transition)',
+                         [{'X': 'Card'}, {'X': 'Comment'}, {'X': 'Division'},
+                          {'X': 'Email'}, {'X': 'EmailThread'}, {'X': 'File'},
+                          {'X': 'Folder'}, {'X': 'Image'}, {'X': 'Note'},
+                          {'X': 'Personne'}, {'X': 'Societe'}, {'X': 'State'},
+                          {'X': 'SubDivision'}, {'X': 'Tag'}, {'X': 'Transition'}]),],
+                          [self.system], {}, {'X': 'table0.C0'}, []),
+                         ]),
+                    ('OneFetchStep',
+                     [('Any X LIMIT 10 OFFSET 10',
+                       [{'X': 'Affaire'}, {'X': 'Basket'}, {'X': 'Card'},
+                        {'X': 'Comment'}, {'X': 'Division'}, {'X': 'EUser'},
+                        {'X': 'Email'}, {'X': 'EmailThread'}, {'X': 'File'},
+                        {'X': 'Folder'}, {'X': 'Image'}, {'X': 'Note'},
+                        {'X': 'Personne'}, {'X': 'Societe'}, {'X': 'State'},
+                        {'X': 'SubDivision'}, {'X': 'Tag'}, {'X': 'Transition'}])],
+                     10, 10, [self.system], {'X': 'table0.C0'}, [])                    
+                     ])
+        
+    def test_security_user(self):
+        """a guest user trying to see another user: EXISTS(X owned_by U) is automatically inserted"""
+        # use a guest user
+        self.session = self._user_session()[1]
+        self._test('Any X WHERE X login "bla"',
+                   [('FetchStep',
+                     [('Any X WHERE X login "bla", X is EUser', [{'X': 'EUser'}])],
+                     [self.ldap, self.system], None, {'X': 'table0.C0'}, []),
+                    ('OneFetchStep',
+                     [('Any X WHERE EXISTS(X owned_by 5), X is EUser', [{'X': 'EUser'}])],
+                     None, None, [self.system], {'X': 'table0.C0'}, [])])
+                
+    def test_security_complex_has_text(self):
+        # use a guest user
+        self.session = self._user_session()[1]
+        self._test('Any X WHERE X has_text "bla", X firstname "bla"',
+                   [('FetchStep', [('Any X WHERE X firstname "bla", X is EUser', [{'X': 'EUser'}])],
+                     [self.ldap, self.system], None, {'X': 'table0.C0'}, []),
+                    ('UnionStep', None, None, [
+                        ('OneFetchStep', [('Any X WHERE X has_text "bla", EXISTS(X owned_by 5), X is EUser', [{'X': 'EUser'}])],
+                         None, None, [self.system], {'X': 'table0.C0'}, []),
+                        ('OneFetchStep', [('Any X WHERE X has_text "bla", X firstname "bla", X is Personne', [{'X': 'Personne'}])],
+                         None, None, [self.system], {}, []),
+                        ]),
+                    ])
+
+    def test_security_complex_has_text_limit_offset(self):
+        # use a guest user
+        self.session = self._user_session()[1]
+        self._test('Any X LIMIT 10 OFFSET 10 WHERE X has_text "bla", X firstname "bla"',
+                   [('FetchStep', [('Any X WHERE X firstname "bla", X is EUser', [{'X': 'EUser'}])],
+                     [self.ldap, self.system], None, {'X': 'table1.C0'}, []),
+                    ('UnionFetchStep', [
+                        ('FetchStep', [('Any X WHERE X has_text "bla", EXISTS(X owned_by 5), X is EUser', [{'X': 'EUser'}])],
+                         [self.system], {'X': 'table1.C0'}, {'X': 'table0.C0'}, []),
+                        ('FetchStep', [('Any X WHERE X has_text "bla", X firstname "bla", X is Personne', [{'X': 'Personne'}])],
+                         [self.system], {}, {'X': 'table0.C0'}, []),
+                        ]),
+                     ('OneFetchStep',
+                      [('Any X LIMIT 10 OFFSET 10', [{'X': 'EUser'}, {'X': 'Personne'}])],
+                      10, 10, [self.system], {'X': 'table0.C0'}, [])
+                    ])
+
+    def test_security_complex_aggregat(self):
+        # use a guest user
+        self.session = self._user_session()[1]
+        self._test('Any MAX(X)',
+                   [('FetchStep', [('Any E WHERE E type "X", E is Note', [{'E': 'Note'}])],
+                     [self.rql, self.system],  None, {'E': 'table1.C0'}, []), 
+                    ('FetchStep', [('Any X WHERE X is EUser', [{'X': 'EUser'}])],
+                     [self.ldap, self.system], None, {'X': 'table2.C0'}, []),
+                    ('UnionFetchStep', [
+                        ('FetchStep', [('Any X WHERE EXISTS(X owned_by 5), X is Basket', [{'X': 'Basket'}])],
+                          [self.system], {}, {'X': 'table0.C0'}, []),                        
+                        ('UnionFetchStep',
+                         [('FetchStep', [('Any X WHERE X is IN(Card, Note, State)',
+                                          [{'X': 'Card'}, {'X': 'Note'}, {'X': 'State'}])],
+                           [self.rql, self.system], {}, {'X': 'table0.C0'}, []),
+                          ('FetchStep',
+                           [('Any X WHERE X is IN(Bookmark, Comment, Division, ECache, EConstraint, EConstraintType, EEType, EFRDef, EGroup, ENFRDef, EPermission, EProperty, ERType, Email, EmailAddress, EmailPart, EmailThread, File, Folder, Image, Personne, RQLExpression, Societe, SubDivision, Tag, TrInfo, Transition)',
+                             sorted([{'X': 'Bookmark'}, {'X': 'Comment'}, {'X': 'Division'},
+                                      {'X': 'ECache'}, {'X': 'EConstraint'}, {'X': 'EConstraintType'},
+                                      {'X': 'EEType'}, {'X': 'EFRDef'}, {'X': 'EGroup'},
+                                      {'X': 'ENFRDef'}, {'X': 'EPermission'}, {'X': 'EProperty'},
+                                      {'X': 'ERType'}, {'X': 'Email'}, {'X': 'EmailAddress'},
+                                      {'X': 'EmailPart'}, {'X': 'EmailThread'}, {'X': 'File'},
+                                      {'X': 'Folder'}, {'X': 'Image'}, {'X': 'Personne'},
+                                      {'X': 'RQLExpression'}, {'X': 'Societe'}, {'X': 'SubDivision'},
+                                      {'X': 'Tag'}, {'X': 'TrInfo'}, {'X': 'Transition'}]))],
+                           [self.system], {}, {'X': 'table0.C0'}, []),
+                          ]),
+                        ('FetchStep', [('Any X WHERE EXISTS(X owned_by 5), X is EUser', [{'X': 'EUser'}])],
+                         [self.system], {'X': 'table2.C0'}, {'X': 'table0.C0'}, []),
+                        ('FetchStep', [('Any X WHERE (EXISTS(X owned_by 5)) OR ((((EXISTS(D concerne C?, C owned_by 5, C type "X", X identity D, C is Division, D is Affaire)) OR (EXISTS(H concerne G?, G owned_by 5, G type "X", X identity H, G is SubDivision, H is Affaire))) OR (EXISTS(I concerne F?, F owned_by 5, F type "X", X identity I, F is Societe, I is Affaire))) OR (EXISTS(J concerne E?, E owned_by 5, X identity J, E is Note, J is Affaire))), X is Affaire',
+                                        [{'C': 'Division', 'E': 'Note', 'D': 'Affaire', 'G': 'SubDivision', 'F': 'Societe', 'I': 'Affaire', 'H': 'Affaire', 'J': 'Affaire', 'X': 'Affaire'}])],
+                         [self.system], {'E': 'table1.C0'}, {'X': 'table0.C0'}, []),                        
+                        ]),
+                    ('OneFetchStep', [('Any MAX(X)', X_ALL_SOLS)],
+                     None, None, [self.system], {'X': 'table0.C0'}, [])
+                    ])
+            
+    def test_security_complex_aggregat2(self):
+        # use a guest user
+        self.session = self._user_session()[1]
+        self._test('Any ET, COUNT(X) GROUPBY ET ORDERBY ET WHERE X is ET',                   
+                   [('FetchStep', [('Any X WHERE X is IN(Card, Note, State)',
+                                    [{'X': 'Card'}, {'X': 'Note'}, {'X': 'State'}])],
+                     [self.rql, self.system], None, {'X': 'table1.C0'}, []),
+                    ('FetchStep', [('Any E WHERE E type "X", E is Note', [{'E': 'Note'}])],
+                     [self.rql, self.system],  None, {'E': 'table2.C0'}, []),
+                    ('FetchStep', [('Any X WHERE X is EUser', [{'X': 'EUser'}])],
+                     [self.ldap, self.system], None, {'X': 'table3.C0'}, []),
+                    ('UnionFetchStep',
+                     [('FetchStep', [('Any ET,X WHERE X is ET, EXISTS(X owned_by 5), ET is EEType, X is Basket',
+                                      [{'ET': 'EEType', 'X': 'Basket'}])],
+                       [self.system], {}, {'ET': 'table0.C0', 'X': 'table0.C1'}, []),
+                      ('FetchStep', [('Any ET,X WHERE X is ET, (EXISTS(X owned_by 5)) OR ((((EXISTS(D concerne C?, C owned_by 5, C type "X", X identity D, C is Division, D is Affaire)) OR (EXISTS(H concerne G?, G owned_by 5, G type "X", X identity H, G is SubDivision, H is Affaire))) OR (EXISTS(I concerne F?, F owned_by 5, F type "X", X identity I, F is Societe, I is Affaire))) OR (EXISTS(J concerne E?, E owned_by 5, X identity J, E is Note, J is Affaire))), ET is EEType, X is Affaire',
+                                      [{'C': 'Division', 'E': 'Note', 'D': 'Affaire',
+                                        'G': 'SubDivision', 'F': 'Societe', 'I': 'Affaire',
+                                        'H': 'Affaire', 'J': 'Affaire', 'X': 'Affaire',
+                                        'ET': 'EEType'}])],
+                       [self.system], {'E': 'table2.C0'}, {'ET': 'table0.C0', 'X': 'table0.C1'},
+                       []),
+                      ('FetchStep', [('Any ET,X WHERE X is ET, EXISTS(X owned_by 5), ET is EEType, X is EUser',
+                                      [{'ET': 'EEType', 'X': 'EUser'}])],
+                       [self.system], {'X': 'table3.C0'}, {'ET': 'table0.C0', 'X': 'table0.C1'}, []),
+                      # extra UnionFetchStep could be avoided but has no cost, so don't care
+                      ('UnionFetchStep',
+                       [('FetchStep', [('Any ET,X WHERE X is ET, ET is EEType, X is IN(Bookmark, Comment, Division, ECache, EConstraint, EConstraintType, EEType, EFRDef, EGroup, ENFRDef, EPermission, EProperty, ERType, Email, EmailAddress, EmailPart, EmailThread, File, Folder, Image, Personne, RQLExpression, Societe, SubDivision, Tag, TrInfo, Transition)',
+                                        [{'X': 'Bookmark', 'ET': 'EEType'}, {'X': 'Comment', 'ET': 'EEType'},
+                                         {'X': 'Division', 'ET': 'EEType'}, {'X': 'ECache', 'ET': 'EEType'},
+                                         {'X': 'EConstraint', 'ET': 'EEType'}, {'X': 'EConstraintType', 'ET': 'EEType'},
+                                         {'X': 'EEType', 'ET': 'EEType'}, {'X': 'EFRDef', 'ET': 'EEType'},
+                                         {'X': 'EGroup', 'ET': 'EEType'}, {'X': 'ENFRDef', 'ET': 'EEType'},
+                                         {'X': 'EPermission', 'ET': 'EEType'}, {'X': 'EProperty', 'ET': 'EEType'},
+                                         {'X': 'ERType', 'ET': 'EEType'}, {'X': 'Email', 'ET': 'EEType'},
+                                         {'X': 'EmailAddress', 'ET': 'EEType'}, {'X': 'EmailPart', 'ET': 'EEType'},
+                                         {'X': 'EmailThread', 'ET': 'EEType'}, {'X': 'File', 'ET': 'EEType'},
+                                         {'X': 'Folder', 'ET': 'EEType'}, {'X': 'Image', 'ET': 'EEType'},
+                                         {'X': 'Personne', 'ET': 'EEType'}, {'X': 'RQLExpression', 'ET': 'EEType'},
+                                         {'X': 'Societe', 'ET': 'EEType'}, {'X': 'SubDivision', 'ET': 'EEType'},
+                                         {'X': 'Tag', 'ET': 'EEType'}, {'X': 'TrInfo', 'ET': 'EEType'},
+                                         {'X': 'Transition', 'ET': 'EEType'}])],
+                         [self.system], {}, {'ET': 'table0.C0', 'X': 'table0.C1'}, []),
+                        ('FetchStep',
+                         [('Any ET,X WHERE X is ET, ET is EEType, X is IN(Card, Note, State)',
+                           [{'ET': 'EEType', 'X': 'Card'},
+                            {'ET': 'EEType', 'X': 'Note'},
+                            {'ET': 'EEType', 'X': 'State'}])],
+                         [self.system], {'X': 'table1.C0'}, {'ET': 'table0.C0', 'X': 'table0.C1'}, []),
+                        ]),
+                    ]),
+                    ('OneFetchStep',
+                     [('Any ET,COUNT(X) GROUPBY ET ORDERBY ET',
+                       sorted([{'ET': 'EEType', 'X': 'Affaire'}, {'ET': 'EEType', 'X': 'Basket'},
+                               {'ET': 'EEType', 'X': 'Bookmark'}, {'ET': 'EEType', 'X': 'Card'},
+                               {'ET': 'EEType', 'X': 'Comment'}, {'ET': 'EEType', 'X': 'Division'},
+                               {'ET': 'EEType', 'X': 'ECache'}, {'ET': 'EEType', 'X': 'EConstraint'},
+                               {'ET': 'EEType', 'X': 'EConstraintType'}, {'ET': 'EEType', 'X': 'EEType'},
+                               {'ET': 'EEType', 'X': 'EFRDef'}, {'ET': 'EEType', 'X': 'EGroup'},
+                               {'ET': 'EEType', 'X': 'ENFRDef'}, {'ET': 'EEType', 'X': 'EPermission'},
+                               {'ET': 'EEType', 'X': 'EProperty'}, {'ET': 'EEType', 'X': 'ERType'},
+                               {'ET': 'EEType', 'X': 'EUser'}, {'ET': 'EEType', 'X': 'Email'},
+                               {'ET': 'EEType', 'X': 'EmailAddress'}, {'ET': 'EEType', 'X': 'EmailPart'},
+                               {'ET': 'EEType', 'X': 'EmailThread'}, {'ET': 'EEType', 'X': 'File'},
+                               {'ET': 'EEType', 'X': 'Folder'}, {'ET': 'EEType', 'X': 'Image'},
+                               {'ET': 'EEType', 'X': 'Note'}, {'ET': 'EEType', 'X': 'Personne'},
+                               {'ET': 'EEType', 'X': 'RQLExpression'}, {'ET': 'EEType', 'X': 'Societe'},
+                               {'ET': 'EEType', 'X': 'State'}, {'ET': 'EEType', 'X': 'SubDivision'},
+                               {'ET': 'EEType', 'X': 'Tag'}, {'ET': 'EEType', 'X': 'TrInfo'},
+                               {'ET': 'EEType', 'X': 'Transition'}]))],
+                     None, None, [self.system], {'ET': 'table0.C0', 'X': 'table0.C1'}, [])
+                    ])
+
+    def test_security_3sources(self):
+        # use a guest user
+        self.session = self._user_session()[1]
+        self._test('Any X, XT WHERE X is Card, X owned_by U, X title XT, U login "syt"',
+                   [('FetchStep',
+                     [('Any X,XT WHERE X title XT, X is Card', [{'X': 'Card', 'XT': 'String'}])],
+                     [self.rql, self.system], None, {'X': 'table0.C0', 'X.title': 'table0.C1', 'XT': 'table0.C1'}, []),
+                    ('FetchStep',
+                     [('Any U WHERE U login "syt", U is EUser', [{'U': 'EUser'}])],
+                     [self.ldap, self.system], None, {'U': 'table1.C0'}, []),
+                    ('OneFetchStep',
+                     [('Any X,XT WHERE X owned_by U, X title XT, EXISTS(U owned_by 5), U is EUser, X is Card',
+                       [{'X': 'Card', 'U': 'EUser', 'XT': 'String'}])],
+                     None, None, [self.system],
+                     {'X': 'table0.C0', 'X.title': 'table0.C1', 'XT': 'table0.C1', 'U': 'table1.C0'}, [])
+                    ])
+
+    def test_security_3sources_identity(self):
+        self.restore_orig_euser_security()
+        # use a guest user
+        self.session = self._user_session()[1]
+        self._test('Any X, XT WHERE X is Card, X owned_by U, X title XT, U login "syt"',
+                   [('FetchStep',
+                     [('Any X,XT WHERE X title XT, X is Card', [{'X': 'Card', 'XT': 'String'}])],
+                     [self.rql, self.system], None, {'X': 'table0.C0', 'X.title': 'table0.C1', 'XT': 'table0.C1'}, []),
+                    ('OneFetchStep',
+                     [('Any X,XT WHERE X owned_by U, X title XT, U login "syt", EXISTS(U identity 5), U is EUser, X is Card',
+                       [{'U': 'EUser', 'X': 'Card', 'XT': 'String'}])],
+                     None, None, [self.system], {'X': 'table0.C0', 'X.title': 'table0.C1', 'XT': 'table0.C1'}, [])
+                    ])
+
+    def test_security_3sources_identity_optional_var(self):
+        self.restore_orig_euser_security()
+        # use a guest user
+        self.session = self._user_session()[1]
+        self._test('Any X,XT,U WHERE X is Card, X owned_by U?, X title XT, U login L',
+                   [('FetchStep',
+                     [('Any U,L WHERE U identity 5, U login L, U is EUser',
+                       [{'L': 'String', u'U': 'EUser'}])],
+                     [self.system], {}, {'L': 'table0.C1', 'U': 'table0.C0', 'U.login': 'table0.C1'}, []),
+                    ('FetchStep',
+                     [('Any X,XT WHERE X title XT, X is Card', [{'X': 'Card', 'XT': 'String'}])],
+                     [self.rql, self.system], None, {'X': 'table1.C0', 'X.title': 'table1.C1', 'XT': 'table1.C1'}, []),
+                    ('OneFetchStep',
+                     [('Any X,XT,U WHERE X owned_by U?, X title XT, X is Card',
+                       [{'X': 'Card', 'XT': 'String'}])],
+                     None, None, [self.system], {'L': 'table0.C1',
+                                                 'U': 'table0.C0',
+                                                 'X': 'table1.C0',
+                                                 'X.title': 'table1.C1',
+                                                 'XT': 'table1.C1'}, [])
+                    ])
+
+    def test_security_3sources_limit_offset(self):
+        # use a guest user
+        self.session = self._user_session()[1]
+        self._test('Any X, XT LIMIT 10 OFFSET 10 WHERE X is Card, X owned_by U, X title XT, U login "syt"',
+                   [('FetchStep',
+                     [('Any X,XT WHERE X title XT, X is Card', [{'X': 'Card', 'XT': 'String'}])],
+                     [self.rql, self.system], None, {'X': 'table0.C0', 'X.title': 'table0.C1', 'XT': 'table0.C1'}, []),
+                    ('FetchStep',
+                     [('Any U WHERE U login "syt", U is EUser', [{'U': 'EUser'}])],
+                     [self.ldap, self.system], None, {'U': 'table1.C0'}, []),
+                    ('OneFetchStep',
+                     [('Any X,XT LIMIT 10 OFFSET 10 WHERE X owned_by U, X title XT, EXISTS(U owned_by 5), U is EUser, X is Card',
+                       [{'X': 'Card', 'U': 'EUser', 'XT': 'String'}])],
+                     10, 10, [self.system],
+                     {'X': 'table0.C0', 'X.title': 'table0.C1', 'XT': 'table0.C1', 'U': 'table1.C0'}, [])
+                    ])
+    
+    def test_exists_base(self):
+        self._test('Any X,L,S WHERE X in_state S, X login L, EXISTS(X in_group G, G name "bougloup")',
+                   [('FetchStep', [('Any X,L WHERE X login L, X is EUser', [{'X': 'EUser', 'L': 'String'}])],
+                     [self.ldap, self.system], None, {'X': 'table0.C0', 'X.login': 'table0.C1', 'L': 'table0.C1'}, []),
+                    ('OneFetchStep', [("Any X,L,S WHERE X in_state S, X login L, "
+                                      'EXISTS(X in_group G, G name "bougloup", G is EGroup), S is State, X is EUser',
+                                       [{'X': 'EUser', 'L': 'String', 'S': 'State', 'G': 'EGroup'}])],
+                     None, None, [self.system],
+                     {'X': 'table0.C0', 'X.login': 'table0.C1', 'L': 'table0.C1'}, [])])
+
+    def test_exists_complex(self):
+        self._test('Any G WHERE X in_group G, G name "managers", EXISTS(X copain T, T login in ("comme", "cochon"))',
+                   [('FetchStep', [('Any T WHERE T login IN("comme", "cochon"), T is EUser', [{'T': 'EUser'}])],
+                     [self.ldap, self.system], None, {'T': 'table0.C0'}, []),
+                    ('OneFetchStep',
+                     [('Any G WHERE X in_group G, G name "managers", EXISTS(X copain T, T is EUser), G is EGroup, X is EUser',
+                       [{'X': 'EUser', 'T': 'EUser', 'G': 'EGroup'}])],
+                     None, None, [self.system], {'T': 'table0.C0'}, [])])
+
+    def test_exists3(self):
+        self._test('Any G,L WHERE X in_group G, X login L, G name "managers", EXISTS(X copain T, T login in ("comme", "cochon"))',
+                   [('FetchStep',
+                     [('Any T WHERE T login IN("comme", "cochon"), T is EUser',
+                       [{'T': 'EUser'}])],
+                     [self.ldap, self.system], None, {'T': 'table0.C0'}, []),
+                    ('FetchStep',
+                     [('Any L,X WHERE X login L, X is EUser', [{'X': 'EUser', 'L': 'String'}])],
+                     [self.ldap, self.system], None,
+                     {'X': 'table1.C1', 'X.login': 'table1.C0', 'L': 'table1.C0'}, []),
+                    ('OneFetchStep',
+                     [('Any G,L WHERE X in_group G, X login L, G name "managers", EXISTS(X copain T, T is EUser), G is EGroup, X is EUser',
+                       [{'G': 'EGroup', 'L': 'String', 'T': 'EUser', 'X': 'EUser'}])],
+                     None, None,
+                     [self.system], {'T': 'table0.C0', 'X': 'table1.C1', 'X.login': 'table1.C0', 'L': 'table1.C0'}, [])])
+
+    def test_exists4(self):
+        self._test('Any G,L WHERE X in_group G, X login L, G name "managers", '
+                   'EXISTS(X copain T, T login L, T login in ("comme", "cochon")) OR '
+                   'EXISTS(X in_state S, S name "pascontent", NOT X copain T2, T2 login "billy")',
+                   [('FetchStep',
+                     [('Any T,L WHERE T login L, T login IN("comme", "cochon"), T is EUser', [{'T': 'EUser', 'L': 'String'}])],
+                     [self.ldap, self.system], None,
+                     {'T': 'table0.C0', 'T.login': 'table0.C1', 'L': 'table0.C1'}, []),
+                    ('FetchStep',
+                     [('Any T2 WHERE T2 login "billy", T2 is EUser', [{'T2': 'EUser'}])],
+                     [self.ldap, self.system], None, {'T2': 'table1.C0'}, []),
+                    ('FetchStep',
+                     [('Any L,X WHERE X login L, X is EUser', [{'X': 'EUser', 'L': 'String'}])],
+                     [self.ldap, self.system], None, {'X': 'table2.C1', 'X.login': 'table2.C0', 'L': 'table2.C0'}, []),
+                    ('OneFetchStep',
+                     [('Any G,L WHERE X in_group G, X login L, G name "managers", (EXISTS(X copain T, T login L, T is EUser)) OR (EXISTS(X in_state S, S name "pascontent", NOT X copain T2, S is State, T2 is EUser)), G is EGroup, X is EUser',
+                       [{'G': 'EGroup', 'L': 'String', 'S': 'State', 'T': 'EUser', 'T2': 'EUser', 'X': 'EUser'}])],
+                     None, None, [self.system],
+                     {'T2': 'table1.C0', 'L': 'table2.C0',
+                      'T': 'table0.C0', 'T.login': 'table0.C1', 'X': 'table2.C1', 'X.login': 'table2.C0'}, [])])
+
+    def test_exists5(self):
+        self._test('Any GN,L WHERE X in_group G, X login L, G name GN, '
+                   'EXISTS(X copain T, T login in ("comme", "cochon")) AND '
+                   'NOT EXISTS(X copain T2, T2 login "billy")',
+                   [('FetchStep', [('Any T WHERE T login IN("comme", "cochon"), T is EUser',
+                                    [{'T': 'EUser'}])],
+                     [self.ldap, self.system], None, {'T': 'table0.C0'}, []),
+                    ('FetchStep', [('Any T2 WHERE T2 login "billy", T2 is EUser', [{'T2': 'EUser'}])],
+                     [self.ldap, self.system], None, {'T2': 'table1.C0'}, []),
+                    ('FetchStep', [('Any L,X WHERE X login L, X is EUser', [{'X': 'EUser', 'L': 'String'}])],
+                     [self.ldap, self.system], None,
+                     {'X': 'table2.C1', 'X.login': 'table2.C0', 'L': 'table2.C0'}, []),
+                    ('OneFetchStep', [('Any GN,L WHERE X in_group G, X login L, G name GN, EXISTS(X copain T, T is EUser), NOT EXISTS(X copain T2, T2 is EUser), G is EGroup, X is EUser',
+                       [{'G': 'EGroup', 'GN': 'String', 'L': 'String', 'T': 'EUser', 'T2': 'EUser', 'X': 'EUser'}])],
+                     None, None, [self.system],
+                     {'T': 'table0.C0', 'T2': 'table1.C0',
+                      'X': 'table2.C1', 'X.login': 'table2.C0', 'L': 'table2.C0'}, [])])
+
+    def test_relation_need_split(self):
+        self._test('Any X, S WHERE X in_state S',
+                   [('UnionStep', None, None, [
+                       ('OneFetchStep', [('Any X,S WHERE X in_state S, S is State, X is IN(Affaire, EUser)',
+                                          [{'X': 'Affaire', 'S': 'State'}, {'X': 'EUser', 'S': 'State'}])], 
+                        None, None, [self.system], {}, []),
+                       ('OneFetchStep', [('Any X,S WHERE X in_state S, S is State, X is Note',
+                                          [{'X': 'Note', 'S': 'State'}])], 
+                        None, None, [self.rql, self.system], {}, []),
+                    ])])
+
+    def test_relation_selection_need_split(self):
+        self._test('Any X,S,U WHERE X in_state S, X todo_by U',
+                   [('FetchStep', [('Any X,S WHERE X in_state S, S is State, X is Note',
+                                    [{'X': 'Note', 'S': 'State'}])],
+                     [self.rql, self.system], None, {'X': 'table0.C0', 'S': 'table0.C1'}, []),
+                     ('UnionStep', None, None,
+                      [('OneFetchStep', [('Any X,S,U WHERE X in_state S, X todo_by U, S is State, U is EUser, X is Note',
+                                          [{'X': 'Note', 'S': 'State', 'U': 'EUser'}])],
+                        None, None, [self.system], {'X': 'table0.C0', 'S': 'table0.C1'}, []),
+                       ('OneFetchStep', [('Any X,S,U WHERE X in_state S, X todo_by U, S is State, U is Personne, X is Affaire',
+                                          [{'X': 'Affaire', 'S': 'State', 'U': 'Personne'}])],
+                        None, None, [self.system], {}, []),
+                       ])
+                    ])
+
+    def test_relation_restriction_need_split(self):
+        self._test('Any X,U WHERE X in_state S, S name "pending", X todo_by U',
+                   [('FetchStep', [('Any X WHERE X in_state S, S name "pending", S is State, X is Note',
+                                    [{'X': 'Note', 'S': 'State'}])],
+                     [self.rql, self.system], None, {'X': 'table0.C0'}, []),
+                     ('UnionStep', None, None,
+                      [('OneFetchStep', [('Any X,U WHERE X todo_by U, U is EUser, X is Note',
+                                          [{'X': 'Note', 'U': 'EUser'}])],
+                        None, None, [self.system], {'X': 'table0.C0'}, []),
+                       ('OneFetchStep', [('Any X,U WHERE X in_state S, S name "pending", X todo_by U, S is State, U is Personne, X is Affaire',
+                                          [{'S': 'State', 'U': 'Personne', 'X': 'Affaire'}])],
+                        None, None, [self.system], {}, [])
+                       ])
+                    ])
+
+    def test_relation_restriction_ambigous_need_split(self):
+        self._test('Any X,T WHERE X in_state S, S name "pending", T tags X',
+                   [('FetchStep', [('Any X WHERE X in_state S, S name "pending", S is State, X is Note',
+                                    [{'X': 'Note', 'S': 'State'}])],
+                     [self.rql, self.system], None, {'X': 'table0.C0'}, []),
+                    ('UnionStep', None, None, [
+                        ('OneFetchStep', [('Any X,T WHERE T tags X, T is Tag, X is Note',
+                                           [{'X': 'Note', 'T': 'Tag'}])],
+                         None, None,
+                         [self.system], {'X': 'table0.C0'}, []),
+                        ('OneFetchStep', [('Any X,T WHERE X in_state S, S name "pending", T tags X, S is State, T is Tag, X is IN(Affaire, EUser)',
+                                           [{'X': 'Affaire', 'S': 'State', 'T': 'Tag'},
+                                            {'X': 'EUser', 'S': 'State', 'T': 'Tag'}])],
+                         None, None,
+                         [self.system], {}, []),
+                        ])
+                    ])
+
+    def test_not_relation_no_split_internal(self):
+        ueid = self.session.user.eid
+        # NOT on a relation supported by rql and system source: we want to get
+        # all states (eg from both sources) which are not related to entity with the
+        # given eid. The "NOT X in_state S, X eid %(x)s" expression is necessarily true
+        # in the source where %(x)s is not coming from and will be removed during rql
+        # generation for the external source
+        self._test('Any SN WHERE NOT X in_state S, X eid %(x)s, S name SN',
+                   [('OneFetchStep', [('Any SN WHERE NOT 5 in_state S, S name SN, S is State', [{'S': 'State', 'SN': 'String'}])], 
+                     None, None, [self.rql, self.system], {}, [])],
+                   {'x': ueid})
+
+    def test_not_relation_no_split_external(self):
+        repo._type_source_cache[999999] = ('Note', 'cards', 999999)
+        # similar to the above test but with an eid coming from the external source
+        self._test('Any SN WHERE NOT X in_state S, X eid %(x)s, S name SN',
+                   [('UnionStep', None, None,
+                     [('OneFetchStep',
+                       [('Any SN WHERE NOT 999999 in_state S, S name SN, S is State',
+                         [{'S': 'State', 'SN': 'String'}])],
+                       None, None, [self.rql], {},
+                       []),
+                      ('OneFetchStep',
+                       [('Any SN WHERE S name SN, S is State',
+                         [{'S': 'State', 'SN': 'String'}])],
+                       None, None, [self.system], {},
+                       [])]
+                     )],
+                   {'x': 999999})
+
+    def test_not_relation_need_split(self):
+        ueid = self.session.user.eid
+        self._test('Any SN WHERE NOT X in_state S, S name SN',
+                   [('FetchStep', [('Any SN,S WHERE S name SN, S is State', [{'S': 'State', 'SN': 'String'}])],
+                     [self.rql, self.system], None, {'S': 'table0.C1', 'S.name': 'table0.C0', 'SN': 'table0.C0'},
+                     []),
+                    ('FetchStep', [('Any X WHERE X is Note', [{'X': 'Note'}])],
+                     [self.rql, self.system], None, {'X': 'table1.C0'},
+                     []),
+                    ('UnionStep', None, None,
+                     [('OneFetchStep',
+                       [('Any SN WHERE NOT X in_state S, S name SN, S is State, X is IN(Affaire, EUser)',
+                         [{'S': 'State', 'SN': 'String', 'X': 'Affaire'},
+                          {'S': 'State', 'SN': 'String', 'X': 'EUser'}])],
+                       None, None, [self.system], {'S': 'table0.C1', 'S.name': 'table0.C0', 'SN': 'table0.C0'},
+                       []),
+                      ('OneFetchStep',
+                       [('Any SN WHERE NOT X in_state S, S name SN, S is State, X is Note',
+                         [{'S': 'State', 'SN': 'String', 'X': 'Note'}])],
+                       None, None, [self.system], {'S': 'table0.C1', 'S.name': 'table0.C0', 'SN': 'table0.C0',
+                                                   'X': 'table1.C0'},
+                       [])]
+                     )])
+            
+    def test_external_attributes_and_relation(self):
+        repo._type_source_cache[999999] = ('Note', 'cards', 999999)
+        self._test('Any A,B,C,D WHERE A eid %(x)s,A creation_date B,A modification_date C, A todo_by D?',
+                   [('FetchStep', [('Any A,B,C WHERE A eid 999999, A creation_date B, A modification_date C, A is Note',
+                                    [{'A': 'Note', 'C': 'Datetime', 'B': 'Datetime'}])],
+                     [self.rql], None,
+                     {'A': 'table0.C0', 'A.creation_date': 'table0.C1', 'A.modification_date': 'table0.C2', 'C': 'table0.C2', 'B': 'table0.C1'}, []),
+                    #('FetchStep', [('Any D WHERE D is EUser', [{'D': 'EUser'}])],
+                    # [self.ldap, self.system], None, {'D': 'table1.C0'}, []),
+                    ('OneFetchStep', [('Any A,B,C,D WHERE A creation_date B, A modification_date C, A todo_by D?, A is Note, D is EUser',
+                                       [{'A': 'Note', 'C': 'Datetime', 'B': 'Datetime', 'D': 'EUser'}])],
+                     None, None, [self.system],
+                     {'A': 'table0.C0', 'A.creation_date': 'table0.C1', 'A.modification_date': 'table0.C2', 'C': 'table0.C2', 'B': 'table0.C1'}, [])],
+                   {'x': 999999})
+
+
+    def test_simplified_var(self):
+        repo._type_source_cache[999999] = ('Note', 'cards', 999999)
+        self._test('Any U WHERE U in_group G, (G name IN ("managers", "logilab") OR (X require_permission P?, P name "bla", P require_group G)), X eid %(x)s, U eid %(u)s',
+                   [('OneFetchStep', [('Any 5 WHERE 5 in_group G, (G name IN("managers", "logilab")) OR (X require_permission P?, P name "bla", P require_group G), X eid 999999',
+                                       [{'X': 'Note', 'G': 'EGroup', 'P': 'EPermission'}])],
+                     None, None, [self.system], {}, [])],
+                   {'x': 999999, 'u': self.session.user.eid})
+
+    def test_has_text(self):
+        self._test('Card X WHERE X has_text "toto"',
+                   [('OneFetchStep', [('Any X WHERE X has_text "toto", X is Card',
+                                       [{'X': 'Card'}])],
+                     None, None, [self.system], {}, [])])
+        
+    def test_has_text_3(self):
+        self._test('Any X WHERE X has_text "toto", X title "zoubidou"',
+                   [('FetchStep', [(u'Any X WHERE X title "zoubidou", X is Card',
+                                    [{'X': 'Card'}])],
+                     [self.rql, self.system], None, {'X': 'table0.C0'}, []),
+                    ('UnionStep', None, None, [
+                        ('OneFetchStep', [(u'Any X WHERE X has_text "toto", X is Card',
+                                           [{'X': 'Card'}])],
+                         None, None, [self.system], {'X': 'table0.C0'}, []),
+                        ('OneFetchStep', [(u'Any X WHERE X has_text "toto", X title "zoubidou", X is EmailThread',
+                                           [{'X': 'EmailThread'}])],
+                         None, None, [self.system], {}, []),
+                        ]),
+                    ])
+        
+    def test_sort_func(self):
+        self._test('Note X ORDERBY DUMB_SORT(RF) WHERE X type RF',
+                   [('AggrStep', 'Any X ORDERBY DUMB_SORT(RF)', None, None, 'table0', None, [
+                       ('FetchStep', [('Any X,RF WHERE X type RF, X is Note',
+                                       [{'X': 'Note', 'RF': 'String'}])],
+                        [self.rql, self.system], {}, {'X': 'table0.C0', 'X.type': 'table0.C1', 'RF': 'table0.C1'}, []),
+                       ])
+                    ])
+
+    def test_ambigous_sort_func(self):
+        self._test('Any X ORDERBY DUMB_SORT(RF) WHERE X title RF',
+                   [('AggrStep', 'Any X ORDERBY DUMB_SORT(RF)',
+                     None, None, 'table0', None,
+                     [('FetchStep', [('Any X,RF WHERE X title RF, X is Card',
+                                      [{'X': 'Card', 'RF': 'String'}])],
+                       [self.rql, self.system], {},
+                       {'X': 'table0.C0', 'X.title': 'table0.C1', 'RF': 'table0.C1'}, []),
+                      ('FetchStep', [('Any X,RF WHERE X title RF, X is IN(Bookmark, EmailThread)',
+                                      [{'RF': 'String', 'X': 'Bookmark'},
+                                       {'RF': 'String', 'X': 'EmailThread'}])],
+                       [self.system], {},
+                       {'X': 'table0.C0', 'X.title': 'table0.C1', 'RF': 'table0.C1'}, []),
+                      ]),
+                   ])
+
+    def test_attr_unification_1(self):
+        self._test('Any X,Y WHERE X is Bookmark, Y is Card, X title T, Y title T',
+                   [('FetchStep',
+                     [('Any Y,T WHERE Y title T, Y is Card', [{'T': 'String', 'Y': 'Card'}])],
+                     [self.rql, self.system], None,
+                     {'T': 'table0.C1', 'Y': 'table0.C0', 'Y.title': 'table0.C1'}, []),
+                    ('OneFetchStep',
+                     [('Any X,Y WHERE X title T, Y title T, X is Bookmark, Y is Card',
+                       [{'T': 'String', 'X': 'Bookmark', 'Y': 'Card'}])],
+                     None, None, [self.system],
+                     {'T': 'table0.C1', 'Y': 'table0.C0', 'Y.title': 'table0.C1'}, [])
+                    ])
+
+    def test_attr_unification_2(self):
+        self._test('Any X,Y WHERE X is Note, Y is Card, X type T, Y title T',
+                   [('FetchStep',
+                     [('Any X,T WHERE X type T, X is Note', [{'T': 'String', 'X': 'Note'}])],
+                     [self.rql, self.system], None,
+                     {'T': 'table0.C1', 'X': 'table0.C0', 'X.type': 'table0.C1'}, []),
+                    ('FetchStep',
+                     [('Any Y,T WHERE Y title T, Y is Card', [{'T': 'String', 'Y': 'Card'}])],
+                     [self.rql, self.system], None,
+                     {'T': 'table1.C1', 'Y': 'table1.C0', 'Y.title': 'table1.C1'}, []),
+                    ('OneFetchStep',
+                     [('Any X,Y WHERE X type T, Y title T, X is Note, Y is Card',
+                       [{'T': 'String', 'X': 'Note', 'Y': 'Card'}])],
+                     None, None, [self.system],
+                     {'T': 'table1.C1',
+                      'X': 'table0.C0', 'X.type': 'table0.C1',
+                      'Y': 'table1.C0', 'Y.title': 'table1.C1'}, [])
+                    ])
+
+    def test_attr_unification_neq_1(self):
+        self._test('Any X,Y WHERE X is Bookmark, Y is Card, X creation_date D, Y creation_date > D',
+                   [('FetchStep', 
+                     [('Any Y,D WHERE Y creation_date > D, Y is Card',
+                       [{'D': 'Datetime', 'Y': 'Card'}])],
+                     [self.rql,self.system], None,
+                     {'D': 'table0.C1', 'Y': 'table0.C0', 'Y.creation_date': 'table0.C1'}, []),
+                    ('OneFetchStep',
+                     [('Any X,Y WHERE X creation_date D, Y creation_date > D, X is Bookmark, Y is Card',
+                       [{'D': 'Datetime', 'X': 'Bookmark', 'Y': 'Card'}])], None, None,
+                     [self.system],
+                     {'D': 'table0.C1', 'Y': 'table0.C0', 'Y.creation_date': 'table0.C1'}, [])
+                   ])
+
+    def test_subquery_1(self):
+        self._test('DISTINCT Any B,C ORDERBY C WHERE A created_by B, B login C, EXISTS(B owned_by D), D eid %(E)s '
+                   'WITH A,N BEING ((Any X,N WHERE X is Tag, X name N) UNION (Any X,T WHERE X is Bookmark, X title T))',
+                   [('FetchStep', [('Any X,N WHERE X is Tag, X name N', [{'N': 'String', 'X': 'Tag'}]),
+                                   ('Any X,T WHERE X is Bookmark, X title T',
+                                    [{'T': 'String', 'X': 'Bookmark'}])],
+                     [self.system], {}, {'N': 'table0.C1', 'X': 'table0.C0', 'X.name': 'table0.C1'}, []),
+                    ('FetchStep',
+                     [('Any B,C WHERE B login C, B is EUser', [{'B': 'EUser', 'C': 'String'}])],
+                     [self.ldap, self.system], None, {'B': 'table1.C0', 'B.login': 'table1.C1', 'C': 'table1.C1'}, []),
+                    ('OneFetchStep', [('DISTINCT Any B,C ORDERBY C WHERE A created_by B, B login C, EXISTS(B owned_by 5), B is EUser',
+                                       [{'A': 'Bookmark', 'B': 'EUser', 'C': 'String'},
+                                        {'A': 'Tag', 'B': 'EUser', 'C': 'String'}])],
+                     None, None, [self.system],
+                     {'A': 'table0.C0',
+                      'B': 'table1.C0', 'B.login': 'table1.C1',
+                      'C': 'table1.C1',
+                      'N': 'table0.C1'},
+                     [])],
+                   {'E': self.session.user.eid})
+
+    def test_subquery_2(self):
+        self._test('DISTINCT Any B,C ORDERBY C WHERE A created_by B, B login C, EXISTS(B owned_by D), D eid %(E)s '
+                   'WITH A,N BEING ((Any X,N WHERE X is Tag, X name N) UNION (Any X,T WHERE X is Card, X title T))',
+                   [('UnionFetchStep',
+                     [('FetchStep', [('Any X,N WHERE X is Tag, X name N', [{'N': 'String', 'X': 'Tag'}])],
+                       [self.system], {},
+                       {'N': 'table0.C1',
+                        'T': 'table0.C1',
+                        'X': 'table0.C0',
+                        'X.name': 'table0.C1',
+                        'X.title': 'table0.C1'}, []),
+                      ('FetchStep', [('Any X,T WHERE X is Card, X title T',
+                                      [{'T': 'String', 'X': 'Card'}])],
+                       [self.rql, self.system], {},
+                       {'N': 'table0.C1',
+                        'T': 'table0.C1',
+                        'X': 'table0.C0',
+                        'X.name': 'table0.C1',
+                        'X.title': 'table0.C1'}, []),
+                      ]),
+                    ('FetchStep',
+                     [('Any B,C WHERE B login C, B is EUser', [{'B': 'EUser', 'C': 'String'}])],
+                     [self.ldap, self.system], None, {'B': 'table1.C0', 'B.login': 'table1.C1', 'C': 'table1.C1'}, []),
+                    ('OneFetchStep', [('DISTINCT Any B,C ORDERBY C WHERE A created_by B, B login C, EXISTS(B owned_by 5), B is EUser',
+                                       [{'A': 'Card', 'B': 'EUser', 'C': 'String'},
+                                        {'A': 'Tag', 'B': 'EUser', 'C': 'String'}])],
+                     None, None, [self.system],
+                     {'A': 'table0.C0',
+                      'B': 'table1.C0', 'B.login': 'table1.C1',
+                      'C': 'table1.C1',
+                      'N': 'table0.C1'},
+                     [])],
+                   {'E': self.session.user.eid})
+
+    def test_eid_dont_cross_relation(self):
+        repo._type_source_cache[999999] = ('Personne', 'system', 999999)
+        self._test('Any Y,YT WHERE X eid %(x)s, X fiche Y, Y title YT',
+                   [('OneFetchStep', [('Any Y,YT WHERE X eid 999999, X fiche Y, Y title YT',
+                                       [{'X': 'Personne', 'Y': 'Card', 'YT': 'String'}])],
+                     None, None, [self.system], {}, [])],
+                   {'x': 999999})
+        
+    # edition queries tests ###################################################
+
+    def test_insert_simplified_var_1(self):
+        repo._type_source_cache[999999] = ('Note', 'cards', 999999)
+        repo._type_source_cache[999998] = ('State', 'system', None)
+        self._test('INSERT Note X: X in_state S, X type T WHERE S eid %(s)s, N eid %(n)s, N type T',
+                   [('FetchStep', [('Any T WHERE N eid 999999, N type T, N is Note',
+                                    [{'N': 'Note', 'T': 'String'}])],
+                     [self.rql], None, {'N.type': 'table0.C0', 'T': 'table0.C0'}, []),
+                    ('InsertStep',
+                     [('RelationsStep',
+                       [('OneFetchStep', [('Any 999998,T WHERE N type T, N is Note',
+                                           [{'N': 'Note', 'T': 'String'}])],
+                        None, None, [self.system],
+                        {'N.type': 'table0.C0', 'T': 'table0.C0'}, [])])
+                      ])
+                    ],
+                   {'n': 999999, 's': 999998})
+
+    def test_insert_simplified_var_2(self):
+        repo._type_source_cache[999999] = ('Note', 'cards', 999999)
+        repo._type_source_cache[999998] = ('State', 'system', None)
+        self._test('INSERT Note X: X in_state S, X type T, X migrated_from N WHERE S eid %(s)s, N eid %(n)s, N type T',
+                   [('FetchStep', [('Any T,N WHERE N eid 999999, N type T, N is Note',
+                                    [{'N': 'Note', 'T': 'String'}])],
+                     [self.rql], None, {'N': 'table0.C1', 'N.type': 'table0.C0', 'T': 'table0.C0'}, []),
+                    ('InsertStep',
+                     [('RelationsStep',
+                       [('OneFetchStep', [('Any 999998,T,N WHERE N type T, N is Note',
+                                           [{'N': 'Note', 'T': 'String'}])],
+                         None, None, [self.system],
+                         {'N': 'table0.C1', 'N.type': 'table0.C0', 'T': 'table0.C0'}, [])
+                        ])
+                      ])
+                    ],
+                   {'n': 999999, 's': 999998})
+
+    def test_insert_simplified_var_3(self):
+        repo._type_source_cache[999999] = ('Note', 'cards', 999999)
+        repo._type_source_cache[999998] = ('State', 'cards', 999998)
+        self._test('INSERT Note X: X in_state S, X type T WHERE S eid %(s)s, N eid %(n)s, N type T',
+                   [('InsertStep',
+                     [('RelationsStep',
+                       [('OneFetchStep', [('Any 999998,T WHERE N eid 999999, N type T, N is Note',
+                                           [{'N': 'Note', 'T': 'String'}])],
+                         None, None, [self.rql], {}, [])]
+                       )]
+                     )],
+                   {'n': 999999, 's': 999998})
+
+    def test_insert_simplified_var_4(self):
+        repo._type_source_cache[999999] = ('Note', 'cards', 999999)
+        repo._type_source_cache[999998] = ('State', 'system', None)
+        self._test('INSERT Note X: X in_state S, X type "bla", X migrated_from N WHERE S eid %(s)s, N eid %(n)s',
+                   [('InsertStep',
+                     [('RelationsStep',
+                       [('OneFetchStep', [('Any 999998,999999', [{}])],
+                         None, None, [self.system], {}, [])]
+                       )]
+                     )],
+                   {'n': 999999, 's': 999998})
+
+    def test_insert_simplified_var_5(self):
+        repo._type_source_cache[999999] = ('Note', 'cards', 999999)
+        repo._type_source_cache[999998] = ('State', 'system', None)
+        self._test('INSERT Note X: X in_state S, X type "bla", X migrated_from N WHERE S eid %(s)s, N eid %(n)s, A concerne N',
+                   [('InsertStep',
+                     [('RelationsStep',
+                       [('OneFetchStep', [('Any 999998,999999 WHERE A concerne 999999, A is Affaire',
+                                           [{'A': 'Affaire'}])],
+                         None, None, [self.system], {}, [])]
+                       )]
+                     )],
+                   {'n': 999999, 's': 999998})
+    
+    def test_delete_relation1(self):
+        ueid = self.session.user.eid
+        self._test('DELETE X created_by Y WHERE X eid %(x)s, NOT Y eid %(y)s',
+                   [('DeleteRelationsStep', [
+                       ('OneFetchStep', [('Any 5,Y WHERE %s created_by Y, NOT Y eid %s, Y is EUser'%(ueid, ueid),
+                                          [{'Y': 'EUser'}])],
+                        None, None, [self.system], {}, []),
+                       ]),
+                    ],
+                   {'x': ueid, 'y': ueid})
+        
+    def test_delete_relation2(self):
+        ueid = self.session.user.eid
+        self._test('DELETE X created_by Y WHERE X eid %(x)s, NOT Y login "syt"',
+                   [('FetchStep', [('Any Y WHERE NOT Y login "syt", Y is EUser', [{'Y': 'EUser'}])],
+                     [self.ldap, self.system], None, {'Y': 'table0.C0'}, []),
+                    ('DeleteRelationsStep', [
+                        ('OneFetchStep', [('Any %s,Y WHERE %s created_by Y, Y is EUser'%(ueid,ueid), [{'Y': 'EUser'}])],
+                         None, None, [self.system], {'Y': 'table0.C0'}, []),
+                        ]),
+                    ],
+                   {'x': ueid, 'y': ueid})
+        
+    def test_update(self):
+        self._test('SET X copain Y WHERE X login "comme", Y login "cochon"',
+                   [('FetchStep',
+                     [('Any X WHERE X login "comme", X is EUser', [{'X': 'EUser'}])],
+                     [self.ldap, self.system], None, {'X': 'table0.C0'}, []),
+                    ('FetchStep',
+                     [('Any Y WHERE Y login "cochon", Y is EUser', [{'Y': 'EUser'}])],
+                     [self.ldap, self.system], None, {'Y': 'table1.C0'}, []),
+                    ('UpdateStep',
+                     [('OneFetchStep',
+                       [('DISTINCT Any X,Y WHERE X is EUser, Y is EUser',
+                         [{'X': 'EUser', 'Y': 'EUser'}])],
+                       None, None, [self.system], {'X': 'table0.C0', 'Y': 'table1.C0'}, [])
+                      ])
+                    ])
+
+    def test_update2(self):
+        self._test('SET U in_group G WHERE G name ~= "bougloup%", U login "admin"',
+                   [('FetchStep', [('Any U WHERE U login "admin", U is EUser', [{'U': 'EUser'}])],
+                     [self.ldap, self.system], None, {'U': 'table0.C0'}, []),
+                     ('UpdateStep', [
+                        ('OneFetchStep', [('DISTINCT Any U,G WHERE G name ILIKE "bougloup%", G is EGroup, U is EUser',
+                                           [{'U': 'EUser', 'G': 'EGroup'}])],
+                         None, None, [self.system], {'U': 'table0.C0'}, []),
+                        ]),
+                    ])
+
+    def test_update3(self):
+        anoneid = self._user_session()[1].user.eid
+        # since we are adding a in_state relation for an entity in the system
+        # source, states should only be searched in the system source as well
+        self._test('SET X in_state S WHERE X eid %(x)s, S name "deactivated"',
+                   [('UpdateStep', [
+                       ('OneFetchStep', [('DISTINCT Any 5,S WHERE S name "deactivated", S is State',
+                                          [{'S': 'State'}])],
+                        None, None, [self.system], {}, []),
+                       ]),
+                    ],
+                   {'x': anoneid})
+
+#     def test_update4(self):
+#         # since we are adding a in_state relation with a state from the system
+#         # source, EUser should only be searched only in the system source as well
+#         rset = self.execute('State X WHERE X name "activated"')
+#         assert len(rset) == 1, rset
+#         activatedeid = rset[0][0]
+#         self._test('SET X in_state S WHERE X is EUser, S eid %s' % activatedeid,
+#                    [('UpdateStep', [
+#                        ('OneFetchStep', [('DISTINCT Any X,%s WHERE X is EUser' % activatedeid,
+#                                           [{'X': 'EUser'}])],
+#                         None, None, [self.system], {}, []),
+#                        ]),
+#                     ])
+        
+    # non regression tests ####################################################
+    
+    def test_nonregr1(self):
+        self._test('Any X, Y WHERE X copain Y, X login "syt", Y login "cochon"',
+                   [('FetchStep',
+                     [('Any X WHERE X login "syt", X is EUser', [{'X': 'EUser'}])],
+                     [self.ldap, self.system], None, {'X': 'table0.C0'}, []),
+                    ('FetchStep',
+                     [('Any Y WHERE Y login "cochon", Y is EUser', [{'Y': 'EUser'}])],
+                     [self.ldap, self.system], None, {'Y': 'table1.C0'}, []),
+                    ('OneFetchStep',
+                     [('Any X,Y WHERE X copain Y, X is EUser, Y is EUser',
+                       [{'X': 'EUser', 'Y': 'EUser'}])],
+                     None, None, [self.system], {'X': 'table0.C0', 'Y': 'table1.C0'}, [])
+                    ])
+    
+    def test_nonregr2(self):
+        treid = self.session.user.latest_trinfo().eid
+        self._test('Any X ORDERBY D DESC WHERE E eid %(x)s, E wf_info_for X, X modification_date D',
+                   [('FetchStep', [('Any X,D WHERE X modification_date D, X is Note',
+                                    [{'X': 'Note', 'D': 'Datetime'}])],
+                     [self.rql, self.system], None, {'X': 'table0.C0', 'X.modification_date': 'table0.C1', 'D': 'table0.C1'}, []),
+                    ('FetchStep', [('Any X,D WHERE X modification_date D, X is EUser',
+                                    [{'X': 'EUser', 'D': 'Datetime'}])],
+                     [self.ldap, self.system], None, {'X': 'table1.C0', 'X.modification_date': 'table1.C1', 'D': 'table1.C1'}, []),
+                    ('AggrStep', 'Any X ORDERBY D DESC', None, None, 'table2', None, [
+                        ('FetchStep', [('Any X,D WHERE E eid %s, E wf_info_for X, X modification_date D, E is TrInfo, X is Affaire'%treid,
+                                        [{'X': 'Affaire', 'E': 'TrInfo', 'D': 'Datetime'}])],
+                         [self.system],
+                         {},
+                         {'X': 'table2.C0', 'X.modification_date': 'table2.C1', 'D': 'table2.C1', 'E.wf_info_for': 'table2.C0'}, []),
+                        ('FetchStep', [('Any X,D WHERE E eid %s, E wf_info_for X, X modification_date D, E is TrInfo, X is EUser'%treid,
+                                        [{'X': 'EUser', 'E': 'TrInfo', 'D': 'Datetime'}])],
+                         [self.system],
+                         {'X': 'table1.C0', 'X.modification_date': 'table1.C1', 'D': 'table1.C1'},
+                         {'X': 'table2.C0', 'X.modification_date': 'table2.C1', 'D': 'table2.C1', 'E.wf_info_for': 'table2.C0'}, []),
+                        ('FetchStep', [('Any X,D WHERE E eid %s, E wf_info_for X, X modification_date D, E is TrInfo, X is Note'%treid,
+                                        [{'X': 'Note', 'E': 'TrInfo', 'D': 'Datetime'}])],
+                         [self.system],
+                         {'X': 'table0.C0', 'X.modification_date': 'table0.C1', 'D': 'table0.C1'},
+                         {'X': 'table2.C0', 'X.modification_date': 'table2.C1', 'D': 'table2.C1', 'E.wf_info_for': 'table2.C0'}, []),
+                        ]),
+                    ],
+                   {'x': treid})
+        
+    def test_nonregr3(self):
+        # original jpl query:
+        # Any X, NOW - CD, P WHERE P is Project, U interested_in P, U is EUser, U login "sthenault", X concerns P, X creation_date CD ORDERBY CD DESC LIMIT 5
+        self._test('Any X, NOW - CD, P ORDERBY CD DESC LIMIT 5 WHERE P bookmarked_by U, U login "admin", P is X, X creation_date CD',
+                   [('FetchStep', [('Any U WHERE U login "admin", U is EUser', [{'U': 'EUser'}])],
+                     [self.ldap, self.system], None, {'U': 'table0.C0'}, []),
+                    ('OneFetchStep', [('Any X,(NOW - CD),P ORDERBY CD DESC LIMIT 5 WHERE P bookmarked_by U, P is X, X creation_date CD, P is Bookmark, U is EUser, X is EEType',
+                                       [{'P': 'Bookmark', 'U': 'EUser', 'X': 'EEType', 'CD': 'Datetime'}])],
+                     5, None,  [self.system], {'U': 'table0.C0'}, [])]
+                   )
+        
+    def test_nonregr4(self):
+        self._test('Any U ORDERBY D DESC WHERE WF wf_info_for X, WF creation_date D, WF from_state FS, '
+                   'WF owned_by U?, X eid %(x)s',
+                   [#('FetchStep', [('Any U WHERE U is EUser', [{'U': 'EUser'}])],
+                    # [self.ldap, self.system], None, {'U': 'table0.C0'}, []),
+                    ('OneFetchStep', [('Any U ORDERBY D DESC WHERE WF wf_info_for 5, WF creation_date D, WF from_state FS, WF owned_by U?',
+                                       [{'WF': 'TrInfo', 'FS': 'State', 'U': 'EUser', 'D': 'Datetime'}])],
+                     None, None,
+                     [self.system], {}, [])],
+                   {'x': self.session.user.eid})
+
+    def test_nonregr5(self):
+        # original jpl query:
+        # DISTINCT Version V WHERE MB done_in MV, MV eid %(x)s, 
+        # MB depends_on B, B done_in V, V version_of P, NOT P eid %(p)s'
+        cardeid = self.execute('INSERT Card X: X title "hop"')[0][0]
+        noteeid = self.execute('INSERT Note X')[0][0]
+        self._test('DISTINCT Card V WHERE MB documented_by MV, MV eid %(x)s, '
+                   'MB depends_on B, B documented_by V, V multisource_rel P, NOT P eid %(p)s',
+                   [('FetchStep', [('Any V WHERE V multisource_rel P, NOT P eid %s, P is Note, V is Card'%noteeid,
+                                    [{'P': 'Note', 'V': 'Card'}])],
+                     [self.rql, self.system], None, {'V': 'table0.C0'}, []),
+                    ('OneFetchStep', [('DISTINCT Any V WHERE MB documented_by %s, MB depends_on B, B documented_by V, B is Affaire, MB is Affaire, V is Card'%cardeid,
+                                       [{'B': 'Affaire', 'MB': 'Affaire', 'V': 'Card'}])],
+                     None, None, [self.system], {'V': 'table0.C0'}, [])],
+                   {'x': cardeid, 'p': noteeid})
+
+    def test_nonregr6(self):
+        self._test('Any X WHERE X concerne Y',
+                   [('OneFetchStep', [('Any X WHERE X concerne Y',
+                                       [{'Y': 'Division', 'X': 'Affaire'},
+                                        {'Y': 'Note', 'X': 'Affaire'},
+                                        {'Y': 'Societe', 'X': 'Affaire'},
+                                        {'Y': 'SubDivision', 'X': 'Affaire'},
+                                        {'Y': 'Affaire', 'X': 'Personne'}])],
+                     None,  None, [self.system], {}, [])
+                    ])
+        self._test('Any X WHERE X concerne Y, Y is Note',
+                   [('FetchStep', [('Any Y WHERE Y is Note', [{'Y': 'Note'}])],
+                      [self.rql, self.system], None, {'Y': 'table0.C0'}, []),
+                    ('OneFetchStep', [('Any X WHERE X concerne Y, X is Affaire, Y is Note',
+                                       [{'X': 'Affaire', 'Y': 'Note'}])],
+                     None, None, [self.system], {'Y': 'table0.C0'}, [])
+                    ])
+
+    def test_nonregr7(self):
+        repo._type_source_cache[999999] = ('Note', 'cards', 999999)
+        self._test('Any S,SUM(DUR),SUM(I),(SUM(I) - SUM(DUR)),MIN(DI),MAX(DI) GROUPBY S ORDERBY S WHERE A is Affaire, A duration DUR, A invoiced I, A modification_date DI, A in_state S, S name SN, (EXISTS(A concerne WP, W multisource_rel WP)) OR (EXISTS(A concerne W)), W eid %(n)s',
+                   [('FetchStep', [('Any WP WHERE 999999 multisource_rel WP, WP is Note', [{'WP': 'Note'}])],
+                     [self.rql], None, {'WP': u'table0.C0'}, []),
+                    ('OneFetchStep', [('Any S,SUM(DUR),SUM(I),(SUM(I) - SUM(DUR)),MIN(DI),MAX(DI) GROUPBY S ORDERBY S WHERE A duration DUR, A invoiced I, A modification_date DI, A in_state S, S name SN, (EXISTS(A concerne WP, WP is Note)) OR (EXISTS(A concerne 999999)), A is Affaire, S is State',
+                                       [{'A': 'Affaire', 'DI': 'Datetime', 'DUR': 'Int', 'I': 'Int', 'S': 'State', 'SN': 'String', 'WP': 'Note'}])],
+                     None, None, [self.system], {'WP': u'table0.C0'}, [])],
+                   {'n': 999999})
+
+    def test_nonregr8(self):
+        repo._type_source_cache[999999] = ('Note', 'cards', 999999)
+        self._test('Any X,Z WHERE X eid %(x)s, X multisource_rel Y, Z concerne X',
+                   [('FetchStep', [('Any  WHERE 999999 multisource_rel Y, Y is Note', [{'Y': 'Note'}])],
+                     [self.rql], None, {}, []),
+                    ('OneFetchStep', [('Any 999999,Z WHERE Z concerne 999999, Z is Affaire',
+                                       [{'Z': 'Affaire'}])],
+                     None, None, [self.system], {}, [])],
+                   {'x': 999999})
+        
+    def test_nonregr9(self):
+        repo._type_source_cache[999999] = ('Note', 'cards', 999999)
+        repo._type_source_cache[999998] = ('Note', 'cards', 999998)
+        self._test('SET X migrated_from Y WHERE X eid %(x)s, Y multisource_rel Z, Z eid %(z)s, Y migrated_from Z',
+                   [('FetchStep', [('Any Y WHERE Y multisource_rel 999998, Y is Note', [{'Y': 'Note'}])],
+                     [self.rql], None, {'Y': u'table0.C0'}, []),
+                    ('UpdateStep',
+                     [('OneFetchStep', [('DISTINCT Any 999999,Y WHERE Y migrated_from 999998, Y is Note',
+                                         [{'Y': 'Note'}])],
+                       None, None, [self.system],
+                       {'Y': u'table0.C0'}, [])])],
+                   {'x': 999999, 'z': 999998})
+
+    def test_nonregr10(self):
+        repo._type_source_cache[999999] = ('EUser', 'ldapuser', 999999)
+        self._test('Any X,AA,AB ORDERBY AA WHERE E eid %(x)s, E owned_by X, X login AA, X modification_date AB',
+                   [('FetchStep',
+                     [('Any X,AA,AB WHERE X login AA, X modification_date AB, X is EUser',
+                       [{'AA': 'String', 'AB': 'Datetime', 'X': 'EUser'}])],
+                     [self.ldap], None, {'AA': 'table0.C1', 'AB': 'table0.C2',
+                                         'X': 'table0.C0', 'X.login': 'table0.C1', 'X.modification_date': 'table0.C2'},
+                     []),
+                    ('OneFetchStep',
+                     [('Any X,AA,AB ORDERBY AA WHERE 999999 owned_by X, X login AA, X modification_date AB, X is EUser',
+                       [{'AA': 'String', 'AB': 'Datetime', 'X': 'EUser'}])],
+                     None, None, [self.system], {'AA': 'table0.C1', 'AB': 'table0.C2',
+                                                 'X': 'table0.C0', 'X.login': 'table0.C1', 'X.modification_date': 'table0.C2'},
+                     [])
+                    ],
+                   {'x': 999999})
+        
+    def test_nonregr11(self):
+        repo._type_source_cache[999999] = ('Bookmark', 'system', 999999)
+        self._test('SET X bookmarked_by Y WHERE X eid %(x)s, Y login "hop"',
+                   [('FetchStep',
+                     [('Any Y WHERE Y login "hop", Y is EUser', [{'Y': 'EUser'}])],
+                     [self.ldap, self.system],
+                     None, {'Y': 'table0.C0'}, []),
+                    ('UpdateStep',
+                     [('OneFetchStep', [('DISTINCT Any 999999,Y WHERE Y is EUser', [{'Y': 'EUser'}])],
+                       None, None, [self.system], {'Y': 'table0.C0'},
+                       [])]
+                     )],
+                   {'x': 999999})
+        
+    def test_nonregr12(self):
+        repo._type_source_cache[999999] = ('Note', 'cards', 999999)
+        self._test('Any X ORDERBY Z DESC WHERE X modification_date Z, E eid %(x)s, E see_also X',
+                   [('FetchStep', [('Any X,Z WHERE X modification_date Z, X is Note',
+                                    [{'X': 'Note', 'Z': 'Datetime'}])],
+                     [self.rql], None, {'X': 'table0.C0', 'X.modification_date': 'table0.C1', 'Z': 'table0.C1'},
+                     []),
+                    ('AggrStep', 'Any X ORDERBY Z DESC',
+                     None, None, 'table1', None,
+                     [('FetchStep', [('Any X,Z WHERE X modification_date Z, 999999 see_also X, X is Bookmark',
+                                      [{'X': 'Bookmark', 'Z': 'Datetime'}])],
+                       [self.system], {},   {'X': 'table1.C0', 'X.modification_date': 'table1.C1',
+                                             'Z': 'table1.C1'},
+                       []),
+                      ('FetchStep', [('Any X,Z WHERE X modification_date Z, 999999 see_also X, X is Note',
+                                      [{'X': 'Note', 'Z': 'Datetime'}])],
+                       [self.system], {'X': 'table0.C0', 'X.modification_date': 'table0.C1',
+                                       'Z': 'table0.C1'},
+                       {'X': 'table1.C0', 'X.modification_date': 'table1.C1',
+                        'Z': 'table1.C1'},
+                       [])]
+                      )],
+                   {'x': 999999})
+
+
+class MSPlannerTwoSameExternalSourcesTC(BasePlannerTC):
+    """test planner related feature on a 3-sources repository:
+    
+    * 2 rql source supporting Card
+    """
+    repo = repo
+    
+    def setUp(self):
+        #_QuerierTC.setUp(self)
+        self.o = repo.querier
+        self.session = repo._sessions.values()[0]
+        self.pool = self.session.set_pool()
+        self.schema = self.o.schema
+        self.sources = self.o._repo.sources
+        self.system = self.sources[-1]
+        self.sources.append(FakeCardSource(self.o._repo, self.o.schema,
+                                           {'uri': 'cards'}))
+        repo.sources_by_uri['cards'] = self.sources[-1]
+        self.rql = self.sources[-1]
+        self.sources.append(FakeCardSource(self.o._repo, self.o.schema,
+                                           {'uri': 'cards2'}))
+        repo.sources_by_uri['cards2'] = self.sources[-1]
+        self.rql2 = self.sources[-1]
+        do_monkey_patch()
+        self.planner = MSPlanner(self.o.schema, self.o._rqlhelper)
+
+    _test = test_plan
+        
+    def tearDown(self):
+        undo_monkey_patch()
+        del self.sources[-1]
+        del self.sources[-1]
+        del repo.sources_by_uri['cards']
+        del repo.sources_by_uri['cards2']
+
+    def test_linked_external_entities(self):
+        repo._type_source_cache[999999] = ('Tag', 'system', 999999)
+        self._test('Any X,XT WHERE X is Card, X title XT, T tags X, T eid %(t)s',
+                   [('FetchStep',
+                     [('Any X,XT WHERE X title XT, X is Card', [{'X': 'Card', 'XT': 'String'}])],
+                     [self.rql, self.rql2, self.system],
+                     None, {'X': 'table0.C0', 'X.title': 'table0.C1', 'XT': 'table0.C1'},
+                     []),
+                    ('OneFetchStep',
+                     [('Any X,XT WHERE X title XT, 999999 tags X, X is Card',
+                       [{'X': 'Card', 'XT': 'String'}])],
+                     None, None, [self.system],
+                     {'X': 'table0.C0', 'X.title': 'table0.C1', 'XT': 'table0.C1'},
+                     [])],
+                   {'t': 999999})
+ 
+if __name__ == '__main__':
+    from logilab.common.testlib import unittest_main
+    unittest_main()