65 def test_nonregr2(self): |
65 def test_nonregr2(self): |
66 #'DISTINCT Any X,TMP,N WHERE P name TMP, X version_of P, P is Project, X is Version, not X in_state S,S name "published", X num N ORDERBY TMP,N' |
66 #'DISTINCT Any X,TMP,N WHERE P name TMP, X version_of P, P is Project, X is Version, not X in_state S,S name "published", X num N ORDERBY TMP,N' |
67 select = self.parse('DISTINCT Any V,TN,L ORDERBY TN,L WHERE T nom TN, V connait T, T is Personne, V is CWUser,' |
67 select = self.parse('DISTINCT Any V,TN,L ORDERBY TN,L WHERE T nom TN, V connait T, T is Personne, V is CWUser,' |
68 'NOT V in_state VS, VS name "published", V login L') |
68 'NOT V in_state VS, VS name "published", V login L') |
69 rschema = self.schema['connait'] |
69 rschema = self.schema['connait'] |
70 for s, o in rschema.iter_rdefs(): |
70 for rdefs in rschema.rdefs.values(): |
71 rschema.set_rproperty(s, o, 'cardinality', '++') |
71 rdefs.cardinality = '++' |
72 try: |
72 try: |
73 self.assertEquals(self._generate(select, 'in_state', 'subject', 'name'), |
73 self.assertEquals(self._generate(select, 'in_state', 'subject', 'name'), |
74 "DISTINCT Any A,B ORDERBY B WHERE V is CWUser, " |
74 "DISTINCT Any A,B ORDERBY B WHERE V is CWUser, " |
75 "NOT V in_state VS, VS name 'published', " |
75 "NOT V in_state VS, VS name 'published', " |
76 "V in_state A, A name B") |
76 "V in_state A, A name B") |
77 finally: |
77 finally: |
78 for s, o in rschema.iter_rdefs(): |
78 for rdefs in rschema.rdefs.values(): |
79 rschema.set_rproperty(s, o, 'cardinality', '**') |
79 rdefs.cardinality = '**' |
80 |
80 |
81 def test_nonregr3(self): |
81 def test_nonregr3(self): |
82 #'DISTINCT Any X,TMP,N WHERE P name TMP, X version_of P, P is Project, X is Version, not X in_state S,S name "published", X num N ORDERBY TMP,N' |
82 #'DISTINCT Any X,TMP,N WHERE P name TMP, X version_of P, P is Project, X is Version, not X in_state S,S name "published", X num N ORDERBY TMP,N' |
83 select = self.parse('DISTINCT Any X, MAX(Y) GROUPBY X WHERE X is CWUser, Y is Bookmark, X in_group A') |
83 select = self.parse('DISTINCT Any X, MAX(Y) GROUPBY X WHERE X is CWUser, Y is Bookmark, X in_group A') |
84 self.assertEquals(self._generate(select, 'in_group', 'subject', 'name'), |
84 self.assertEquals(self._generate(select, 'in_group', 'subject', 'name'), |