cubicweb: comparison server/test/unittest

equal deleted inserted replaced

-:6cbc7bc8ea6d
+:5fe84a5f7035
 from cubicweb.server.sources import AbstractSource
 from cubicweb.server.msplanner import MSPlanner, PartPlanInformation
 class FakeUserROSource(AbstractSource):
 uri = 'zzz'
-support_entities = {'EUser': False}
+support_entities = {'CWUser': False}
 support_relations = {}
 def syntax_tree_search(self, *args, **kwargs):
 return []
 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': 'CWCache'}, {'X': 'CWConstraint'}, {'X': 'CWConstraintType'},
-{'X': 'EEType'}, {'X': 'EFRDef'}, {'X': 'EGroup'},
+{'X': 'CWEType'}, {'X': 'CWAttribute'}, {'X': 'CWGroup'},
-{'X': 'ENFRDef'}, {'X': 'EPermission'}, {'X': 'EProperty'},
+{'X': 'CWRelation'}, {'X': 'CWPermission'}, {'X': 'CWProperty'},
-{'X': 'ERType'}, {'X': 'EUser'}, {'X': 'Email'},
+{'X': 'CWRType'}, {'X': 'CWUser'}, {'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'}])
 class BaseMSPlannerTC(BasePlannerTC):
 """test planner related feature on a 3-sources repository:
 * system source supporting everything
-* ldap source supporting EUser
+* ldap source supporting CWUser
 * rql source supporting Card
 """
 repo = repo
 def setUp(self):
 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
+# hijack CWUser security
-userreadperms = list(self.schema['EUser']._groups['read'])
+userreadperms = list(self.schema['CWUser']._groups['read'])
 self.prevrqlexpr_user = userreadperms[-1]
 userreadperms[-1] = ERQLExpression('X owned_by U')
-self.schema['EUser']._groups['read'] = tuple(userreadperms)
+self.schema['CWUser']._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'}))
 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 = list(self.schema['CWUser']._groups['read'])
 userreadperms[-1] = self.prevrqlexpr_user
-self.schema['EUser']._groups['read'] = tuple(userreadperms)
+self.schema['CWUser']._groups['read'] = tuple(userreadperms)
-clear_cache(self.schema['EUser'], 'ERSchema_get_rqlexprs')
+clear_cache(self.schema['CWUser'], 'ERSchema_get_rqlexprs')
 class PartPlanInformationTC(BaseMSPlannerTC):
 def _test(self, rql, *args):
 self.assertEquals(ppi.needsplit, needsplit)
 def test_simple_system_only(self):
 """retrieve entities only supported by the system source"""
-self._test('EGroup X',
+self._test('CWGroup X',
 {self.system: {'X': s[0]}}, False)
 def test_simple_system_ldap(self):
-"""retrieve EUser X from both sources and return concatenation of results
+"""retrieve CWUser X from both sources and return concatenation of results
 """
-self._test('EUser X',
+self._test('CWUser 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)
+"""retrieve CWUser 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)
+"""retrieve CWUser 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},
 {self.system: {'x': s[0]}}, False)
 def test_simple_invariant(self):
-"""retrieve EUser X from system source only (X is invariant and in_group not supported by ldap source)
+"""retrieve CWUser 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._test('Any X WHERE X is CWUser, 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)
+"""retrieve CWUser 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
+# specify CWUser 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._test('CWUser 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
+1. retrieve Any X, L WHERE X is CWUser, 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._test('Any X,L WHERE X is CWUser, 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):
 """
 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
+"""retrieve CWUser 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)
 _test = test_plan
 def test_simple_system_only(self):
 """retrieve entities only supported by the system source
 """
