cubicweb: comparison server/test/unittest

equal deleted inserted replaced

-:173c646981a7
+:9e268cb6202e
 {'X': 'File'}, {'X': 'Folder'}, {'X': 'Image'},
 {'X': 'Note'}, {'X': 'Personne'}, {'X': 'RQLExpression'},
 {'X': 'Societe'}, {'X': 'State'}, {'X': 'SubDivision'},
 {'X': 'Tag'}, {'X': 'TrInfo'}, {'X': 'Transition'}])
-def clear_ms_caches(repo):
-clear_cache(repo, 'rel_type_sources')
-clear_cache(repo, 'can_cross_relation')
-clear_cache(repo, 'is_multi_sources_relation')
-# XXX source_defs
 # keep cnx so it's not garbage collected and the associated session is closed
 repo, cnx = init_test_database('sqlite')
 class BaseMSPlannerTC(BasePlannerTC):
 """
 repo = repo
 def setUp(self):
 #_QuerierTC.setUp(self)
-clear_cache(repo, 'rel_type_sources')
+self.setup()
-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"')
 # hijack CWUser security
 userreadperms = list(self.schema['CWUser']._groups['read'])
 self.prevrqlexpr_user = userreadperms[-1]
 userreadperms[-1] = ERQLExpression('X owned_by U')
 self.schema['CWUser']._groups['read'] = tuple(userreadperms)
+self.add_source(FakeUserROSource, 'ldap')
-self.sources = self.o._repo.sources
+self.add_source(FakeCardSource, 'cards')
-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()
-clear_ms_caches(repo)
 def tearDown(self):
-undo_monkey_patch()
+super(BaseMSPlannerTC, self).tearDown()
-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):
 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)
+{self.system: {'X': s[0]}, self.cards: {'X': s[0]}}, False)
 def test_simple_eid_specified(self):
 """retrieve CWUser X from system source (eid is specified, can locate the entity)
 """
 ueid = self.session.user.eid
 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.cards : '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]},
 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]}},
+self.cards: {'X': s[2], 'S': s[2]}},
 True)
 def test_not_relation_need_split(self):
 self._test('Any SN WHERE NOT X in_state S, S name SN',
-{self.rql: {'X': s[2], 'S': s[0, 1, 2]},
+{self.cards: {'X': s[2], 'S': s[0, 1, 2]},
 self.system: {'X': s[0, 1, 2], 'S': s[0, 1, 2]}},
 True)
 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.
 # the same plan may be used, since we won't find any record in the system source
 # linking 9999999 to a state
 self._test('Any SN WHERE NOT X in_state S, X eid %(x)s, S name SN',
 {'x': 999999},
-{self.rql: {'x': s[0], 'S': s[0]},
+{self.cards: {'x': s[0], 'S': s[0]},
 self.system: {'x': s[0], 'S': s[0]}},
 False)
 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]}},
+self.cards: {'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',
 def test_crossed_relation_eid_1_needattr(self):
 repo._type_source_cache[999999] = ('Note', 'system', 999999)
 ueid = self.session.user.eid
 self._test('Any Y,T WHERE X eid %(x)s, X multisource_crossed_rel Y, Y type T',
 {'x': 999999,},
-{self.rql: {'Y': s[0]}, self.system: {'Y': s[0], 'x': s[0]}},
+{self.cards: {'Y': s[0]}, self.system: {'Y': s[0], 'x': s[0]}},
 True)
 def test_crossed_relation_eid_1_invariant(self):
 repo._type_source_cache[999999] = ('Note', 'system', 999999)
 self._test('Any Y WHERE X eid %(x)s, X multisource_crossed_rel Y',
 def test_crossed_relation_eid_2_invariant(self):
 repo._type_source_cache[999999] = ('Note', 'cards', 999999)
 self._test('Any Y WHERE X eid %(x)s, X multisource_crossed_rel Y',
 {'x': 999999,},
-{self.rql: {'Y': s[0], 'multisource_crossed_rel': s[0], 'x': s[0]},
+{self.cards: {'Y': s[0], 'multisource_crossed_rel': s[0], 'x': s[0]},
 self.system: {'Y': s[0], 'multisource_crossed_rel': s[0], 'x': s[0]}},
 False)
 def test_version_crossed_depends_on_1(self):
 repo._type_source_cache[999999] = ('Note', 'cards', 999999)
 self._test('Any X,AD,AE WHERE E eid %(x)s, E multisource_crossed_rel X, X in_state AD, AD name AE',
 {'x': 999999},
-{self.rql: {'X': s[0], 'AD': s[0], 'multisource_crossed_rel': s[0], 'x': s[0]},
+{self.cards: {'X': s[0], 'AD': s[0], 'multisource_crossed_rel': s[0], 'x': s[0]},
 self.system: {'X': s[0], 'AD': s[0], 'multisource_crossed_rel': s[0], 'x': s[0]}},
 True)
 def test_version_crossed_depends_on_2(self):
 repo._type_source_cache[999999] = ('Note', 'system', 999999)
 self._test('Any X,AD,AE WHERE E eid %(x)s, E multisource_crossed_rel X, X in_state AD, AD name AE',
 {'x': 999999},
-{self.rql: {'X': s[0], 'AD': s[0]},
+{self.cards: {'X': s[0], 'AD': s[0]},
 self.system: {'X': s[0], 'AD': s[0], 'x': s[0]}},
 True)
 def test_simplified_var_3(self):
 repo._type_source_cache[999999] = ('Note', 'cards', 999999)
 repo._type_source_cache[999998] = ('State', 'cards', 999998)
 self._test('Any S,T WHERE S eid %(s)s, N eid %(n)s, N type T, N is Note, S is State',
 {'n': 999999, 's': 999998},
-{self.rql: {'s': s[0], 'N': s[0]}}, False)
+{self.cards: {'s': s[0], 'N': s[0]}}, False)
 class MSPlannerTC(BaseMSPlannerTC):
 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], {}, [])])
+None, None, [self.cards, self.system], {}, [])])
 def test_simple_eid_specified(self):
 """retrieve CWUser X from system source (eid is specified, can locate the entity)
 """
 ueid = self.session.user.eid
 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'}, [])
+[self.cards, self.system], {}, {'MAX(X)': 'table0.C0'}, [])
 ])
 ])
 def test_complex_greater_eid(self):
 self._test('Any X WHERE X eid > 12',
 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,
+[self.cards, self.system], None,
 {'T': 'table0.C1', 'X': 'table0.C0', 'X.title': 'table0.C1'}, []),
 ('FetchStep', [('Any U WHERE U login "syt", U is CWUser', [{'U': 'CWUser'}])],
 [self.ldap, self.system], None,
 {'U': 'table1.C0'}, []),
 ('UnionStep', None, None, [
 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,
+[self.cards, 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,
+[self.cards, 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'}, [])
 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], {}, [])
+[self.cards, 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,
 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,
+[self.cards, self.system], None,
 {'A': 'table0.C0', 'R': 'table0.C1', 'Y.type': 'table0.C1'}, []),
 ('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 CWUser',
 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'}, []),
+[self.cards, 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'}, []),
 # 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'}, []),
+[self.cards, 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',
 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'}, []),
+[self.cards, self.system],  None, {'E': 'table1.C0'}, []),
 ('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'}, []),
+[self.cards, self.system], {}, {'X': 'table0.C0'}, []),
 ('FetchStep',
 [('Any X WHERE X is IN(Bookmark, CWAttribute, CWCache, CWConstraint, CWConstraintType, CWEType, CWGroup, CWPermission, CWProperty, CWRType, CWRelation, Comment, Division, Email, EmailAddress, EmailPart, EmailThread, File, Folder, Image, Personne, RQLExpression, Societe, SubDivision, Tag, TrInfo, Transition)',
 sorted([{'X': 'Bookmark'}, {'X': 'Comment'}, {'X': 'Division'},
 {'X': 'CWCache'}, {'X': 'CWConstraint'}, {'X': 'CWConstraintType'},
 {'X': 'CWEType'}, {'X': 'CWAttribute'}, {'X': 'CWGroup'},
 # 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'}, []),
+[self.cards, 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'}, []),
+[self.cards, self.system],  None, {'E': 'table2.C0'}, []),
 ('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 CWEType, X is Basket',
 [{'ET': 'CWEType', 'X': 'Basket'}])],
 # 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'}, []),
+[self.cards, self.system], None, {'X': 'table0.C0', 'X.title': 'table0.C1', 'XT': 'table0.C1'}, []),
 ('FetchStep',
 [('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 CWUser, X is Card',
 # 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'}, []),
+[self.cards, 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 CWUser, X is Card',
 [{'U': 'CWUser', 'X': 'Card', 'XT': 'String'}])],
 None, None, [self.system], {'X': 'table0.C0', 'X.title': 'table0.C1', 'XT': 'table0.C1'}, [])
 ])
 [('Any U,L WHERE U identity 5, U login L, U is CWUser',
 [{'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'}, []),
+[self.cards, 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',
 # 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'}, []),
+[self.cards, self.system], None, {'X': 'table0.C0', 'X.title': 'table0.C1', 'XT': 'table0.C1'}, []),
 ('FetchStep',
 [('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 CWUser, X is Card',
 ('OneFetchStep', [('Any X,S WHERE X in_state S, S is State, X is IN(Affaire, CWUser)',
 [{'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], {}, []),
+None, None, [self.cards, 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'}, []),
+[self.cards, 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 CWUser, X is Note',
 [{'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',
 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'}, []),
+[self.cards, self.system], None, {'X': 'table0.C0'}, []),
 ('UnionStep', None, None,
 [('OneFetchStep', [('Any X,U WHERE X todo_by U, U is CWUser, X is Note',
 [{'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',
 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'}, []),
+[self.cards, 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'}, []),
 # 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], {}, [])],
+None, None, [self.cards, 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.
 # the same plan may be used, since we won't find any record in the system source
 # linking 9999999 to a state
 self._test('Any SN WHERE NOT X in_state S, X eid %(x)s, S name SN',
 [('OneFetchStep', [('Any SN WHERE NOT 999999 in_state S, S name SN, S is State',
 [{'S': 'State', 'SN': 'String'}])],
-None, None, [self.rql, self.system], {}, [])],
+None, None, [self.cards, self.system], {}, [])],
 {'x': 999999})
 def test_not_relation_need_split(self):
 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'},
+[self.cards, self.system], None, {'S': 'table0.C1', 'S.name': 'table0.C0', 'SN': 'table0.C0'},
 []),
 ('IntersectStep', None, None,
 [('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.rql, self.system], {},
+None, None, [self.cards, self.system], {},
 []),
 ('OneFetchStep',
 [('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': 'CWUser'}])],
 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,
+[self.cards], 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 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 CWUser',
 [{'A': 'Note', 'C': 'Datetime', 'B': 'Datetime', 'D': 'CWUser'}])],
 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'}, []),
+[self.cards, 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',
 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'}, []),
+[self.cards, 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], {},
+[self.cards, 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], {},
 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,
+[self.cards, 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],
 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,
+[self.cards, 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,
+[self.cards, 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],
 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,
+[self.cards,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],
 '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], {},
+[self.cards, self.system], {},
 {'N': 'table0.C1',
 'T': 'table0.C1',
 'X': 'table0.C0',
 'X.name': 'table0.C1',
 'X.title': 'table0.C1'}, []),
 def test_crossed_relation_eid_1_needattr(self):
 repo._type_source_cache[999999] = ('Note', 'system', 999999)
 self._test('Any Y,T WHERE X eid %(x)s, X multisource_crossed_rel Y, Y type T',
 [('FetchStep', [('Any Y,T WHERE Y type T, Y is Note', [{'T': 'String', 'Y': 'Note'}])],
-[self.rql, self.system], None,
+[self.cards, self.system], None,
 {'T': 'table0.C1', 'Y': 'table0.C0', 'Y.type': 'table0.C1'}, []),
 ('OneFetchStep', [('Any Y,T WHERE 999999 multisource_crossed_rel Y, Y type T, Y is Note',
 [{'T': 'String', 'Y': 'Note'}])],
 None, None, [self.system],
 {'T': 'table0.C1', 'Y': 'table0.C0', 'Y.type': 'table0.C1'}, []),
 def test_crossed_relation_eid_2_invariant(self):
 repo._type_source_cache[999999] = ('Note', 'cards', 999999)
 self._test('Any Y WHERE X eid %(x)s, X multisource_crossed_rel Y',
 [('OneFetchStep', [('Any Y WHERE 999999 multisource_crossed_rel Y, Y is Note', [{'Y': 'Note'}])],
-None, None, [self.rql, self.system], {}, [])
+None, None, [self.cards, self.system], {}, [])
 ],
 {'x': 999999,})
 def test_crossed_relation_eid_2_needattr(self):
 repo._type_source_cache[999999] = ('Note', 'cards', 999999)
 self._test('Any Y,T WHERE X eid %(x)s, X multisource_crossed_rel Y, Y type T',
 [('FetchStep', [('Any Y,T WHERE Y type T, Y is Note', [{'T': 'String', 'Y': 'Note'}])],
-[self.rql, self.system], None,
+[self.cards, self.system], None,
 {'T': 'table0.C1', 'Y': 'table0.C0', 'Y.type': 'table0.C1'}, []),
 ('UnionStep', None, None,
 [('OneFetchStep', [('Any Y,T WHERE 999999 multisource_crossed_rel Y, Y type T, Y is Note',
 [{'T': 'String', 'Y': 'Note'}])],
-None, None, [self.rql], None,
+None, None, [self.cards], None,
 []),
 ('OneFetchStep', [('Any Y,T WHERE 999999 multisource_crossed_rel Y, Y type T, Y is Note',
 [{'T': 'String', 'Y': 'Note'}])],
 None, None, [self.system],
 {'T': 'table0.C1', 'Y': 'table0.C0', 'Y.type': 'table0.C1'},
 def test_crossed_relation_eid_not_1(self):
 repo._type_source_cache[999999] = ('Note', 'system', 999999)
 self._test('Any Y WHERE X eid %(x)s, NOT X multisource_crossed_rel Y',
 [('FetchStep', [('Any Y WHERE Y is Note', [{'Y': 'Note'}])],
-[self.rql, self.system], None, {'Y': 'table0.C0'}, []),
+[self.cards, self.system], None, {'Y': 'table0.C0'}, []),
 ('OneFetchStep', [('Any Y WHERE NOT 999999 multisource_crossed_rel Y, Y is Note',
 [{'Y': 'Note'}])],
 None, None, [self.system],
 {'Y': 'table0.C0'},  [])],
 {'x': 999999,})
 def test_crossed_relation_base_XXXFIXME(self):
 repo._type_source_cache[999999] = ('Note', 'system', 999999)
 self._test('Any X,Y,T WHERE X multisource_crossed_rel Y, Y type T, X type T',
 [('FetchStep', [('Any X,T WHERE X type T, X is Note', [{'T': 'String', 'X': 'Note'}])],
-[self.rql, self.system], None,
+[self.cards, self.system], None,
 {'T': 'table0.C1', 'X': 'table0.C0', 'X.type': 'table0.C1'}, []),
 ('FetchStep',  [('Any Y,T WHERE Y type T, Y is Note', [{'T': 'String', 'Y': 'Note'}])],
-[self.rql, self.system], None,
+[self.cards, self.system], None,
 {'T': 'table1.C1', 'Y': 'table1.C0', 'Y.type': 'table1.C1'},  []),
 ('UnionStep', None,  None,
 [('OneFetchStep', [('Any X,Y,T WHERE X multisource_crossed_rel Y, Y type T, X type T, X is Note, Y is Note',
 [{'T': 'String', 'X': 'Note', 'Y': 'Note'}])],
-None, None, [self.rql], None,
+None, None, [self.cards], None,
 []),
 ('OneFetchStep', [('Any X,Y,T WHERE X multisource_crossed_rel Y, Y type T, X type T, X is Note, Y is Note',
 [{'T': 'String', 'X': 'Note', 'Y': 'Note'}])],
 None, None, [self.system],
 {'T': 'table1.C1', 'X': 'table0.C0', 'X.type': 'table0.C1',
 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'}, []),
+[self.cards], 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],
 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'}, []),
+[self.cards], 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],
 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], {}, [])]
+None, None, [self.cards], {}, [])]
 )]
 )],
 {'n': 999999, 's': 999998})
 def test_insert_simplified_var_4(self):
 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'}, []),
+[self.cards, 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 CWUser',
 [{'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,
 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'}, []),
+[self.cards, 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})
 {'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'}, []),
+[self.cards, 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'}, []),
+[self.cards], 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, {}, []),
+[self.cards], 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'}, []),
+[self.cards], 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] = ('CWUser', 'ldapuser', 999999)
+repo._type_source_cache[999999] = ('CWUser', 'ldap', 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 CWUser',
 [{'AA': 'String', 'AB': 'Datetime', 'X': 'CWUser'}])],
 [self.ldap, self.system], None, {'AA': 'table0.C1', 'AB': 'table0.C2',
 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, self.system], None, {'X': 'table0.C0', 'X.modification_date': 'table0.C1', 'Z': 'table0.C1'},
+[self.cards, self.system], 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'}])],
 * 2 rql sources supporting Card
 """
 repo = repo
 def setUp(self):
