cubicweb: comparison cubicweb/server/test/unittest

equal deleted inserted replaced

-:403a901b6b1e
+:09be48c01fa4
 print('!=')
 print(sql.strip())
 print('RQL:', rql)
 raise
-def _parse(self, rqls):
-for rql, sql in rqls:
-yield self._check, rql, sql
 def _checkall(self, rql, sql):
 if isinstance(rql, tuple):
 rql, args = rql
 else:
 args = None
 '''SELECT _X.cw_eid
 FROM cw_CWUser AS _X
 WHERE _X.cw_login IS NULL''')
 def test_today(self):
-for t in self._parse([("Any X WHERE X creation_date TODAY, X is Affaire",
+for rql, sql in [
-'''SELECT _X.cw_eid
+("Any X WHERE X creation_date TODAY, X is Affaire",
+'''SELECT _X.cw_eid
 FROM cw_Affaire AS _X
 WHERE DATE(_X.cw_creation_date)=CAST(clock_timestamp() AS DATE)'''),
 ("Personne P where not P datenaiss TODAY",
 '''SELECT _P.cw_eid
 FROM cw_Personne AS _P
 WHERE NOT (DATE(_P.cw_datenaiss)=CAST(clock_timestamp() AS DATE))'''),
-]):
+]:
-yield t
+with self.subTest(rql=rql):
+self._check(rql, sql)
 def test_date_extraction(self):
 self._check("Any MONTH(D) WHERE P is Personne, P creation_date D",
 '''SELECT CAST(EXTRACT(MONTH from _P.cw_creation_date) AS INTEGER)
 FROM cw_Personne AS _P''')
 FROM cw_CWUser AS _X
 WHERE _X.cw_login ~ [0-9].*
 ''')
 def test_parser_parse(self):
-for t in self._parse(PARSER):
+for rql, sql in PARSER:
-yield t
+with self.subTest(rql=rql):
+self._check(rql, sql)
 def test_basic_parse(self):
-for t in self._parse(BASIC + BASIC_WITH_LIMIT):
+for rql, sql in (BASIC + BASIC_WITH_LIMIT):
-yield t
+with self.subTest(rql=rql):
+self._check(rql, sql)
 def test_advanced_parse(self):
-for t in self._parse(ADVANCED + ADVANCED_WITH_LIMIT_OR_ORDERBY + ADVANCED_WITH_GROUP_CONCAT):
+for rql, sql in (ADVANCED + ADVANCED_WITH_LIMIT_OR_ORDERBY + ADVANCED_WITH_GROUP_CONCAT):
-yield t
+with self.subTest(rql=rql):
+self._check(rql, sql)
 def test_outer_join_parse(self):
-for t in self._parse(OUTER_JOIN):
+for rql, sql in OUTER_JOIN:
-yield t
+with self.subTest(rql=rql):
+self._check(rql, sql)
 def test_virtual_vars_parse(self):
-for t in self._parse(VIRTUAL_VARS):
+for rql, sql in VIRTUAL_VARS:
-yield t
+with self.subTest(rql=rql):
+self._check(rql, sql)
 def test_multiple_sel_parse(self):
-for t in self._parse(MULTIPLE_SEL):
+for rql, sql in MULTIPLE_SEL:
-yield t
+with self.subTest(rql=rql):
+self._check(rql, sql)
 def test_functions(self):
-for t in self._parse(FUNCS):
+for rql, sql in FUNCS:
-yield t
+with self.subTest(rql=rql):
+self._check(rql, sql)
 def test_negation(self):
-for t in self._parse(NEGATIONS):
+for rql, sql in NEGATIONS:
-yield t
+with self.subTest(rql=rql):
+self._check(rql, sql)
 def test_intersection(self):
-for t in self._parse(INTERSECT):
+for rql, sql in INTERSECT:
-yield t
+with self.subTest(rql=rql):
+self._check(rql, sql)
 def test_union(self):
-for t in self._parse((
+for rql, sql in [
 ('(Any N ORDERBY 1 WHERE X name N, X is State)'
 ' UNION '
 '(Any NN ORDERBY 1 WHERE XX name NN, XX is Transition)',
 '''(SELECT _X.cw_name
 FROM cw_State AS _X
 ORDER BY 1)
 UNION ALL
 (SELECT _XX.cw_name
 FROM cw_Transition AS _XX
 ORDER BY 1)'''),
-)):
+]:
-yield t
+with self.subTest(rql=rql):
+self._check(rql, sql)
 def test_subquery(self):
-for t in self._parse((
+for rql, sql in [
 ('Any X,N '
 'WHERE NOT EXISTS(X owned_by U) '
 'WITH X,N BEING '
 '((Any X,N WHERE X name N, X is State)'
 ' UNION '
 FROM cw_Affaire AS _T
 GROUP BY _T.cw_eid) AS _T1 LEFT OUTER JOIN (SELECT _T.cw_eid AS C0, SUM(_T.cw_duration) AS C1
 FROM cw_Affaire AS _T LEFT OUTER JOIN tags_relation AS rel_tags0 ON (rel_tags0.eid_to=_T.cw_eid) LEFT OUTER JOIN cw_Tag AS _TAG ON (rel_tags0.eid_from=_TAG.cw_eid AND _TAG.cw_name=t)
 GROUP BY _T.cw_eid) AS _T0 ON (_T1.C0=_T0.C0)'''),
-)):
+]:
-yield t
+with self.subTest(rql=rql):
+self._check(rql, sql)
 def test_subquery_error(self):
 rql = ('Any N WHERE X name N WITH X BEING '
 '((Any X WHERE X is State)'
 ' UNION '
 ' (Any X WHERE X is Transition))')
 rqlst = self._prepare(rql)
 self.assertRaises(BadRQLQuery, self.o.generate, rqlst)
 def test_inline(self):
-for t in self._parse(INLINE):
+for rql, sql in INLINE:
-yield t
+with self.subTest(rql=rql):
+self._check(rql, sql)
 def test_has_text(self):
-for t in self._parse((
+for rql, sql in [
 ('Any X WHERE X has_text "toto tata"',
 """SELECT appears0.uid
 FROM appears AS appears0
 WHERE appears0.words @@ to_tsquery('default', 'toto&tata')"""),
 '''SELECT appears1.uid
 FROM appears AS appears1
 WHERE NOT (EXISTS(SELECT 1 FROM tags_relation AS rel_tags0 WHERE appears1.uid=rel_tags0.eid_to)) AND appears1.words @@ to_tsquery('default', 'pouet')
 '''),
-)):
+]:
-yield t
+with self.subTest(rql=rql):
+self._check(rql, sql)
 def test_from_clause_needed(self):
 queries = [("Any 1 WHERE EXISTS(T is CWGroup, T name 'managers')",
 '''SELECT 1
 WHERE EXISTS(SELECT 1 FROM cw_CWGroup AS _T WHERE _T.cw_name=managers)'''),
 ('Any X,Y WHERE NOT X created_by Y, X eid 5, Y eid 6',
 '''SELECT 5, 6
 WHERE NOT (EXISTS(SELECT 1 FROM created_by_relation AS rel_created_by0 WHERE rel_created_by0.eid_from=5 AND rel_created_by0.eid_to=6))'''),
 ]
-for t in self._parse(queries):
+for rql, sql in queries:
-yield t
+with self.subTest(rql=rql):
+self._check(rql, sql)
 def test_ambigous_exists_no_from_clause(self):
 self._check('Any COUNT(U) WHERE U eid 1, EXISTS (P owned_by U, P is IN (Note, Affaire))',
 '''SELECT COUNT(1)
 WHERE EXISTS(SELECT 1 FROM cw_Affaire AS _P, owned_by_relation AS rel_owned_by0 WHERE rel_owned_by0.eid_from=_P.cw_eid AND rel_owned_by0.eid_to=1 UNION SELECT 1 FROM cw_Note AS _P, owned_by_relation AS rel_owned_by1 WHERE rel_owned_by1.eid_from=_P.cw_eid AND rel_owned_by1.eid_to=1)''')
 backend = 'sqlserver2005'
 def _norm_sql(self, sql):
 return sql.strip().replace(' SUBSTR', ' SUBSTRING').replace(' || ', ' + ').replace(' ILIKE ', ' LIKE ')
 def test_has_text(self):
-for t in self._parse(HAS_TEXT_LG_INDEXER):
+for rql, sql in HAS_TEXT_LG_INDEXER:
-yield t
+with self.subTest(rql=rql):
+self._check(rql, sql)
 def test_regexp(self):
 self.skipTest('regexp-based pattern matching not implemented in sqlserver')
 def test_or_having_fake_terms_base(self):
 self._check("Any WEEKDAY(D) WHERE P is Personne, P creation_date D",
 '''SELECT DATEPART(WEEKDAY, _P.cw_creation_date)
 FROM cw_Personne AS _P''')
 def test_basic_parse(self):
-for t in self._parse(BASIC):# + BASIC_WITH_LIMIT):
+for rql, sql in BASIC:# + BASIC_WITH_LIMIT):
-yield t
+with self.subTest(rql=rql):
+self._check(rql, sql)
 def test_advanced_parse(self):
-for t in self._parse(ADVANCED):# + ADVANCED_WITH_LIMIT_OR_ORDERBY):
+for rql, sql in ADVANCED:# + ADVANCED_WITH_LIMIT_OR_ORDERBY):
-yield t
+with self.subTest(rql=rql):
+self._check(rql, sql)
 def test_limit_offset(self):
 WITH_LIMIT = [
 ("Personne P LIMIT 20 OFFSET 10",
 '''WITH orderedrows AS (
 _L01, _L02, _L03
 FROM orderedrows WHERE
 __RowNumber <= 1
 '''),
 ]
-for t in self._parse(WITH_LIMIT):# + ADVANCED_WITH_LIMIT_OR_ORDERBY):
+for rql, sql in WITH_LIMIT:# + ADVANCED_WITH_LIMIT_OR_ORDERBY):
-yield t
+with self.subTest(rql=rql):
+self._check(rql, sql)
 def test_cast(self):
 self._check("Any CAST(String, P) WHERE P is Personne",
 '''SELECT CAST(_P.cw_eid AS nvarchar(max))
 FROM cw_Personne AS _P''')
 FROM cw_CWAttribute AS _X
 GROUP BY DATEPART(YEAR, _X.cw_modification_date),DATEPART(MONTH, _X.cw_modification_date)
 ORDER BY 1''')
 def test_today(self):
-for t in self._parse([("Any X WHERE X creation_date TODAY, X is Affaire",
+for rql, sql in [
-'''SELECT _X.cw_eid
+("Any X WHERE X creation_date TODAY, X is Affaire",
+'''SELECT _X.cw_eid
 FROM cw_Affaire AS _X
 WHERE DATE(_X.cw_creation_date)=%s''' % self.dbhelper.sql_current_date()),
 ("Personne P where not P datenaiss TODAY",
 '''SELECT _P.cw_eid
 FROM cw_Personne AS _P
 WHERE NOT (DATE(_P.cw_datenaiss)=%s)''' % self.dbhelper.sql_current_date()),
-]):
+]:
-yield t
+with self.subTest(rql=rql):
+self._check(rql, sql)
 class SqliteSQLGeneratorTC(PostgresSQLGeneratorTC):
 backend = 'sqlite'
 '''SELECT _X.cw_eid
 FROM cw_CWUser AS _X
 WHERE _X.cw_login REGEXP [0-9].*
 ''')
 def test_union(self):
-for t in self._parse((
+for rql, sql in [
 ('(Any N ORDERBY 1 WHERE X name N, X is State)'
 ' UNION '
 '(Any NN ORDERBY 1 WHERE XX name NN, XX is Transition)',
 '''SELECT _X.cw_name
 FROM cw_State AS _X
 ORDER BY 1
 UNION ALL
 SELECT _XX.cw_name
 FROM cw_Transition AS _XX
 ORDER BY 1'''),
-)):
+]:
-yield t
+with self.subTest(rql=rql):
+self._check(rql, sql)
 def test_subquery(self):
 # NOTE: no paren around UNION with sqlitebackend
-for t in self._parse((
+for rql, sql in [
 ('Any N ORDERBY 1 WITH N BEING '
 '((Any N WHERE X name N, X is State)'
 ' UNION '
 '(Any NN WHERE XX name NN, XX is Transition))',
 '''SELECT _T0.C0
 UNION ALL
 SELECT _X.cw_eid AS C0, _X.cw_name AS C1
 FROM cw_Transition AS _X) AS _T0
 GROUP BY _T0.C1
 HAVING COUNT(_T0.C0)>1'''),
-)):
+]:
-yield t
+with self.subTest(rql=rql):
+self._check(rql, sql)
 def test_has_text(self):
-for t in self._parse((
+for rql, sql in [
 ('Any X WHERE X has_text "toto tata"',
 """SELECT DISTINCT appears0.uid
 FROM appears AS appears0
 WHERE appears0.word_id IN (SELECT word_id FROM word WHERE word in ('toto', 'tata'))"""),
 ('Any X, FTIRANK(X) WHERE X has_text "toto tata"',
 """SELECT DISTINCT appears0.uid, 1.0
 FROM appears AS appears0
 WHERE appears0.word_id IN (SELECT word_id FROM word WHERE word in ('toto', 'tata'))"""),
-)):
+]:
-yield t
+with self.subTest(rql=rql):
+self._check(rql, sql)
 def test_or_having_fake_terms_base(self):
 self._check('Any X WHERE X is CWUser, X creation_date D HAVING YEAR(D) = "2010" OR D = NULL',
 '''SELECT _X.cw_eid
 FROM cw_CWAttribute AS _X
 GROUP BY YEAR(_X.cw_modification_date),MONTH(_X.cw_modification_date)
 ORDER BY 1'''),
 def test_today(self):
-for t in self._parse([("Any X WHERE X creation_date TODAY, X is Affaire",
+for rql, sql in [
-'''SELECT _X.cw_eid
+("Any X WHERE X creation_date TODAY, X is Affaire",
+'''SELECT _X.cw_eid
 FROM cw_Affaire AS _X
 WHERE DATE(_X.cw_creation_date)=CURRENT_DATE'''),
 ("Personne P where not P datenaiss TODAY",
 '''SELECT _P.cw_eid
 FROM cw_Personne AS _P
 WHERE NOT (DATE(_P.cw_datenaiss)=CURRENT_DATE)'''),
-]):
+]:
-yield t
+with self.subTest(rql=rql):
+self._check(rql, sql)
 class MySQLGenerator(PostgresSQLGeneratorTC):
 backend = 'mysql'
 ('Any X,Y WHERE NOT X created_by Y, X eid 5, Y eid 6',
 '''SELECT 5, 6
 FROM (SELECT 1) AS _T
 WHERE NOT (EXISTS(SELECT 1 FROM created_by_relation AS rel_created_by0 WHERE rel_created_by0.eid_from=5 AND rel_created_by0.eid_to=6))'''),
 ]
-for t in self._parse(queries):
+for rql, sql in queries:
-yield t
+with self.subTest(rql=rql):
+self._check(rql, sql)
 def test_has_text(self):
 queries = [
 ('Any X WHERE X has_text "toto tata"',
 SELECT _X.cw_eid
 FROM appears AS appears0, cw_Folder AS _X
 WHERE MATCH (appears0.words) AGAINST ('toto tata' IN BOOLEAN MODE) AND appears0.uid=_X.cw_eid AND _X.cw_name=tutu
 """)
 ]
-for t in self._parse(queries):
+for rql, sql in queries:
-yield t
+with self.subTest(rql=rql):
+self._check(rql, sql)
 def test_ambigous_exists_no_from_clause(self):
 self._check('Any COUNT(U) WHERE U eid 1, EXISTS (P owned_by U, P is IN (Note, Affaire))',
 '''SELECT COUNT(1)
 FROM cw_CWAttribute AS _X
 GROUP BY EXTRACT(YEAR from _X.cw_modification_date),EXTRACT(MONTH from _X.cw_modification_date)
 ORDER BY 1'''),
 def test_today(self):
-for t in self._parse([("Any X WHERE X creation_date TODAY, X is Affaire",
+for rql, sql in [
-'''SELECT _X.cw_eid
+("Any X WHERE X creation_date TODAY, X is Affaire",
+'''SELECT _X.cw_eid
 FROM cw_Affaire AS _X
 WHERE DATE(_X.cw_creation_date)=CURRENT_DATE'''),
+("Personne P where not P datenaiss TODAY",
-("Personne P where not P datenaiss TODAY",
+'''SELECT _P.cw_eid
-'''SELECT _P.cw_eid
 FROM cw_Personne AS _P
 WHERE NOT (DATE(_P.cw_datenaiss)=CURRENT_DATE)'''),
-]):
+]:
-yield t
+with self.subTest(rql=rql):
+self._check(rql, sql)
 class removeUnsusedSolutionsTC(TestCase):
 def test_invariant_not_varying(self):
 rqlst = mock_object(defined_vars={})
 rqlst.defined_vars['A'] = mock_object(scope=rqlst, stinfo={}, _q_invariant=True)

changeset 11077	09be48c01fa4
parent 11057	0b59724cb3f2
child 11237	f32134dd0067