-self._test('EGroup X',
+self._test('CWGroup X',
-[('OneFetchStep', [('Any X WHERE X is EGroup', [{'X': 'EGroup'}])],
+[('OneFetchStep', [('Any X WHERE X is CWGroup', [{'X': 'CWGroup'}])],
 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',
+self._test('CWGroup X LIMIT 10',
-[('OneFetchStep', [('Any X LIMIT 10 WHERE X is EGroup', [{'X': 'EGroup'}])],
+[('OneFetchStep', [('Any X LIMIT 10 WHERE X is CWGroup', [{'X': 'CWGroup'}])],
 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',
+self._test('CWGroup X LIMIT 10 OFFSET 10',
-[('OneFetchStep', [('Any X LIMIT 10 OFFSET 10 WHERE X is EGroup', [{'X': 'EGroup'}])],
+[('OneFetchStep', [('Any X LIMIT 10 OFFSET 10 WHERE X is CWGroup', [{'X': 'CWGroup'}])],
 10, 10, [self.system], {}, [])])
 def test_simple_system_ldap(self):
-"""retrieve EUser X from both sources and return concatenation of results
+"""retrieve CWUser X from both sources and return concatenation of results
 """
-self._test('EUser X',
+self._test('CWUser X',
-[('OneFetchStep', [('Any X WHERE X is EUser', [{'X': 'EUser'}])],
+[('OneFetchStep', [('Any X WHERE X is CWUser', [{'X': 'CWUser'}])],
 None, None, [self.ldap, self.system], {}, [])])
 def test_simple_system_ldap_limit(self):
-"""retrieve EUser X from both sources and return concatenation of results
+"""retrieve CWUser X from both sources and return concatenation of results
 """
-self._test('EUser X LIMIT 10',
+self._test('CWUser X LIMIT 10',
-[('OneFetchStep', [('Any X LIMIT 10 WHERE X is EUser', [{'X': 'EUser'}])],
+[('OneFetchStep', [('Any X LIMIT 10 WHERE X is CWUser', [{'X': 'CWUser'}])],
 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
+"""retrieve CWUser X from both sources and return concatenation of results
 """
-self._test('EUser X LIMIT 10 OFFSET 10',
+self._test('CWUser X LIMIT 10 OFFSET 10',
-[('OneFetchStep', [('Any X LIMIT 10 OFFSET 10 WHERE X is EUser', [{'X': 'EUser'}])],
+[('OneFetchStep', [('Any X LIMIT 10 OFFSET 10 WHERE X is CWUser', [{'X': 'CWUser'}])],
 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
+"""retrieve CWUser X from both sources and return concatenation of results
 """
-self._test('EUser X ORDERBY X LIMIT 10 OFFSET 10',
+self._test('CWUser 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'}])],
+('FetchStep', [('Any X WHERE X is CWUser', [{'X': 'CWUser'}])],
 [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
+"""retrieve CWUser 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',
+self._test('Any COUNT(X) WHERE X is CWUser',
 [('AggrStep', 'Any COUNT(X)', None, None, 'table0', None, [
-('FetchStep', [('Any COUNT(X) WHERE X is EUser', [{'X': 'EUser'}])],
+('FetchStep', [('Any COUNT(X) WHERE X is CWUser', [{'X': 'CWUser'}])],
 [self.ldap, self.system], {}, {'COUNT(X)': 'table0.C0'}, []),
 ]),
 ])
 def test_simple_system_rql(self):
 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)
+"""retrieve CWUser 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'}])],
+[('OneFetchStep', [('Any X,L WHERE X eid %s, X login L'%ueid, [{'X': 'CWUser', '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)
+"""retrieve CWUser 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)
+"""retrieve CWUser 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._test('Any X WHERE X is CWUser, X in_group G, G name "users"',
-[('OneFetchStep', [('Any X WHERE X is EUser, X in_group G, G name "users"',
+[('OneFetchStep', [('Any X WHERE X is CWUser, X in_group G, G name "users"',
-[{'X': 'EUser', 'G': 'EGroup'}])],
+[{'X': 'CWUser', 'G': 'CWGroup'}])],
 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
+1. retrieve Any X, L WHERE X is CWUser, 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"',
+self._test('Any X,L WHERE X is CWUser, 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'}])],
+[('FetchStep', [('Any X,L WHERE X login L, X is CWUser', [{'X': 'CWUser', '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',
+('OneFetchStep', [('Any X,L WHERE X in_group G, X login L, G name "users", G is CWGroup, X is CWUser',
-[{'X': 'EUser', 'L': 'String', 'G': 'EGroup'}])],
+[{'X': 'CWUser', 'L': 'String', 'G': 'CWGroup'}])],
 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
+1. retrieve Any X, L WHERE X is CWUser, 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"',
+self._test('Any X,L LIMIT 10 OFFSET 10 WHERE X is CWUser, 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'}])],
+[('FetchStep', [('Any X,L WHERE X login L, X is CWUser', [{'X': 'CWUser', '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',
+('OneFetchStep', [('Any X,L LIMIT 10 OFFSET 10 WHERE X in_group G, X login L, G name "users", G is CWGroup, X is CWUser',
-[{'X': 'EUser', 'L': 'String', 'G': 'EGroup'}])],
+[{'X': 'CWUser', 'L': 'String', 'G': 'CWGroup'}])],
 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',
+[('FetchStep', [('Any L WHERE X login L, X is CWUser',
-[{'X': 'EUser', 'L': 'String'}])],
+[{'X': 'CWUser', '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',
+[('FetchStep', [('Any L WHERE X login L, X is CWUser',
-[{'X': 'EUser', 'L': 'String'}])],
+[{'X': 'CWUser', 'L': 'String'}])],
 [self.ldap, self.system], {}, {'X.login': 'table0.C0', 'L': 'table0.C0'}, []),
 ])
 ])
 def test_complex_invariant_ordered(self):
 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',
+[('Any X,AA WHERE X modification_date AA, X is CWUser',
-[{'AA': 'Datetime', 'X': 'EUser'}])],
+[{'AA': 'Datetime', 'X': 'CWUser'}])],
 [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',
+[('Any X,AA ORDERBY AA WHERE 5 owned_by X, X modification_date AA, X is CWUser',
-[{'AA': 'Datetime', 'X': 'EUser'}])],
+[{'AA': 'Datetime', 'X': 'CWUser'}])],
 None, None, [self.system],
 {'AA': 'table0.C1', 'X': 'table0.C0', 'X.modification_date': 'table0.C1'}, []),
 ],
 {'x': ueid})
 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',
+[('FetchStep', [('Any X,L,AA WHERE X login L, X modification_date AA, X is CWUser',
-[{'AA': 'Datetime', 'X': 'EUser', 'L': 'String'}])],
+[{'AA': 'Datetime', 'X': 'CWUser', '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,
+('OneFetchStep', [('Any X,L,AA WHERE %s owned_by X, X login L, X modification_date AA, X is CWUser'%ueid,
-[{'AA': 'Datetime', 'X': 'EUser', 'L': 'String'}])],
+[{'AA': 'Datetime', 'X': 'CWUser', '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
+"""retrieve CWUser 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',
+('OneFetchStep', [('Any X,F WHERE X firstname F, X is CWUser',
-[{'X': 'EUser', 'F': 'String'}])],
+[{'X': 'CWUser', '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
+"""retrieve CWUser 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',
+('OneFetchStep', [('Any X,F WHERE X firstname F, X is CWUser',
-[{'X': 'EUser', 'F': 'String'}])],
+[{'X': 'CWUser', '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
+1. retrieve CWUser 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',
+[('FetchStep', [('Any X,F WHERE X firstname F, X is CWUser',
-[{'X': 'EUser', 'F': 'String'}])],
+[{'X': 'CWUser', '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], {},
 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'}])],
+[('Any X WHERE X login "syt", X is CWUser', [{'X': 'CWUser'}])],
 [self.ldap, self.system], None,
 {'X': 'table0.C0'}, []),
 ('FetchStep',
-[('Any Y WHERE Y login "adim", Y is EUser', [{'Y': 'EUser'}])],
+[('Any Y WHERE Y login "adim", Y is CWUser', [{'Y': 'CWUser'}])],
 [self.ldap, self.system], None,
 {'Y': 'table1.C0'}, []),
 ('OneFetchStep',
-[('Any X,Y WHERE X is EUser, Y is EUser', [{'X': 'EUser', 'Y': 'EUser'}])],
+[('Any X,Y WHERE X is CWUser, Y is CWUser', [{'X': 'CWUser', 'Y': 'CWUser'}])],
 None, None, [self.system],
 {'X': 'table0.C0', 'Y': 'table1.C0'}, [])
 ], {'x': ueid})
 def test_complex_multiple_limit_offset(self):
 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'}])],
+[('Any X WHERE X login "syt", X is CWUser', [{'X': 'CWUser'}])],
 [self.ldap, self.system], None, {'X': 'table0.C0'}, []),
 ('FetchStep',
-[('Any Y WHERE Y login "adim", Y is EUser', [{'Y': 'EUser'}])],
+[('Any Y WHERE Y login "adim", Y is CWUser', [{'Y': 'CWUser'}])],
 [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'}])],
+[('Any X,Y LIMIT 10 OFFSET 10 WHERE X is CWUser, Y is CWUser', [{'X': 'CWUser', 'Y': 'CWUser'}])],
 10, 10, [self.system],
 {'X': 'table0.C0', 'Y': 'table1.C0'}, [])
 ], {'x': ueid})
 def test_complex_aggregat(self):
 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'}])],
+[{'WF': 'TrInfo', 'FS': 'State', 'U': 'CWUser'}])],
 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'}])],
+[{'WF': 'TrInfo', 'FS': 'State', 'U': 'CWUser'}])],
 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'}])],
+('FetchStep', [('Any U WHERE U login "syt", U is CWUser', [{'U': 'CWUser'}])],
 [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)',
+('OneFetchStep', [('Any X,T WHERE X owned_by U, X title T, U is CWUser, X is IN(Bookmark, EmailThread)',
-[{'T': 'String', 'U': 'EUser', 'X': 'Bookmark'},
+[{'T': 'String', 'U': 'CWUser', 'X': 'Bookmark'},
-{'T': 'String', 'U': 'EUser', 'X': 'EmailThread'}])],
+{'T': 'String', 'U': 'CWUser', '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',
+('OneFetchStep', [('Any X,T WHERE X owned_by U, X title T, U is CWUser, X is Card',
-[{'X': 'Card', 'U': 'EUser', 'T': 'String'}])],
+[{'X': 'Card', 'U': 'CWUser', 'T': 'String'}])],
 None, None, [self.system],
 {'X': 'table0.C0', 'X.title': 'table0.C1', 'T': 'table0.C1', 'U': 'table1.C0'}, []),
 ]),
 ])
 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'}])],
+[('Any X WHERE NOT X identity 5, X is CWUser', [{'X': 'CWUser'}])],
 None, None,
 [self.ldap, self.system], {}, [])
 ])
 def test_outer_supported_rel2(self):
 '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'}])],
+('FetchStep', [('Any X,R WHERE X login R, X is CWUser', [{'X': 'CWUser', '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',
+('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 CWUser',
-[{'Y': 'Note', 'X': 'EUser', 'S': 'State', 'R': 'String', 'A': 'State'}])],
+[{'Y': 'Note', 'X': 'CWUser', '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):
 [{'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',
+('Any X WHERE X has_text "bla", EXISTS(X owned_by 5), X is CWUser',
-[{'X': 'EUser'}]),
+[{'X': 'CWUser'}]),
 ('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'},
 [{'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',
+('Any X WHERE X has_text "bla", EXISTS(X owned_by 5), X is CWUser',
-[{'X': 'EUser'}]),
+[{'X': 'CWUser'}]),
 ('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'},
 [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': 'Comment'}, {'X': 'Division'}, {'X': 'CWUser'},
 {'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'}, [])
 """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'}])],
+[('Any X WHERE X login "bla", X is CWUser', [{'X': 'CWUser'}])],
 [self.ldap, self.system], None, {'X': 'table0.C0'}, []),
 ('OneFetchStep',
-[('Any X WHERE EXISTS(X owned_by 5), X is EUser', [{'X': 'EUser'}])],
+[('Any X WHERE EXISTS(X owned_by 5), X is CWUser', [{'X': 'CWUser'}])],
 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'}])],
+[('FetchStep', [('Any X WHERE X firstname "bla", X is CWUser', [{'X': 'CWUser'}])],
 [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'}])],
+('OneFetchStep', [('Any X WHERE X has_text "bla", EXISTS(X owned_by 5), X is CWUser', [{'X': 'CWUser'}])],
 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'}])],
+[('FetchStep', [('Any X WHERE X firstname "bla", X is CWUser', [{'X': 'CWUser'}])],
 [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'}])],
+('FetchStep', [('Any X WHERE X has_text "bla", EXISTS(X owned_by 5), X is CWUser', [{'X': 'CWUser'}])],
 [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'}])],
+[('Any X LIMIT 10 OFFSET 10', [{'X': 'CWUser'}, {'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'}])],
+('FetchStep', [('Any X WHERE X is CWUser', [{'X': 'CWUser'}])],
 [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)',
+[('Any X WHERE X is IN(Bookmark, Comment, Division, CWCache, CWConstraint, CWConstraintType, CWEType, CWAttribute, CWGroup, CWRelation, CWPermission, CWProperty, CWRType, 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': 'CWCache'}, {'X': 'CWConstraint'}, {'X': 'CWConstraintType'},
-{'X': 'EEType'}, {'X': 'EFRDef'}, {'X': 'EGroup'},
+{'X': 'CWEType'}, {'X': 'CWAttribute'}, {'X': 'CWGroup'},
-{'X': 'ENFRDef'}, {'X': 'EPermission'}, {'X': 'EProperty'},
+{'X': 'CWRelation'}, {'X': 'CWPermission'}, {'X': 'CWProperty'},
-{'X': 'ERType'}, {'X': 'Email'}, {'X': 'EmailAddress'},
+{'X': 'CWRType'}, {'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'}])],
+('FetchStep', [('Any X WHERE EXISTS(X owned_by 5), X is CWUser', [{'X': 'CWUser'}])],
 [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'}, []),
 ]),
 [('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'}])],
+('FetchStep', [('Any X WHERE X is CWUser', [{'X': 'CWUser'}])],
 [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',
+[('FetchStep', [('Any ET,X WHERE X is ET, EXISTS(X owned_by 5), ET is CWEType, X is Basket',
-[{'ET': 'EEType', 'X': 'Basket'}])],
+[{'ET': 'CWEType', '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',
+('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 CWEType, X is Affaire',
 [{'C': 'Division', 'E': 'Note', 'D': 'Affaire',
 'G': 'SubDivision', 'F': 'Societe', 'I': 'Affaire',
 'H': 'Affaire', 'J': 'Affaire', 'X': 'Affaire',
-'ET': 'EEType'}])],
+'ET': 'CWEType'}])],
 [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',
+('FetchStep', [('Any ET,X WHERE X is ET, EXISTS(X owned_by 5), ET is CWEType, X is CWUser',
-[{'ET': 'EEType', 'X': 'EUser'}])],
+[{'ET': 'CWEType', 'X': 'CWUser'}])],
 [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)',
+[('FetchStep', [('Any ET,X WHERE X is ET, ET is CWEType, X is IN(Bookmark, Comment, Division, CWCache, CWConstraint, CWConstraintType, CWEType, CWAttribute, CWGroup, CWRelation, CWPermission, CWProperty, CWRType, Email, EmailAddress, EmailPart, EmailThread, File, Folder, Image, Personne, RQLExpression, Societe, SubDivision, Tag, TrInfo, Transition)',
-[{'X': 'Bookmark', 'ET': 'EEType'}, {'X': 'Comment', 'ET': 'EEType'},
+[{'X': 'Bookmark', 'ET': 'CWEType'}, {'X': 'Comment', 'ET': 'CWEType'},
-{'X': 'Division', 'ET': 'EEType'}, {'X': 'ECache', 'ET': 'EEType'},
+{'X': 'Division', 'ET': 'CWEType'}, {'X': 'CWCache', 'ET': 'CWEType'},
-{'X': 'EConstraint', 'ET': 'EEType'}, {'X': 'EConstraintType', 'ET': 'EEType'},
+{'X': 'CWConstraint', 'ET': 'CWEType'}, {'X': 'CWConstraintType', 'ET': 'CWEType'},
-{'X': 'EEType', 'ET': 'EEType'}, {'X': 'EFRDef', 'ET': 'EEType'},
+{'X': 'CWEType', 'ET': 'CWEType'}, {'X': 'CWAttribute', 'ET': 'CWEType'},
-{'X': 'EGroup', 'ET': 'EEType'}, {'X': 'ENFRDef', 'ET': 'EEType'},
+{'X': 'CWGroup', 'ET': 'CWEType'}, {'X': 'CWRelation', 'ET': 'CWEType'},
-{'X': 'EPermission', 'ET': 'EEType'}, {'X': 'EProperty', 'ET': 'EEType'},
+{'X': 'CWPermission', 'ET': 'CWEType'}, {'X': 'CWProperty', 'ET': 'CWEType'},
-{'X': 'ERType', 'ET': 'EEType'}, {'X': 'Email', 'ET': 'EEType'},
+{'X': 'CWRType', 'ET': 'CWEType'}, {'X': 'Email', 'ET': 'CWEType'},
-{'X': 'EmailAddress', 'ET': 'EEType'}, {'X': 'EmailPart', 'ET': 'EEType'},
+{'X': 'EmailAddress', 'ET': 'CWEType'}, {'X': 'EmailPart', 'ET': 'CWEType'},
-{'X': 'EmailThread', 'ET': 'EEType'}, {'X': 'File', 'ET': 'EEType'},
+{'X': 'EmailThread', 'ET': 'CWEType'}, {'X': 'File', 'ET': 'CWEType'},
-{'X': 'Folder', 'ET': 'EEType'}, {'X': 'Image', 'ET': 'EEType'},
+{'X': 'Folder', 'ET': 'CWEType'}, {'X': 'Image', 'ET': 'CWEType'},
-{'X': 'Personne', 'ET': 'EEType'}, {'X': 'RQLExpression', 'ET': 'EEType'},
+{'X': 'Personne', 'ET': 'CWEType'}, {'X': 'RQLExpression', 'ET': 'CWEType'},
-{'X': 'Societe', 'ET': 'EEType'}, {'X': 'SubDivision', 'ET': 'EEType'},
+{'X': 'Societe', 'ET': 'CWEType'}, {'X': 'SubDivision', 'ET': 'CWEType'},
-{'X': 'Tag', 'ET': 'EEType'}, {'X': 'TrInfo', 'ET': 'EEType'},
+{'X': 'Tag', 'ET': 'CWEType'}, {'X': 'TrInfo', 'ET': 'CWEType'},
-{'X': 'Transition', 'ET': 'EEType'}])],
+{'X': 'Transition', 'ET': 'CWEType'}])],
 [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)',
+[('Any ET,X WHERE X is ET, ET is CWEType, X is IN(Card, Note, State)',
-[{'ET': 'EEType', 'X': 'Card'},
+[{'ET': 'CWEType', 'X': 'Card'},
-{'ET': 'EEType', 'X': 'Note'},
+{'ET': 'CWEType', 'X': 'Note'},
-{'ET': 'EEType', 'X': 'State'}])],
+{'ET': 'CWEType', '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'},
+sorted([{'ET': 'CWEType', 'X': 'Affaire'}, {'ET': 'CWEType', 'X': 'Basket'},
-{'ET': 'EEType', 'X': 'Bookmark'}, {'ET': 'EEType', 'X': 'Card'},
+{'ET': 'CWEType', 'X': 'Bookmark'}, {'ET': 'CWEType', 'X': 'Card'},
-{'ET': 'EEType', 'X': 'Comment'}, {'ET': 'EEType', 'X': 'Division'},
+{'ET': 'CWEType', 'X': 'Comment'}, {'ET': 'CWEType', 'X': 'Division'},
-{'ET': 'EEType', 'X': 'ECache'}, {'ET': 'EEType', 'X': 'EConstraint'},
+{'ET': 'CWEType', 'X': 'CWCache'}, {'ET': 'CWEType', 'X': 'CWConstraint'},
-{'ET': 'EEType', 'X': 'EConstraintType'}, {'ET': 'EEType', 'X': 'EEType'},
+{'ET': 'CWEType', 'X': 'CWConstraintType'}, {'ET': 'CWEType', 'X': 'CWEType'},
-{'ET': 'EEType', 'X': 'EFRDef'}, {'ET': 'EEType', 'X': 'EGroup'},
+{'ET': 'CWEType', 'X': 'CWAttribute'}, {'ET': 'CWEType', 'X': 'CWGroup'},
-{'ET': 'EEType', 'X': 'ENFRDef'}, {'ET': 'EEType', 'X': 'EPermission'},
+{'ET': 'CWEType', 'X': 'CWRelation'}, {'ET': 'CWEType', 'X': 'CWPermission'},
-{'ET': 'EEType', 'X': 'EProperty'}, {'ET': 'EEType', 'X': 'ERType'},
+{'ET': 'CWEType', 'X': 'CWProperty'}, {'ET': 'CWEType', 'X': 'CWRType'},
-{'ET': 'EEType', 'X': 'EUser'}, {'ET': 'EEType', 'X': 'Email'},
+{'ET': 'CWEType', 'X': 'CWUser'}, {'ET': 'CWEType', 'X': 'Email'},
-{'ET': 'EEType', 'X': 'EmailAddress'}, {'ET': 'EEType', 'X': 'EmailPart'},
+{'ET': 'CWEType', 'X': 'EmailAddress'}, {'ET': 'CWEType', 'X': 'EmailPart'},
-{'ET': 'EEType', 'X': 'EmailThread'}, {'ET': 'EEType', 'X': 'File'},
+{'ET': 'CWEType', 'X': 'EmailThread'}, {'ET': 'CWEType', 'X': 'File'},
-{'ET': 'EEType', 'X': 'Folder'}, {'ET': 'EEType', 'X': 'Image'},
+{'ET': 'CWEType', 'X': 'Folder'}, {'ET': 'CWEType', 'X': 'Image'},
-{'ET': 'EEType', 'X': 'Note'}, {'ET': 'EEType', 'X': 'Personne'},
+{'ET': 'CWEType', 'X': 'Note'}, {'ET': 'CWEType', 'X': 'Personne'},
-{'ET': 'EEType', 'X': 'RQLExpression'}, {'ET': 'EEType', 'X': 'Societe'},
+{'ET': 'CWEType', 'X': 'RQLExpression'}, {'ET': 'CWEType', 'X': 'Societe'},
-{'ET': 'EEType', 'X': 'State'}, {'ET': 'EEType', 'X': 'SubDivision'},
+{'ET': 'CWEType', 'X': 'State'}, {'ET': 'CWEType', 'X': 'SubDivision'},
-{'ET': 'EEType', 'X': 'Tag'}, {'ET': 'EEType', 'X': 'TrInfo'},
+{'ET': 'CWEType', 'X': 'Tag'}, {'ET': 'CWEType', 'X': 'TrInfo'},
-{'ET': 'EEType', 'X': 'Transition'}]))],
+{'ET': 'CWEType', 'X': 'Transition'}]))],
 None, None, [self.system], {'ET': 'table0.C0', 'X': 'table0.C1'}, [])
 ])
 def test_security_3sources(self):
 # use a guest user
 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'}])],
+[('Any U WHERE U login "syt", U is CWUser', [{'U': 'CWUser'}])],
 [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',
+[('Any X,XT WHERE X owned_by U, X title XT, EXISTS(U owned_by 5), U is CWUser, X is Card',
-[{'X': 'Card', 'U': 'EUser', 'XT': 'String'}])],
+[{'X': 'Card', 'U': 'CWUser', '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._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',
+[('Any X,XT WHERE X owned_by U, X title XT, U login "syt", EXISTS(U identity 5), U is CWUser, X is Card',
-[{'U': 'EUser', 'X': 'Card', 'XT': 'String'}])],
+[{'U': 'CWUser', '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',
+[('Any U,L WHERE U identity 5, U login L, U is CWUser',
-[{'L': 'String', u'U': 'EUser'}])],
+[{'L': 'String', u'U': 'CWUser'}])],
 [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',
 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'}])],
+[('Any U WHERE U login "syt", U is CWUser', [{'U': 'CWUser'}])],
 [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',
+[('Any X,XT LIMIT 10 OFFSET 10 WHERE X owned_by U, X title XT, EXISTS(U owned_by 5), U is CWUser, X is Card',
-[{'X': 'Card', 'U': 'EUser', 'XT': 'String'}])],
+[{'X': 'Card', 'U': 'CWUser', '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'}])],
+[('FetchStep', [('Any X,L WHERE X login L, X is CWUser', [{'X': 'CWUser', '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',
+'EXISTS(X in_group G, G name "bougloup", G is CWGroup), S is State, X is CWUser',
-[{'X': 'EUser', 'L': 'String', 'S': 'State', 'G': 'EGroup'}])],
+[{'X': 'CWUser', 'L': 'String', 'S': 'State', 'G': 'CWGroup'}])],
 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'}])],
+[('FetchStep', [('Any T WHERE T login IN("comme", "cochon"), T is CWUser', [{'T': 'CWUser'}])],
 [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',
+[('Any G WHERE X in_group G, G name "managers", EXISTS(X copain T, T is CWUser), G is CWGroup, X is CWUser',
-[{'X': 'EUser', 'T': 'EUser', 'G': 'EGroup'}])],
+[{'X': 'CWUser', 'T': 'CWUser', 'G': 'CWGroup'}])],
 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',
+[('Any T WHERE T login IN("comme", "cochon"), T is CWUser',
-[{'T': 'EUser'}])],
+[{'T': 'CWUser'}])],
 [self.ldap, self.system], None, {'T': 'table0.C0'}, []),
 ('FetchStep',
-[('Any L,X WHERE X login L, X is EUser', [{'X': 'EUser', 'L': 'String'}])],
+[('Any L,X WHERE X login L, X is CWUser', [{'X': 'CWUser', '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',
+[('Any G,L WHERE X in_group G, X login L, G name "managers", EXISTS(X copain T, T is CWUser), G is CWGroup, X is CWUser',
-[{'G': 'EGroup', 'L': 'String', 'T': 'EUser', 'X': 'EUser'}])],
+[{'G': 'CWGroup', 'L': 'String', 'T': 'CWUser', 'X': 'CWUser'}])],
 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'}])],
+[('Any T,L WHERE T login L, T login IN("comme", "cochon"), T is CWUser', [{'T': 'CWUser', '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'}])],
+[('Any T2 WHERE T2 login "billy", T2 is CWUser', [{'T2': 'CWUser'}])],
 [self.ldap, self.system], None, {'T2': 'table1.C0'}, []),
 ('FetchStep',
-[('Any L,X WHERE X login L, X is EUser', [{'X': 'EUser', 'L': 'String'}])],
+[('Any L,X WHERE X login L, X is CWUser', [{'X': 'CWUser', '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',
+[('Any G,L WHERE X in_group G, X login L, G name "managers", (EXISTS(X copain T, T login L, T is CWUser)) OR (EXISTS(X in_state S, S name "pascontent", NOT X copain T2, S is State, T2 is CWUser)), G is CWGroup, X is CWUser',
-[{'G': 'EGroup', 'L': 'String', 'S': 'State', 'T': 'EUser', 'T2': 'EUser', 'X': 'EUser'}])],
+[{'G': 'CWGroup', 'L': 'String', 'S': 'State', 'T': 'CWUser', 'T2': 'CWUser', 'X': 'CWUser'}])],
 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',
+[('FetchStep', [('Any T WHERE T login IN("comme", "cochon"), T is CWUser',
-[{'T': 'EUser'}])],
+[{'T': 'CWUser'}])],
 [self.ldap, self.system], None, {'T': 'table0.C0'}, []),
-('FetchStep', [('Any T2 WHERE T2 login "billy", T2 is EUser', [{'T2': 'EUser'}])],
+('FetchStep', [('Any T2 WHERE T2 login "billy", T2 is CWUser', [{'T2': 'CWUser'}])],
 [self.ldap, self.system], None, {'T2': 'table1.C0'}, []),
-('FetchStep', [('Any L,X WHERE X login L, X is EUser', [{'X': 'EUser', 'L': 'String'}])],
+('FetchStep', [('Any L,X WHERE X login L, X is CWUser', [{'X': 'CWUser', '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',
+('OneFetchStep', [('Any GN,L WHERE X in_group G, X login L, G name GN, EXISTS(X copain T, T is CWUser), NOT EXISTS(X copain T2, T2 is CWUser), G is CWGroup, X is CWUser',
-[{'G': 'EGroup', 'GN': 'String', 'L': 'String', 'T': 'EUser', 'T2': 'EUser', 'X': 'EUser'}])],
+[{'G': 'CWGroup', 'GN': 'String', 'L': 'String', 'T': 'CWUser', 'T2': 'CWUser', 'X': 'CWUser'}])],
 None, None, [self.system],
 {'T': 'table0.C0', 'T2': 'table1.C0',
 'X': 'table2.C1', 'X.login': 'table2.C0', 'L': 'table2.C0'}, [])])
 def test_exists_security_no_invariant(self):
 ueid = self.session.user.eid
-self._test('Any X,AA,AB,AC,AD ORDERBY AA WHERE X is EUser, X login AA, X firstname AB, X surname AC, X modification_date AD, A eid %(B)s, \
+self._test('Any X,AA,AB,AC,AD ORDERBY AA WHERE X is CWUser, X login AA, X firstname AB, X surname AC, X modification_date AD, A eid %(B)s, \
 EXISTS(((X identity A) OR \
-(EXISTS(X in_group C, C name IN("managers", "staff"), C is EGroup))) OR \
+(EXISTS(X in_group C, C name IN("managers", "staff"), C is CWGroup))) OR \
-(EXISTS(X in_group D, A in_group D, NOT D name "users", D is EGroup)))',
+(EXISTS(X in_group D, A in_group D, NOT D name "users", D is CWGroup)))',
-[('FetchStep', [('Any X,AA,AB,AC,AD WHERE X login AA, X firstname AB, X surname AC, X modification_date AD, X is EUser',
+[('FetchStep', [('Any X,AA,AB,AC,AD WHERE X login AA, X firstname AB, X surname AC, X modification_date AD, X is CWUser',
 [{'AA': 'String', 'AB': 'String', 'AC': 'String', 'AD': 'Datetime',
-'X': 'EUser'}])],
+'X': 'CWUser'}])],
 [self.ldap, self.system], None, {'AA': 'table0.C1', 'AB': 'table0.C2',
 'AC': 'table0.C3', 'AD': 'table0.C4',
 'X': 'table0.C0',
 'X.firstname': 'table0.C2',
 'X.login': 'table0.C1',
 'X.modification_date': 'table0.C4',
 'X.surname': 'table0.C3'}, []),
-('OneFetchStep', [('Any X,AA,AB,AC,AD ORDERBY AA WHERE X login AA, X firstname AB, X surname AC, X modification_date AD, EXISTS(((X identity 5) OR (EXISTS(X in_group C, C name IN("managers", "staff"), C is EGroup))) OR (EXISTS(X in_group D, 5 in_group D, NOT D name "users", D is EGroup))), X is EUser',
+('OneFetchStep', [('Any X,AA,AB,AC,AD ORDERBY AA WHERE X login AA, X firstname AB, X surname AC, X modification_date AD, EXISTS(((X identity 5) OR (EXISTS(X in_group C, C name IN("managers", "staff"), C is CWGroup))) OR (EXISTS(X in_group D, 5 in_group D, NOT D name "users", D is CWGroup))), X is CWUser',
 [{'AA': 'String', 'AB': 'String', 'AC': 'String', 'AD': 'Datetime',
-'C': 'EGroup', 'D': 'EGroup', 'X': 'EUser'}])],
+'C': 'CWGroup', 'D': 'CWGroup', 'X': 'CWUser'}])],
 None, None, [self.system],
 {'AA': 'table0.C1', 'AB': 'table0.C2', 'AC': 'table0.C3', 'AD': 'table0.C4',
 'X': 'table0.C0',
 'X.firstname': 'table0.C2', 'X.login': 'table0.C1', 'X.modification_date': 'table0.C4', 'X.surname': 'table0.C3'},
 [])],
 {'B': ueid})
 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)',
+('OneFetchStep', [('Any X,S WHERE X in_state S, S is State, X is IN(Affaire, CWUser)',
-[{'X': 'Affaire', 'S': 'State'}, {'X': 'EUser', 'S': 'State'}])],
+[{'X': 'Affaire', 'S': 'State'}, {'X': 'CWUser', '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], {}, []),
 ])])
 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',
+[('OneFetchStep', [('Any X,S,U WHERE X in_state S, X todo_by U, S is State, U is CWUser, X is Note',
-[{'X': 'Note', 'S': 'State', 'U': 'EUser'}])],
+[{'X': 'Note', 'S': 'State', 'U': 'CWUser'}])],
 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], {}, []),
 ])
 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',
+[('OneFetchStep', [('Any X,U WHERE X todo_by U, U is CWUser, X is Note',
-[{'X': 'Note', 'U': 'EUser'}])],
+[{'X': 'Note', 'U': 'CWUser'}])],
 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], {}, [])
 ])
 ('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)',
+('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, CWUser)',
 [{'X': 'Affaire', 'S': 'State', 'T': 'Tag'},
-{'X': 'EUser', 'S': 'State', 'T': 'Tag'}])],
+{'X': 'CWUser', 'S': 'State', 'T': 'Tag'}])],
 None, None,
 [self.system], {}, []),
 ])
 ])
 [('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.rql, self.system], {},
 []),
 ('OneFetchStep',
-[('Any SN WHERE NOT X in_state S, S name SN, S is State, X is IN(Affaire, EUser)',
+[('Any SN WHERE NOT X in_state S, S name SN, S is State, X is IN(Affaire, CWUser)',
 [{'S': 'State', 'SN': 'String', 'X': 'Affaire'},
-{'S': 'State', 'SN': 'String', 'X': 'EUser'}])],
+{'S': 'State', 'SN': 'String', 'X': 'CWUser'}])],
 None, None, [self.system], {'S': 'table0.C1', 'S.name': 'table0.C0', 'SN': 'table0.C0'},
 []),]
 )])
 def test_external_attributes_and_relation(self):
 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'}])],
+#('FetchStep', [('Any D WHERE D is CWUser', [{'D': 'CWUser'}])],
 # [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',
+('OneFetchStep', [('Any A,B,C,D WHERE A creation_date B, A modification_date C, A todo_by D?, A is Note, D is CWUser',
-[{'A': 'Note', 'C': 'Datetime', 'B': 'Datetime', 'D': 'EUser'}])],
+[{'A': 'Note', 'C': 'Datetime', 'B': 'Datetime', 'D': 'CWUser'}])],
 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'}])],
+[{'X': 'Note', 'G': 'CWGroup', 'P': 'CWPermission'}])],
 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"',
 [('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'}])],
+[('Any B,C WHERE B login C, B is CWUser', [{'B': 'CWUser', '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',
+('OneFetchStep', [('DISTINCT Any B,C ORDERBY C WHERE A created_by B, B login C, EXISTS(B owned_by 5), B is CWUser',
-[{'A': 'Bookmark', 'B': 'EUser', 'C': 'String'},
+[{'A': 'Bookmark', 'B': 'CWUser', 'C': 'String'},
-{'A': 'Tag', 'B': 'EUser', 'C': 'String'}])],
+{'A': 'Tag', 'B': 'CWUser', 'C': 'String'}])],
 None, None, [self.system],
 {'A': 'table0.C0',
 'B': 'table1.C0', 'B.login': 'table1.C1',
 'C': 'table1.C1',
 'N': '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'}])],
+[('Any B,C WHERE B login C, B is CWUser', [{'B': 'CWUser', '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',
+('OneFetchStep', [('DISTINCT Any B,C ORDERBY C WHERE A created_by B, B login C, EXISTS(B owned_by 5), B is CWUser',
-[{'A': 'Card', 'B': 'EUser', 'C': 'String'},
+[{'A': 'Card', 'B': 'CWUser', 'C': 'String'},
-{'A': 'Tag', 'B': 'EUser', 'C': 'String'}])],
+{'A': 'Tag', 'B': 'CWUser', 'C': 'String'}])],
 None, None, [self.system],
 {'A': 'table0.C0',
 'B': 'table1.C0', 'B.login': 'table1.C1',
 'C': 'table1.C1',
 'N': 'table0.C1'},
 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),
+('OneFetchStep', [('Any 5,Y WHERE %s created_by Y, NOT Y eid %s, Y is CWUser'%(ueid, ueid),
-[{'Y': 'EUser'}])],
+[{'Y': 'CWUser'}])],
 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'}])],
+[('FetchStep', [('Any Y WHERE NOT Y login "syt", Y is CWUser', [{'Y': 'CWUser'}])],
 [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'}])],
+('OneFetchStep', [('Any %s,Y WHERE %s created_by Y, Y is CWUser'%(ueid,ueid), [{'Y': 'CWUser'}])],
 None, None, [self.system], {'Y': 'table0.C0'}, []),
 ]),
 ],
 {'x': ueid, 'y': ueid})
 {'x': 999999})
 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'}])],
+[('Any X WHERE X login "comme", X is CWUser', [{'X': 'CWUser'}])],
 [self.ldap, self.system], None, {'X': 'table0.C0'}, []),
 ('FetchStep',
-[('Any Y WHERE Y login "cochon", Y is EUser', [{'Y': 'EUser'}])],
+[('Any Y WHERE Y login "cochon", Y is CWUser', [{'Y': 'CWUser'}])],
 [self.ldap, self.system], None, {'Y': 'table1.C0'}, []),
 ('UpdateStep',
 [('OneFetchStep',
-[('DISTINCT Any X,Y WHERE X is EUser, Y is EUser',
+[('DISTINCT Any X,Y WHERE X is CWUser, Y is CWUser',
-[{'X': 'EUser', 'Y': 'EUser'}])],
+[{'X': 'CWUser', 'Y': 'CWUser'}])],
 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'}])],
+[('FetchStep', [('Any U WHERE U login "admin", U is CWUser', [{'U': 'CWUser'}])],
 [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',
+('OneFetchStep', [('DISTINCT Any U,G WHERE G name ILIKE "bougloup%", G is CWGroup, U is CWUser',
-[{'U': 'EUser', 'G': 'EGroup'}])],
+[{'U': 'CWUser', 'G': 'CWGroup'}])],
 None, None, [self.system], {'U': 'table0.C0'}, []),
 ]),
 ])
 def test_update3(self):
 ],
 {'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
+#         # source, CWUser 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,
+#         self._test('SET X in_state S WHERE X is CWUser, S eid %s' % activatedeid,
 #                    [('UpdateStep', [
-#                        ('OneFetchStep', [('DISTINCT Any X,%s WHERE X is EUser' % activatedeid,
+#                        ('OneFetchStep', [('DISTINCT Any X,%s WHERE X is CWUser' % activatedeid,
-#                                           [{'X': 'EUser'}])],
+#                                           [{'X': 'CWUser'}])],
 #                         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'}])],
+[('Any X WHERE X login "syt", X is CWUser', [{'X': 'CWUser'}])],
 [self.ldap, self.system], None, {'X': 'table0.C0'}, []),
 ('FetchStep',
-[('Any Y WHERE Y login "cochon", Y is EUser', [{'Y': 'EUser'}])],
+[('Any Y WHERE Y login "cochon", Y is CWUser', [{'Y': 'CWUser'}])],
 [self.ldap, self.system], None, {'Y': 'table1.C0'}, []),
 ('OneFetchStep',
-[('Any X,Y WHERE X copain Y, X is EUser, Y is EUser',
+[('Any X,Y WHERE X copain Y, X is CWUser, Y is CWUser',
-[{'X': 'EUser', 'Y': 'EUser'}])],
+[{'X': 'CWUser', 'Y': 'CWUser'}])],
 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',
+('FetchStep', [('Any X,D WHERE X modification_date D, X is CWUser',
-[{'X': 'EUser', 'D': 'Datetime'}])],
+[{'X': 'CWUser', '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,
+('FetchStep', [('Any X,D WHERE E eid %s, E wf_info_for X, X modification_date D, E is TrInfo, X is CWUser'%treid,
-[{'X': 'EUser', 'E': 'TrInfo', 'D': 'Datetime'}])],
+[{'X': 'CWUser', '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'}])],
 ],
 {'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
+# Any X, NOW - CD, P WHERE P is Project, U interested_in P, U is CWUser, 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'}])],
+[('FetchStep', [('Any U WHERE U login "admin", U is CWUser', [{'U': 'CWUser'}])],
 [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',
+('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 CWUser, X is CWEType',
-[{'P': 'Bookmark', 'U': 'EUser', 'X': 'EEType', 'CD': 'Datetime'}])],
+[{'P': 'Bookmark', 'U': 'CWUser', 'X': 'CWEType', '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'}])],
+[#('FetchStep', [('Any U WHERE U is CWUser', [{'U': 'CWUser'}])],
 # [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'}])],
+[{'WF': 'TrInfo', 'FS': 'State', 'U': 'CWUser', 'D': 'Datetime'}])],
 None, None,
 [self.system], {}, [])],
 {'x': self.session.user.eid})
 def test_nonregr5(self):
 None, None, [self.system],
 {'Y': u'table0.C0'}, [])])],
 {'x': 999999, 'z': 999998})
 def test_nonregr10(self):
-repo._type_source_cache[999999] = ('EUser', 'ldapuser', 999999)
+repo._type_source_cache[999999] = ('CWUser', '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',
+[('Any X,AA,AB WHERE X login AA, X modification_date AB, X is CWUser',
-[{'AA': 'String', 'AB': 'Datetime', 'X': 'EUser'}])],
+[{'AA': 'String', 'AB': 'Datetime', 'X': 'CWUser'}])],
 [self.ldap, self.system], 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',
+[('Any X,AA,AB ORDERBY AA WHERE 999999 owned_by X, X login AA, X modification_date AB, X is CWUser',
-[{'AA': 'String', 'AB': 'Datetime', 'X': 'EUser'}])],
+[{'AA': 'String', 'AB': 'Datetime', 'X': 'CWUser'}])],
 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'}])],
+[('Any Y WHERE Y login "hop", Y is CWUser', [{'Y': 'CWUser'}])],
 [self.ldap, self.system],
 None, {'Y': 'table0.C0'}, []),
 ('UpdateStep',
-[('OneFetchStep', [('DISTINCT Any 999999,Y WHERE Y is EUser', [{'Y': 'EUser'}])],
+[('OneFetchStep', [('DISTINCT Any 999999,Y WHERE Y is CWUser', [{'Y': 'CWUser'}])],
 None, None, [self.system], {'Y': 'table0.C0'},
 [])]
 )],
 {'x': 999999})
 # identity wrapped into exists:
 # should'nt propagate constraint that U is in the same source as ME
 self._test('Any B,U,UL GROUPBY B,U,UL WHERE B created_by U?, B is File '
 'WITH U,UL BEING (Any U,UL WHERE ME eid %(x)s, (EXISTS(U identity ME) '
 'OR (EXISTS(U in_group G, G name IN("managers", "staff")))) '
-'OR (EXISTS(U in_group H, ME in_group H, NOT H name "users")), U login UL, U is EUser)',
+'OR (EXISTS(U in_group H, ME in_group H, NOT H name "users")), U login UL, U is CWUser)',
-[('FetchStep', [('Any U,UL WHERE U login UL, U is EUser',
+[('FetchStep', [('Any U,UL WHERE U login UL, U is CWUser',
-[{'U': 'EUser', 'UL': 'String'}])],
+[{'U': 'CWUser', 'UL': 'String'}])],
 [self.ldap, self.system], None,
 {'U': 'table0.C0', 'U.login': 'table0.C1', 'UL': 'table0.C1'},
 []),
-('FetchStep', [('Any U,UL WHERE ((EXISTS(U identity 5)) OR (EXISTS(U in_group G, G name IN("managers", "staff"), G is EGroup))) OR (EXISTS(U in_group H, 5 in_group H, NOT H name "users", H is EGroup)), U login UL, U is EUser',
+('FetchStep', [('Any U,UL WHERE ((EXISTS(U identity 5)) OR (EXISTS(U in_group G, G name IN("managers", "staff"), G is CWGroup))) OR (EXISTS(U in_group H, 5 in_group H, NOT H name "users", H is CWGroup)), U login UL, U is CWUser',
-[{'G': 'EGroup', 'H': 'EGroup', 'U': 'EUser', 'UL': 'String'}])],
+[{'G': 'CWGroup', 'H': 'CWGroup', 'U': 'CWUser', 'UL': 'String'}])],
 [self.system],
 {'U': 'table0.C0', 'U.login': 'table0.C1', 'UL': 'table0.C1'},
 {'U': 'table1.C0', 'U.login': 'table1.C1', 'UL': 'table1.C1'},
 []),
 ('OneFetchStep', [('Any B,U,UL GROUPBY B,U,UL WHERE B created_by U?, B is File',
-[{'B': 'File', 'U': 'EUser', 'UL': 'String'}])],
+[{'B': 'File', 'U': 'CWUser', 'UL': 'String'}])],
 None, None, [self.system],
 {'U': 'table1.C0', 'UL': 'table1.C1'},
 [])],
 {'x': self.session.user.eid})
 # wrapped in exists() if used in multi-source
 self.skip('take a look at me if you wish')
 self._test('Any B,U,UL GROUPBY B,U,UL WHERE B created_by U?, B is File '
 'WITH U,UL BEING (Any U,UL WHERE ME eid %(x)s, (U identity ME '
 'OR (EXISTS(U in_group G, G name IN("managers", "staff")))) '
-'OR (EXISTS(U in_group H, ME in_group H, NOT H name "users")), U login UL, U is EUser)',
+'OR (EXISTS(U in_group H, ME in_group H, NOT H name "users")), U login UL, U is CWUser)',
-[('FetchStep', [('Any U,UL WHERE U login UL, U is EUser',
+[('FetchStep', [('Any U,UL WHERE U login UL, U is CWUser',
-[{'U': 'EUser', 'UL': 'String'}])],
+[{'U': 'CWUser', 'UL': 'String'}])],
 [self.ldap, self.system], None,
 {'U': 'table0.C0', 'U.login': 'table0.C1', 'UL': 'table0.C1'},
 []),
-('FetchStep', [('Any U,UL WHERE ((U identity 5) OR (EXISTS(U in_group G, G name IN("managers", "staff"), G is EGroup))) OR (EXISTS(U in_group H, 5 in_group H, NOT H name "users", H is EGroup)), U login UL, U is EUser',
+('FetchStep', [('Any U,UL WHERE ((U identity 5) OR (EXISTS(U in_group G, G name IN("managers", "staff"), G is CWGroup))) OR (EXISTS(U in_group H, 5 in_group H, NOT H name "users", H is CWGroup)), U login UL, U is CWUser',
-[{'G': 'EGroup', 'H': 'EGroup', 'U': 'EUser', 'UL': 'String'}])],
+[{'G': 'CWGroup', 'H': 'CWGroup', 'U': 'CWUser', 'UL': 'String'}])],
 [self.system],
 {'U': 'table0.C0', 'U.login': 'table0.C1', 'UL': 'table0.C1'},
 {'U': 'table1.C0', 'U.login': 'table1.C1', 'UL': 'table1.C1'},
 []),
 ('OneFetchStep', [('Any B,U,UL GROUPBY B,U,UL WHERE B created_by U?, B is File',
-[{'B': 'File', 'U': 'EUser', 'UL': 'String'}])],
+[{'B': 'File', 'U': 'CWUser', 'UL': 'String'}])],
 None, None, [self.system],
 {'U': 'table1.C0', 'UL': 'table1.C1'},
 [])],
 {'x': self.session.user.eid})

branch	tls-sprint
changeset 1398	5fe84a5f7035
parent 1231	1457a545af03
child 1785	01245e2a777d