-self.o = repo.querier
+self.setup()
-self.session = repo._sessions.values()[0]
+self.add_source(FakeCardSource, 'cards')
-self.pool = self.session.set_pool()
+self.add_source(FakeCardSource, 'cards2')
-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)
 assert repo.sources_by_uri['cards2'].support_relation('multisource_crossed_rel')
 assert 'multisource_crossed_rel' in repo.sources_by_uri['cards2'].cross_relations
 assert repo.sources_by_uri['cards'].support_relation('multisource_crossed_rel')
 assert 'multisource_crossed_rel' in repo.sources_by_uri['cards'].cross_relations
-clear_ms_caches(repo)
 _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],
+[self.cards, self.cards2, 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'}])],
 def test_version_depends_on(self):
 self.repo._type_source_cache[999999] = ('Note', 'cards', 999999)
 self._test('Any X,AD,AE WHERE E eid %(x)s, E migrated_from X, X in_state AD, AD name AE',
 [('FetchStep', [('Any X,AD,AE WHERE X in_state AD, AD name AE, AD is State, X is Note',
 [{'AD': 'State', 'AE': 'String', 'X': 'Note'}])],
-[self.rql, self.rql2, self.system],
+[self.cards, self.cards2, self.system],
 None, {'AD': 'table0.C1', 'AD.name': 'table0.C2',
 'AE': 'table0.C2', 'X': 'table0.C0'},
 []),
 ('OneFetchStep', [('Any X,AD,AE WHERE 999999 migrated_from X, AD name AE, AD is State, X is Note',
 [{'AD': 'State', 'AE': 'String', 'X': 'Note'}])],
 def test_version_crossed_depends_on_1(self):
 self.repo._type_source_cache[999999] = ('Note', 'cards', 999999)
 self._test('Any X,AD,AE WHERE E eid %(x)s, E multisource_crossed_rel X, X in_state AD, AD name AE',
 [('FetchStep', [('Any X,AD,AE WHERE X in_state AD, AD name AE, AD is State, X is Note',
 [{'AD': 'State', 'AE': 'String', 'X': 'Note'}])],
-[self.rql, self.rql2, self.system],
+[self.cards, self.cards2, self.system],
 None, {'AD': 'table0.C1', 'AD.name': 'table0.C2',
 'AE': 'table0.C2', 'X': 'table0.C0'},
 []),
 ('UnionStep', None, None,
 [('OneFetchStep', [('Any X,AD,AE WHERE 999999 multisource_crossed_rel X, AD name AE, AD is State, X is Note',
 [{'AD': 'State', 'AE': 'String', 'X': 'Note'}])],
-None, None, [self.rql], None,
+None, None, [self.cards], None,
 []),
 ('OneFetchStep', [('Any X,AD,AE WHERE 999999 multisource_crossed_rel X, AD name AE, AD is State, X is Note',
 [{'AD': 'State', 'AE': 'String', 'X': 'Note'}])],
 None, None, [self.system],
 {'AD': 'table0.C1', 'AD.name': 'table0.C2',
 def test_version_crossed_depends_on_2(self):
 self.repo._type_source_cache[999999] = ('Note', 'system', 999999)
 self._test('Any X,AD,AE WHERE E eid %(x)s, E multisource_crossed_rel X, X in_state AD, AD name AE',
 [('FetchStep', [('Any X,AD,AE WHERE X in_state AD, AD name AE, AD is State, X is Note',
 [{'AD': 'State', 'AE': 'String', 'X': 'Note'}])],
-[self.rql, self.rql2, self.system],
+[self.cards, self.cards2, self.system],
 None, {'AD': 'table0.C1', 'AD.name': 'table0.C2',
 'AE': 'table0.C2', 'X': 'table0.C0'},
 []),
 ('OneFetchStep', [('Any X,AD,AE WHERE 999999 multisource_crossed_rel X, AD name AE, AD is State, X is Note',
 [{'AD': 'State', 'AE': 'String', 'X': 'Note'}])],
 def test_version_crossed_depends_on_3(self):
 self._test('Any X,AD,AE WHERE E multisource_crossed_rel X, X in_state AD, AD name AE, E is Note',
 [('FetchStep', [('Any X,AD,AE WHERE X in_state AD, AD name AE, AD is State, X is Note',
 [{'AD': 'State', 'AE': 'String', 'X': 'Note'}])],
-[self.rql, self.rql2, self.system],
+[self.cards, self.cards2, self.system],
 None, {'AD': 'table0.C1', 'AD.name': 'table0.C2',
 'AE': 'table0.C2', 'X': 'table0.C0'},
 []),
 ('FetchStep', [('Any E WHERE E is Note', [{'E': 'Note'}])],
-[self.rql, self.rql2, self.system],
+[self.cards, self.cards2, self.system],
 None, {'E': 'table1.C0'},
 []),
 ('UnionStep', None, None,
 [('OneFetchStep', [('Any X,AD,AE WHERE E multisource_crossed_rel X, AD name AE, AD is State, E is Note, X is Note',
 [{'AD': 'State', 'AE': 'String', 'E': 'Note', 'X': 'Note'}])],
-None, None, [self.rql, self.rql2], None,
+None, None, [self.cards, self.cards2], None,
 []),
 ('OneFetchStep', [('Any X,AD,AE WHERE E multisource_crossed_rel X, AD name AE, AD is State, E is Note, X is Note',
 [{'AD': 'State', 'AE': 'String', 'E': 'Note', 'X': 'Note'}])],
 None, None, [self.system],
 {'AD': 'table0.C1',
 def test_nonregr_dont_cross_rel_source_filtering_1(self):
 self.repo._type_source_cache[999999] = ('Note', 'cards', 999999)
 self._test('Any S WHERE E eid %(x)s, E in_state S, NOT S name "moved"',
 [('OneFetchStep', [('Any S WHERE 999999 in_state S, NOT S name "moved", S is State',
 [{'S': 'State'}])],
-None, None, [self.rql], {}, []
+None, None, [self.cards], {}, []
 )],
 {'x': 999999})
 def test_nonregr_dont_cross_rel_source_filtering_2(self):
 self.repo._type_source_cache[999999] = ('Note', 'cards', 999999)
 self._test('Any X,AA,AB WHERE E eid %(x)s, E in_state X, X name AA, X modification_date AB',
 [('OneFetchStep', [('Any X,AA,AB WHERE 999999 in_state X, X name AA, X modification_date AB, X is State',
 [{'AA': 'String', 'AB': 'Datetime', 'X': 'State'}])],
-None, None, [self.rql], {}, []
+None, None, [self.cards], {}, []
 )],
 {'x': 999999})
 if __name__ == '__main__':

branch	stable
changeset 2074	9e268cb6202e
parent 1977	606923dff11b
child 2075	933ccfce6e91