# HG changeset patch # User Sylvain Thénault # Date 1256108154 -7200 # Node ID e416186fb91cc3d3a2b763d52a8561262f479b38 # Parent 2c3b72faf05d883ceee01cb6580d2dbc9e870fcb prefix sql aliases for entity table by '_' to avoid pb with variable such as 'AS' (eg a keyword in SQL) diff -r 2c3b72faf05d -r e416186fb91c server/sources/rql2sql.py --- a/server/sources/rql2sql.py Tue Oct 20 19:19:19 2009 +0200 +++ b/server/sources/rql2sql.py Wed Oct 21 08:55:54 2009 +0200 @@ -916,7 +916,7 @@ elif not lhsvar.name in self._varmap: # join on entities instead of etype's table to get result for # external entities on multisources configurations - ealias = lhsvar._q_sqltable = lhsvar.name + ealias = lhsvar._q_sqltable = '_' + lhsvar.name jointo = lhsvar._q_sql = '%s.eid' % ealias self.add_table('entities AS %s' % ealias, ealias) if not lhsvar._q_invariant or len(lhsvar.stinfo['possibletypes']) == 1: @@ -1038,7 +1038,7 @@ # since variable is invariant, we know we won't found final relation principal = variable.stinfo['principal'] if principal is None: - vtablename = variable.name + vtablename = '_' + variable.name self.add_table('entities AS %s' % vtablename, vtablename) sql = '%s.eid' % vtablename if variable.stinfo['typerels']: @@ -1098,20 +1098,20 @@ scope = -1 try: sql = self._varmap[var.name] - table = sql.split('.', 1)[0] + tablealias = sql.split('.', 1)[0] if scope < 0: - scope = self._varmap_table_scope(var.stmt, table) - self.add_table(table, scope=scope) + scope = self._varmap_table_scope(var.stmt, tablealias) + self.add_table(tablealias, scope=scope) except KeyError: etype = self._state.solution[var.name] # XXX this check should be moved in rql.stcheck if self.schema.eschema(etype).final: raise BadRQLQuery(var.stmt.root) - table = var.name - sql = '%s.%seid' % (table, SQL_PREFIX) - self.add_table('%s%s AS %s' % (SQL_PREFIX, etype, table), table, - scope=scope) - return sql, table + tablealias = '_' + var.name + sql = '%s.%seid' % (tablealias, SQL_PREFIX) + self.add_table('%s%s AS %s' % (SQL_PREFIX, etype, tablealias), + tablealias, scope=scope) + return sql, tablealias def _inlined_var_sql(self, var, rtype): try: diff -r 2c3b72faf05d -r e416186fb91c server/test/unittest_rql2sql.py --- a/server/test/unittest_rql2sql.py Tue Oct 20 19:19:19 2009 +0200 +++ b/server/test/unittest_rql2sql.py Wed Oct 21 08:55:54 2009 +0200 @@ -38,111 +38,115 @@ PARSER = [ (r"Personne P WHERE P nom 'Zig\'oto';", - '''SELECT P.cw_eid -FROM cw_Personne AS P -WHERE P.cw_nom=Zig\'oto'''), + '''SELECT _P.cw_eid +FROM cw_Personne AS _P +WHERE _P.cw_nom=Zig\'oto'''), (r'Personne P WHERE P nom ~= "Zig\"oto%";', - '''SELECT P.cw_eid -FROM cw_Personne AS P -WHERE P.cw_nom ILIKE Zig"oto%'''), + '''SELECT _P.cw_eid +FROM cw_Personne AS _P +WHERE _P.cw_nom ILIKE Zig"oto%'''), ] BASIC = [ + ("Any AS WHERE AS is Affaire", + '''SELECT _AS.cw_eid +FROM cw_Affaire AS _AS'''), + ("Any X WHERE X is Affaire", - '''SELECT X.cw_eid -FROM cw_Affaire AS X'''), + '''SELECT _X.cw_eid +FROM cw_Affaire AS _X'''), ("Any X WHERE X eid 0", '''SELECT 0'''), ("Personne P", - '''SELECT P.cw_eid -FROM cw_Personne AS P'''), + '''SELECT _P.cw_eid +FROM cw_Personne AS _P'''), ("Personne P WHERE P test TRUE", - '''SELECT P.cw_eid -FROM cw_Personne AS P -WHERE P.cw_test=TRUE'''), + '''SELECT _P.cw_eid +FROM cw_Personne AS _P +WHERE _P.cw_test=TRUE'''), ("Personne P WHERE P test false", - '''SELECT P.cw_eid -FROM cw_Personne AS P -WHERE P.cw_test=FALSE'''), + '''SELECT _P.cw_eid +FROM cw_Personne AS _P +WHERE _P.cw_test=FALSE'''), ("Personne P WHERE P eid -1", '''SELECT -1'''), ("Personne P LIMIT 20 OFFSET 10", - '''SELECT P.cw_eid -FROM cw_Personne AS P + '''SELECT _P.cw_eid +FROM cw_Personne AS _P LIMIT 20 OFFSET 10'''), ("Personne P WHERE S is Societe, P travaille S, S nom 'Logilab';", '''SELECT rel_travaille0.eid_from -FROM cw_Societe AS S, travaille_relation AS rel_travaille0 -WHERE rel_travaille0.eid_to=S.cw_eid AND S.cw_nom=Logilab'''), +FROM cw_Societe AS _S, travaille_relation AS rel_travaille0 +WHERE rel_travaille0.eid_to=_S.cw_eid AND _S.cw_nom=Logilab'''), ("Personne P WHERE P concerne A, A concerne S, S nom 'Logilab', S is Societe;", '''SELECT rel_concerne0.eid_from -FROM concerne_relation AS rel_concerne0, concerne_relation AS rel_concerne1, cw_Societe AS S -WHERE rel_concerne0.eid_to=rel_concerne1.eid_from AND rel_concerne1.eid_to=S.cw_eid AND S.cw_nom=Logilab'''), +FROM concerne_relation AS rel_concerne0, concerne_relation AS rel_concerne1, cw_Societe AS _S +WHERE rel_concerne0.eid_to=rel_concerne1.eid_from AND rel_concerne1.eid_to=_S.cw_eid AND _S.cw_nom=Logilab'''), ("Note N WHERE X evaluee N, X nom 'Logilab';", '''SELECT rel_evaluee0.eid_to -FROM cw_Division AS X, evaluee_relation AS rel_evaluee0 -WHERE rel_evaluee0.eid_from=X.cw_eid AND X.cw_nom=Logilab +FROM cw_Division AS _X, evaluee_relation AS rel_evaluee0 +WHERE rel_evaluee0.eid_from=_X.cw_eid AND _X.cw_nom=Logilab UNION ALL SELECT rel_evaluee0.eid_to -FROM cw_Personne AS X, evaluee_relation AS rel_evaluee0 -WHERE rel_evaluee0.eid_from=X.cw_eid AND X.cw_nom=Logilab +FROM cw_Personne AS _X, evaluee_relation AS rel_evaluee0 +WHERE rel_evaluee0.eid_from=_X.cw_eid AND _X.cw_nom=Logilab UNION ALL SELECT rel_evaluee0.eid_to -FROM cw_Societe AS X, evaluee_relation AS rel_evaluee0 -WHERE rel_evaluee0.eid_from=X.cw_eid AND X.cw_nom=Logilab +FROM cw_Societe AS _X, evaluee_relation AS rel_evaluee0 +WHERE rel_evaluee0.eid_from=_X.cw_eid AND _X.cw_nom=Logilab UNION ALL SELECT rel_evaluee0.eid_to -FROM cw_SubDivision AS X, evaluee_relation AS rel_evaluee0 -WHERE rel_evaluee0.eid_from=X.cw_eid AND X.cw_nom=Logilab'''), +FROM cw_SubDivision AS _X, evaluee_relation AS rel_evaluee0 +WHERE rel_evaluee0.eid_from=_X.cw_eid AND _X.cw_nom=Logilab'''), ("Note N WHERE X evaluee N, X nom in ('Logilab', 'Caesium');", '''SELECT rel_evaluee0.eid_to -FROM cw_Division AS X, evaluee_relation AS rel_evaluee0 -WHERE rel_evaluee0.eid_from=X.cw_eid AND X.cw_nom IN(Logilab, Caesium) +FROM cw_Division AS _X, evaluee_relation AS rel_evaluee0 +WHERE rel_evaluee0.eid_from=_X.cw_eid AND _X.cw_nom IN(Logilab, Caesium) UNION ALL SELECT rel_evaluee0.eid_to -FROM cw_Personne AS X, evaluee_relation AS rel_evaluee0 -WHERE rel_evaluee0.eid_from=X.cw_eid AND X.cw_nom IN(Logilab, Caesium) +FROM cw_Personne AS _X, evaluee_relation AS rel_evaluee0 +WHERE rel_evaluee0.eid_from=_X.cw_eid AND _X.cw_nom IN(Logilab, Caesium) UNION ALL SELECT rel_evaluee0.eid_to -FROM cw_Societe AS X, evaluee_relation AS rel_evaluee0 -WHERE rel_evaluee0.eid_from=X.cw_eid AND X.cw_nom IN(Logilab, Caesium) +FROM cw_Societe AS _X, evaluee_relation AS rel_evaluee0 +WHERE rel_evaluee0.eid_from=_X.cw_eid AND _X.cw_nom IN(Logilab, Caesium) UNION ALL SELECT rel_evaluee0.eid_to -FROM cw_SubDivision AS X, evaluee_relation AS rel_evaluee0 -WHERE rel_evaluee0.eid_from=X.cw_eid AND X.cw_nom IN(Logilab, Caesium)'''), +FROM cw_SubDivision AS _X, evaluee_relation AS rel_evaluee0 +WHERE rel_evaluee0.eid_from=_X.cw_eid AND _X.cw_nom IN(Logilab, Caesium)'''), ("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'''), + '''SELECT _X.cw_eid +FROM cw_Affaire AS _X +WHERE DATE(_X.cw_creation_date)=CURRENT_DATE'''), ("Any N WHERE G is CWGroup, G name N, E eid 12, E read_permission G", - '''SELECT G.cw_name -FROM cw_CWGroup AS G, read_permission_relation AS rel_read_permission0 -WHERE rel_read_permission0.eid_from=12 AND rel_read_permission0.eid_to=G.cw_eid'''), + '''SELECT _G.cw_name +FROM cw_CWGroup AS _G, read_permission_relation AS rel_read_permission0 +WHERE rel_read_permission0.eid_from=12 AND rel_read_permission0.eid_to=_G.cw_eid'''), ('Any Y WHERE U login "admin", U login Y', # stupid but valid... - """SELECT U.cw_login -FROM cw_CWUser AS U -WHERE U.cw_login=admin"""), + """SELECT _U.cw_login +FROM cw_CWUser AS _U +WHERE _U.cw_login=admin"""), ('Any T WHERE T tags X, X is State', '''SELECT rel_tags0.eid_from -FROM cw_State AS X, tags_relation AS rel_tags0 -WHERE rel_tags0.eid_to=X.cw_eid'''), +FROM cw_State AS _X, tags_relation AS rel_tags0 +WHERE rel_tags0.eid_to=_X.cw_eid'''), ('Any X,Y WHERE X eid 0, Y eid 1, X concerne Y', '''SELECT 0, 1 @@ -151,39 +155,39 @@ ("Any X WHERE X prenom 'lulu'," "EXISTS(X owned_by U, U in_group G, G name 'lulufanclub' OR G name 'managers');", - '''SELECT X.cw_eid -FROM cw_Personne AS X -WHERE X.cw_prenom=lulu AND EXISTS(SELECT 1 FROM owned_by_relation AS rel_owned_by0, in_group_relation AS rel_in_group1, cw_CWGroup AS G WHERE rel_owned_by0.eid_from=X.cw_eid AND rel_in_group1.eid_from=rel_owned_by0.eid_to AND rel_in_group1.eid_to=G.cw_eid AND ((G.cw_name=lulufanclub) OR (G.cw_name=managers)))'''), + '''SELECT _X.cw_eid +FROM cw_Personne AS _X +WHERE _X.cw_prenom=lulu AND EXISTS(SELECT 1 FROM owned_by_relation AS rel_owned_by0, in_group_relation AS rel_in_group1, cw_CWGroup AS _G WHERE rel_owned_by0.eid_from=_X.cw_eid AND rel_in_group1.eid_from=rel_owned_by0.eid_to AND rel_in_group1.eid_to=_G.cw_eid AND ((_G.cw_name=lulufanclub) OR (_G.cw_name=managers)))'''), ("Any X WHERE X prenom 'lulu'," "NOT EXISTS(X owned_by U, U in_group G, G name 'lulufanclub' OR G name 'managers');", - '''SELECT X.cw_eid -FROM cw_Personne AS X -WHERE X.cw_prenom=lulu AND NOT EXISTS(SELECT 1 FROM owned_by_relation AS rel_owned_by0, in_group_relation AS rel_in_group1, cw_CWGroup AS G WHERE rel_owned_by0.eid_from=X.cw_eid AND rel_in_group1.eid_from=rel_owned_by0.eid_to AND rel_in_group1.eid_to=G.cw_eid AND ((G.cw_name=lulufanclub) OR (G.cw_name=managers)))'''), + '''SELECT _X.cw_eid +FROM cw_Personne AS _X +WHERE _X.cw_prenom=lulu AND NOT EXISTS(SELECT 1 FROM owned_by_relation AS rel_owned_by0, in_group_relation AS rel_in_group1, cw_CWGroup AS _G WHERE rel_owned_by0.eid_from=_X.cw_eid AND rel_in_group1.eid_from=rel_owned_by0.eid_to AND rel_in_group1.eid_to=_G.cw_eid AND ((_G.cw_name=lulufanclub) OR (_G.cw_name=managers)))'''), ] ADVANCED= [ ("Societe S WHERE S nom 'Logilab' OR S nom 'Caesium'", - '''SELECT S.cw_eid -FROM cw_Societe AS S -WHERE ((S.cw_nom=Logilab) OR (S.cw_nom=Caesium))'''), + '''SELECT _S.cw_eid +FROM cw_Societe AS _S +WHERE ((_S.cw_nom=Logilab) OR (_S.cw_nom=Caesium))'''), ('Any X WHERE X nom "toto", X eid IN (9700, 9710, 1045, 674)', - '''SELECT X.cw_eid -FROM cw_Division AS X -WHERE X.cw_nom=toto AND X.cw_eid IN(9700, 9710, 1045, 674) + '''SELECT _X.cw_eid +FROM cw_Division AS _X +WHERE _X.cw_nom=toto AND _X.cw_eid IN(9700, 9710, 1045, 674) UNION ALL -SELECT X.cw_eid -FROM cw_Personne AS X -WHERE X.cw_nom=toto AND X.cw_eid IN(9700, 9710, 1045, 674) +SELECT _X.cw_eid +FROM cw_Personne AS _X +WHERE _X.cw_nom=toto AND _X.cw_eid IN(9700, 9710, 1045, 674) UNION ALL -SELECT X.cw_eid -FROM cw_Societe AS X -WHERE X.cw_nom=toto AND X.cw_eid IN(9700, 9710, 1045, 674) +SELECT _X.cw_eid +FROM cw_Societe AS _X +WHERE _X.cw_nom=toto AND _X.cw_eid IN(9700, 9710, 1045, 674) UNION ALL -SELECT X.cw_eid -FROM cw_SubDivision AS X -WHERE X.cw_nom=toto AND X.cw_eid IN(9700, 9710, 1045, 674)'''), +SELECT _X.cw_eid +FROM cw_SubDivision AS _X +WHERE _X.cw_nom=toto AND _X.cw_eid IN(9700, 9710, 1045, 674)'''), ('Any Y, COUNT(N) GROUPBY Y WHERE Y evaluee N;', '''SELECT rel_evaluee0.eid_from, COUNT(rel_evaluee0.eid_to) @@ -191,34 +195,34 @@ GROUP BY rel_evaluee0.eid_from'''), ("Any X WHERE X concerne B or C concerne X", - '''SELECT X.cw_eid -FROM concerne_relation AS rel_concerne0, concerne_relation AS rel_concerne1, cw_Affaire AS X -WHERE ((rel_concerne0.eid_from=X.cw_eid) OR (rel_concerne1.eid_to=X.cw_eid))'''), + '''SELECT _X.cw_eid +FROM concerne_relation AS rel_concerne0, concerne_relation AS rel_concerne1, cw_Affaire AS _X +WHERE ((rel_concerne0.eid_from=_X.cw_eid) OR (rel_concerne1.eid_to=_X.cw_eid))'''), ("Any X WHERE X travaille S or X concerne A", - '''SELECT X.cw_eid -FROM concerne_relation AS rel_concerne1, cw_Personne AS X, travaille_relation AS rel_travaille0 -WHERE ((rel_travaille0.eid_from=X.cw_eid) OR (rel_concerne1.eid_from=X.cw_eid))'''), + '''SELECT _X.cw_eid +FROM concerne_relation AS rel_concerne1, cw_Personne AS _X, travaille_relation AS rel_travaille0 +WHERE ((rel_travaille0.eid_from=_X.cw_eid) OR (rel_concerne1.eid_from=_X.cw_eid))'''), ("Any N WHERE A evaluee N or N ecrit_par P", - '''SELECT N.cw_eid -FROM cw_Note AS N, evaluee_relation AS rel_evaluee0 -WHERE ((rel_evaluee0.eid_to=N.cw_eid) OR (N.cw_ecrit_par IS NOT NULL))'''), + '''SELECT _N.cw_eid +FROM cw_Note AS _N, evaluee_relation AS rel_evaluee0 +WHERE ((rel_evaluee0.eid_to=_N.cw_eid) OR (_N.cw_ecrit_par IS NOT NULL))'''), ("Any N WHERE A evaluee N or EXISTS(N todo_by U)", - '''SELECT N.cw_eid -FROM cw_Note AS N, evaluee_relation AS rel_evaluee0 -WHERE ((rel_evaluee0.eid_to=N.cw_eid) OR (EXISTS(SELECT 1 FROM todo_by_relation AS rel_todo_by1 WHERE rel_todo_by1.eid_from=N.cw_eid)))'''), + '''SELECT _N.cw_eid +FROM cw_Note AS _N, evaluee_relation AS rel_evaluee0 +WHERE ((rel_evaluee0.eid_to=_N.cw_eid) OR (EXISTS(SELECT 1 FROM todo_by_relation AS rel_todo_by1 WHERE rel_todo_by1.eid_from=_N.cw_eid)))'''), ("Any N WHERE A evaluee N or N todo_by U", - '''SELECT N.cw_eid -FROM cw_Note AS N, evaluee_relation AS rel_evaluee0, todo_by_relation AS rel_todo_by1 -WHERE ((rel_evaluee0.eid_to=N.cw_eid) OR (rel_todo_by1.eid_from=N.cw_eid))'''), + '''SELECT _N.cw_eid +FROM cw_Note AS _N, evaluee_relation AS rel_evaluee0, todo_by_relation AS rel_todo_by1 +WHERE ((rel_evaluee0.eid_to=_N.cw_eid) OR (rel_todo_by1.eid_from=_N.cw_eid))'''), ("Any X WHERE X concerne B or C concerne X, B eid 12, C eid 13", - '''SELECT X.cw_eid -FROM concerne_relation AS rel_concerne0, concerne_relation AS rel_concerne1, cw_Affaire AS X -WHERE ((rel_concerne0.eid_from=X.cw_eid AND rel_concerne0.eid_to=12) OR (rel_concerne1.eid_from=13 AND rel_concerne1.eid_to=X.cw_eid))'''), + '''SELECT _X.cw_eid +FROM concerne_relation AS rel_concerne0, concerne_relation AS rel_concerne1, cw_Affaire AS _X +WHERE ((rel_concerne0.eid_from=_X.cw_eid AND rel_concerne0.eid_to=12) OR (rel_concerne1.eid_from=13 AND rel_concerne1.eid_to=_X.cw_eid))'''), ('Any X WHERE X created_by U, X concerne B OR C concerne X, B eid 12, C eid 13', '''SELECT rel_created_by0.eid_from @@ -226,9 +230,9 @@ WHERE ((rel_concerne1.eid_from=rel_created_by0.eid_from AND rel_concerne1.eid_to=12) OR (rel_concerne2.eid_from=13 AND rel_concerne2.eid_to=rel_created_by0.eid_from))'''), ('Any P WHERE P travaille_subdivision S1 OR P travaille_subdivision S2, S1 nom "logilab", S2 nom "caesium"', - '''SELECT P.cw_eid -FROM cw_Personne AS P, cw_SubDivision AS S1, cw_SubDivision AS S2, travaille_subdivision_relation AS rel_travaille_subdivision0, travaille_subdivision_relation AS rel_travaille_subdivision1 -WHERE ((rel_travaille_subdivision0.eid_from=P.cw_eid AND rel_travaille_subdivision0.eid_to=S1.cw_eid) OR (rel_travaille_subdivision1.eid_from=P.cw_eid AND rel_travaille_subdivision1.eid_to=S2.cw_eid)) AND S1.cw_nom=logilab AND S2.cw_nom=caesium'''), + '''SELECT _P.cw_eid +FROM cw_Personne AS _P, cw_SubDivision AS _S1, cw_SubDivision AS _S2, travaille_subdivision_relation AS rel_travaille_subdivision0, travaille_subdivision_relation AS rel_travaille_subdivision1 +WHERE ((rel_travaille_subdivision0.eid_from=_P.cw_eid AND rel_travaille_subdivision0.eid_to=_S1.cw_eid) OR (rel_travaille_subdivision1.eid_from=_P.cw_eid AND rel_travaille_subdivision1.eid_to=_S2.cw_eid)) AND _S1.cw_nom=logilab AND _S2.cw_nom=caesium'''), ('Any X WHERE T tags X', '''SELECT rel_tags0.eid_to @@ -240,31 +244,31 @@ WHERE rel_in_basket0.eid_to=12'''), ('Any SEN,RN,OEN WHERE X from_entity SE, SE eid 44, X relation_type R, R eid 139, X to_entity OE, OE eid 42, R name RN, SE name SEN, OE name OEN', - '''SELECT SE.cw_name, R.cw_name, OE.cw_name -FROM cw_CWAttribute AS X, cw_CWEType AS OE, cw_CWEType AS SE, cw_CWRType AS R -WHERE X.cw_from_entity=44 AND SE.cw_eid=44 AND X.cw_relation_type=139 AND R.cw_eid=139 AND X.cw_to_entity=42 AND OE.cw_eid=42 + '''SELECT _SE.cw_name, _R.cw_name, _OE.cw_name +FROM cw_CWAttribute AS _X, cw_CWEType AS _OE, cw_CWEType AS _SE, cw_CWRType AS _R +WHERE _X.cw_from_entity=44 AND _SE.cw_eid=44 AND _X.cw_relation_type=139 AND _R.cw_eid=139 AND _X.cw_to_entity=42 AND _OE.cw_eid=42 UNION ALL -SELECT SE.cw_name, R.cw_name, OE.cw_name -FROM cw_CWEType AS OE, cw_CWEType AS SE, cw_CWRType AS R, cw_CWRelation AS X -WHERE X.cw_from_entity=44 AND SE.cw_eid=44 AND X.cw_relation_type=139 AND R.cw_eid=139 AND X.cw_to_entity=42 AND OE.cw_eid=42'''), +SELECT _SE.cw_name, _R.cw_name, _OE.cw_name +FROM cw_CWEType AS _OE, cw_CWEType AS _SE, cw_CWRType AS _R, cw_CWRelation AS _X +WHERE _X.cw_from_entity=44 AND _SE.cw_eid=44 AND _X.cw_relation_type=139 AND _R.cw_eid=139 AND _X.cw_to_entity=42 AND _OE.cw_eid=42'''), # Any O WHERE NOT S corrected_in O, S eid %(x)s, S concerns P, O version_of P, O in_state ST, NOT ST name "published", O modification_date MTIME ORDERBY MTIME DESC LIMIT 9 ('Any O WHERE NOT S ecrit_par O, S eid 1, S inline1 P, O inline2 P', - '''SELECT O.cw_eid -FROM cw_Note AS S, cw_Personne AS O -WHERE NOT EXISTS(SELECT 1 WHERE S.cw_ecrit_par=O.cw_eid) AND S.cw_eid=1 AND O.cw_inline2=S.cw_inline1'''), + '''SELECT _O.cw_eid +FROM cw_Note AS _S, cw_Personne AS _O +WHERE NOT EXISTS(SELECT 1 WHERE _S.cw_ecrit_par=_O.cw_eid) AND _S.cw_eid=1 AND _O.cw_inline2=_S.cw_inline1'''), ('DISTINCT Any S ORDERBY stockproc(SI) WHERE NOT S ecrit_par O, S para SI', - '''SELECT T1.C0 FROM (SELECT DISTINCT S.cw_eid AS C0, STOCKPROC(S.cw_para) AS C1 -FROM cw_Note AS S -WHERE S.cw_ecrit_par IS NULL + '''SELECT T1.C0 FROM (SELECT DISTINCT _S.cw_eid AS C0, STOCKPROC(_S.cw_para) AS C1 +FROM cw_Note AS _S +WHERE _S.cw_ecrit_par IS NULL ORDER BY 2) AS T1'''), ('Any N WHERE N todo_by U, N is Note, U eid 2, N filed_under T, T eid 3', # N would actually be invarient if U eid 2 had given a specific type to U - '''SELECT N.cw_eid -FROM cw_Note AS N, filed_under_relation AS rel_filed_under1, todo_by_relation AS rel_todo_by0 -WHERE rel_todo_by0.eid_from=N.cw_eid AND rel_todo_by0.eid_to=2 AND rel_filed_under1.eid_from=N.cw_eid AND rel_filed_under1.eid_to=3'''), + '''SELECT _N.cw_eid +FROM cw_Note AS _N, filed_under_relation AS rel_filed_under1, todo_by_relation AS rel_todo_by0 +WHERE rel_todo_by0.eid_from=_N.cw_eid AND rel_todo_by0.eid_to=2 AND rel_filed_under1.eid_from=_N.cw_eid AND rel_filed_under1.eid_to=3'''), ('Any N WHERE N todo_by U, U eid 2, P evaluee N, P eid 3', '''SELECT rel_evaluee1.eid_to @@ -278,254 +282,254 @@ WHERE rel_owned_by0.eid_from=1 AND NOT EXISTS(SELECT 1 FROM owned_by_relation AS rel_owned_by1 WHERE rel_owned_by1.eid_from=2 AND rel_owned_by0.eid_to=rel_owned_by1.eid_to)'''), ('Any GN WHERE X in_group G, G name GN, (G name "managers" OR EXISTS(X copain T, T login in ("comme", "cochon")))', - '''SELECT G.cw_name -FROM cw_CWGroup AS G, in_group_relation AS rel_in_group0 -WHERE rel_in_group0.eid_to=G.cw_eid AND ((G.cw_name=managers) OR (EXISTS(SELECT 1 FROM copain_relation AS rel_copain1, cw_CWUser AS T WHERE rel_copain1.eid_from=rel_in_group0.eid_from AND rel_copain1.eid_to=T.cw_eid AND T.cw_login IN(comme, cochon))))'''), + '''SELECT _G.cw_name +FROM cw_CWGroup AS _G, in_group_relation AS rel_in_group0 +WHERE rel_in_group0.eid_to=_G.cw_eid AND ((_G.cw_name=managers) OR (EXISTS(SELECT 1 FROM copain_relation AS rel_copain1, cw_CWUser AS _T WHERE rel_copain1.eid_from=rel_in_group0.eid_from AND rel_copain1.eid_to=_T.cw_eid AND _T.cw_login IN(comme, cochon))))'''), ('Any C WHERE C is Card, EXISTS(X documented_by C)', - """SELECT C.cw_eid -FROM cw_Card AS C -WHERE EXISTS(SELECT 1 FROM documented_by_relation AS rel_documented_by0 WHERE rel_documented_by0.eid_to=C.cw_eid)"""), + """SELECT _C.cw_eid +FROM cw_Card AS _C +WHERE EXISTS(SELECT 1 FROM documented_by_relation AS rel_documented_by0 WHERE rel_documented_by0.eid_to=_C.cw_eid)"""), ('Any C WHERE C is Card, EXISTS(X documented_by C, X eid 12)', - """SELECT C.cw_eid -FROM cw_Card AS C -WHERE EXISTS(SELECT 1 FROM documented_by_relation AS rel_documented_by0 WHERE rel_documented_by0.eid_from=12 AND rel_documented_by0.eid_to=C.cw_eid)"""), + """SELECT _C.cw_eid +FROM cw_Card AS _C +WHERE EXISTS(SELECT 1 FROM documented_by_relation AS rel_documented_by0 WHERE rel_documented_by0.eid_from=12 AND rel_documented_by0.eid_to=_C.cw_eid)"""), ('Any T WHERE C is Card, C title T, EXISTS(X documented_by C, X eid 12)', - """SELECT C.cw_title -FROM cw_Card AS C -WHERE EXISTS(SELECT 1 FROM documented_by_relation AS rel_documented_by0 WHERE rel_documented_by0.eid_from=12 AND rel_documented_by0.eid_to=C.cw_eid)"""), + """SELECT _C.cw_title +FROM cw_Card AS _C +WHERE EXISTS(SELECT 1 FROM documented_by_relation AS rel_documented_by0 WHERE rel_documented_by0.eid_from=12 AND rel_documented_by0.eid_to=_C.cw_eid)"""), ('Any GN,L WHERE X in_group G, X login L, G name GN, EXISTS(X copain T, T login L, T login IN("comme", "cochon"))', - '''SELECT G.cw_name, X.cw_login -FROM cw_CWGroup AS G, cw_CWUser AS X, in_group_relation AS rel_in_group0 -WHERE rel_in_group0.eid_from=X.cw_eid AND rel_in_group0.eid_to=G.cw_eid AND EXISTS(SELECT 1 FROM copain_relation AS rel_copain1, cw_CWUser AS T WHERE rel_copain1.eid_from=X.cw_eid AND rel_copain1.eid_to=T.cw_eid AND T.cw_login=X.cw_login AND T.cw_login IN(comme, cochon))'''), + '''SELECT _G.cw_name, _X.cw_login +FROM cw_CWGroup AS _G, cw_CWUser AS _X, in_group_relation AS rel_in_group0 +WHERE rel_in_group0.eid_from=_X.cw_eid AND rel_in_group0.eid_to=_G.cw_eid AND EXISTS(SELECT 1 FROM copain_relation AS rel_copain1, cw_CWUser AS _T WHERE rel_copain1.eid_from=_X.cw_eid AND rel_copain1.eid_to=_T.cw_eid AND _T.cw_login=_X.cw_login AND _T.cw_login IN(comme, cochon))'''), ('Any X,S, MAX(T) GROUPBY X,S ORDERBY S WHERE X is CWUser, T tags X, S eid IN(32), X in_state S', - '''SELECT X.cw_eid, 32, MAX(rel_tags0.eid_from) -FROM cw_CWUser AS X, tags_relation AS rel_tags0 -WHERE rel_tags0.eid_to=X.cw_eid AND X.cw_in_state=32 -GROUP BY X.cw_eid'''), + '''SELECT _X.cw_eid, 32, MAX(rel_tags0.eid_from) +FROM cw_CWUser AS _X, tags_relation AS rel_tags0 +WHERE rel_tags0.eid_to=_X.cw_eid AND _X.cw_in_state=32 +GROUP BY _X.cw_eid'''), ('Any COUNT(S),CS GROUPBY CS ORDERBY 1 DESC LIMIT 10 WHERE S is Affaire, C is Societe, S concerne C, C nom CS, (EXISTS(S owned_by 1)) OR (EXISTS(S documented_by N, N title "published"))', - '''SELECT COUNT(rel_concerne0.eid_from), C.cw_nom -FROM concerne_relation AS rel_concerne0, cw_Societe AS C -WHERE rel_concerne0.eid_to=C.cw_eid AND ((EXISTS(SELECT 1 FROM owned_by_relation AS rel_owned_by1 WHERE rel_concerne0.eid_from=rel_owned_by1.eid_from AND rel_owned_by1.eid_to=1)) OR (EXISTS(SELECT 1 FROM documented_by_relation AS rel_documented_by2, cw_Card AS N WHERE rel_concerne0.eid_from=rel_documented_by2.eid_from AND rel_documented_by2.eid_to=N.cw_eid AND N.cw_title=published))) -GROUP BY C.cw_nom + '''SELECT COUNT(rel_concerne0.eid_from), _C.cw_nom +FROM concerne_relation AS rel_concerne0, cw_Societe AS _C +WHERE rel_concerne0.eid_to=_C.cw_eid AND ((EXISTS(SELECT 1 FROM owned_by_relation AS rel_owned_by1 WHERE rel_concerne0.eid_from=rel_owned_by1.eid_from AND rel_owned_by1.eid_to=1)) OR (EXISTS(SELECT 1 FROM documented_by_relation AS rel_documented_by2, cw_Card AS _N WHERE rel_concerne0.eid_from=rel_documented_by2.eid_from AND rel_documented_by2.eid_to=_N.cw_eid AND _N.cw_title=published))) +GROUP BY _C.cw_nom ORDER BY 1 DESC LIMIT 10'''), ('Any X WHERE Y evaluee X, Y is CWUser', '''SELECT rel_evaluee0.eid_to -FROM cw_CWUser AS Y, evaluee_relation AS rel_evaluee0 -WHERE rel_evaluee0.eid_from=Y.cw_eid'''), +FROM cw_CWUser AS _Y, evaluee_relation AS rel_evaluee0 +WHERE rel_evaluee0.eid_from=_Y.cw_eid'''), ('Any L WHERE X login "admin", X identity Y, Y login L', - '''SELECT Y.cw_login -FROM cw_CWUser AS X, cw_CWUser AS Y -WHERE X.cw_login=admin AND X.cw_eid=Y.cw_eid'''), + '''SELECT _Y.cw_login +FROM cw_CWUser AS _X, cw_CWUser AS _Y +WHERE _X.cw_login=admin AND _X.cw_eid=_Y.cw_eid'''), ('Any L WHERE X login "admin", NOT X identity Y, Y login L', - '''SELECT Y.cw_login -FROM cw_CWUser AS X, cw_CWUser AS Y -WHERE X.cw_login=admin AND NOT X.cw_eid=Y.cw_eid'''), + '''SELECT _Y.cw_login +FROM cw_CWUser AS _X, cw_CWUser AS _Y +WHERE _X.cw_login=admin AND NOT _X.cw_eid=_Y.cw_eid'''), ('Any L WHERE X login "admin", X identity Y?, Y login L', - '''SELECT Y.cw_login -FROM cw_CWUser AS X LEFT OUTER JOIN cw_CWUser AS Y ON (X.cw_eid=Y.cw_eid) -WHERE X.cw_login=admin'''), + '''SELECT _Y.cw_login +FROM cw_CWUser AS _X LEFT OUTER JOIN cw_CWUser AS _Y ON (_X.cw_eid=_Y.cw_eid) +WHERE _X.cw_login=admin'''), ('Any XN ORDERBY XN WHERE X name XN, X is IN (Basket,Folder,Tag)', - '''SELECT X.cw_name -FROM cw_Basket AS X + '''SELECT _X.cw_name +FROM cw_Basket AS _X UNION ALL -SELECT X.cw_name -FROM cw_Folder AS X +SELECT _X.cw_name +FROM cw_Folder AS _X UNION ALL -SELECT X.cw_name -FROM cw_Tag AS X +SELECT _X.cw_name +FROM cw_Tag AS _X ORDER BY 1'''), # DISTINCT, can use relation under exists scope as principal ('DISTINCT Any X,Y WHERE X name "CWGroup", Y eid IN(1, 2, 3), EXISTS(X read_permission Y)', - '''SELECT DISTINCT X.cw_eid, rel_read_permission0.eid_to -FROM cw_CWEType AS X, read_permission_relation AS rel_read_permission0 -WHERE X.cw_name=CWGroup AND rel_read_permission0.eid_to IN(1, 2, 3) AND EXISTS(SELECT 1 WHERE rel_read_permission0.eid_from=X.cw_eid) + '''SELECT DISTINCT _X.cw_eid, rel_read_permission0.eid_to +FROM cw_CWEType AS _X, read_permission_relation AS rel_read_permission0 +WHERE _X.cw_name=CWGroup AND rel_read_permission0.eid_to IN(1, 2, 3) AND EXISTS(SELECT 1 WHERE rel_read_permission0.eid_from=_X.cw_eid) UNION -SELECT DISTINCT X.cw_eid, rel_read_permission0.eid_to -FROM cw_CWRType AS X, read_permission_relation AS rel_read_permission0 -WHERE X.cw_name=CWGroup AND rel_read_permission0.eid_to IN(1, 2, 3) AND EXISTS(SELECT 1 WHERE rel_read_permission0.eid_from=X.cw_eid)'''), +SELECT DISTINCT _X.cw_eid, rel_read_permission0.eid_to +FROM cw_CWRType AS _X, read_permission_relation AS rel_read_permission0 +WHERE _X.cw_name=CWGroup AND rel_read_permission0.eid_to IN(1, 2, 3) AND EXISTS(SELECT 1 WHERE rel_read_permission0.eid_from=_X.cw_eid)'''), # no distinct, Y can't be invariant ('Any X,Y WHERE X name "CWGroup", Y eid IN(1, 2, 3), EXISTS(X read_permission Y)', - '''SELECT X.cw_eid, Y.cw_eid -FROM cw_CWEType AS X, cw_CWGroup AS Y -WHERE X.cw_name=CWGroup AND Y.cw_eid IN(1, 2, 3) AND EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=X.cw_eid AND rel_read_permission0.eid_to=Y.cw_eid) + '''SELECT _X.cw_eid, _Y.cw_eid +FROM cw_CWEType AS _X, cw_CWGroup AS _Y +WHERE _X.cw_name=CWGroup AND _Y.cw_eid IN(1, 2, 3) AND EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=_X.cw_eid AND rel_read_permission0.eid_to=_Y.cw_eid) UNION ALL -SELECT X.cw_eid, Y.cw_eid -FROM cw_CWEType AS X, cw_RQLExpression AS Y -WHERE X.cw_name=CWGroup AND Y.cw_eid IN(1, 2, 3) AND EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=X.cw_eid AND rel_read_permission0.eid_to=Y.cw_eid) +SELECT _X.cw_eid, _Y.cw_eid +FROM cw_CWEType AS _X, cw_RQLExpression AS _Y +WHERE _X.cw_name=CWGroup AND _Y.cw_eid IN(1, 2, 3) AND EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=_X.cw_eid AND rel_read_permission0.eid_to=_Y.cw_eid) UNION ALL -SELECT X.cw_eid, Y.cw_eid -FROM cw_CWGroup AS Y, cw_CWRType AS X -WHERE X.cw_name=CWGroup AND Y.cw_eid IN(1, 2, 3) AND EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=X.cw_eid AND rel_read_permission0.eid_to=Y.cw_eid) +SELECT _X.cw_eid, _Y.cw_eid +FROM cw_CWGroup AS _Y, cw_CWRType AS _X +WHERE _X.cw_name=CWGroup AND _Y.cw_eid IN(1, 2, 3) AND EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=_X.cw_eid AND rel_read_permission0.eid_to=_Y.cw_eid) UNION ALL -SELECT X.cw_eid, Y.cw_eid -FROM cw_CWRType AS X, cw_RQLExpression AS Y -WHERE X.cw_name=CWGroup AND Y.cw_eid IN(1, 2, 3) AND EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=X.cw_eid AND rel_read_permission0.eid_to=Y.cw_eid)'''), +SELECT _X.cw_eid, _Y.cw_eid +FROM cw_CWRType AS _X, cw_RQLExpression AS _Y +WHERE _X.cw_name=CWGroup AND _Y.cw_eid IN(1, 2, 3) AND EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=_X.cw_eid AND rel_read_permission0.eid_to=_Y.cw_eid)'''), # DISTINCT but NEGED exists, can't be invariant ('DISTINCT Any X,Y WHERE X name "CWGroup", Y eid IN(1, 2, 3), NOT EXISTS(X read_permission Y)', - '''SELECT DISTINCT X.cw_eid, Y.cw_eid -FROM cw_CWEType AS X, cw_CWGroup AS Y -WHERE X.cw_name=CWGroup AND Y.cw_eid IN(1, 2, 3) AND NOT EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=X.cw_eid AND rel_read_permission0.eid_to=Y.cw_eid) + '''SELECT DISTINCT _X.cw_eid, _Y.cw_eid +FROM cw_CWEType AS _X, cw_CWGroup AS _Y +WHERE _X.cw_name=CWGroup AND _Y.cw_eid IN(1, 2, 3) AND NOT EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=_X.cw_eid AND rel_read_permission0.eid_to=_Y.cw_eid) UNION -SELECT DISTINCT X.cw_eid, Y.cw_eid -FROM cw_CWEType AS X, cw_RQLExpression AS Y -WHERE X.cw_name=CWGroup AND Y.cw_eid IN(1, 2, 3) AND NOT EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=X.cw_eid AND rel_read_permission0.eid_to=Y.cw_eid) +SELECT DISTINCT _X.cw_eid, _Y.cw_eid +FROM cw_CWEType AS _X, cw_RQLExpression AS _Y +WHERE _X.cw_name=CWGroup AND _Y.cw_eid IN(1, 2, 3) AND NOT EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=_X.cw_eid AND rel_read_permission0.eid_to=_Y.cw_eid) UNION -SELECT DISTINCT X.cw_eid, Y.cw_eid -FROM cw_CWGroup AS Y, cw_CWRType AS X -WHERE X.cw_name=CWGroup AND Y.cw_eid IN(1, 2, 3) AND NOT EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=X.cw_eid AND rel_read_permission0.eid_to=Y.cw_eid) +SELECT DISTINCT _X.cw_eid, _Y.cw_eid +FROM cw_CWGroup AS _Y, cw_CWRType AS _X +WHERE _X.cw_name=CWGroup AND _Y.cw_eid IN(1, 2, 3) AND NOT EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=_X.cw_eid AND rel_read_permission0.eid_to=_Y.cw_eid) UNION -SELECT DISTINCT X.cw_eid, Y.cw_eid -FROM cw_CWRType AS X, cw_RQLExpression AS Y -WHERE X.cw_name=CWGroup AND Y.cw_eid IN(1, 2, 3) AND NOT EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=X.cw_eid AND rel_read_permission0.eid_to=Y.cw_eid)'''), +SELECT DISTINCT _X.cw_eid, _Y.cw_eid +FROM cw_CWRType AS _X, cw_RQLExpression AS _Y +WHERE _X.cw_name=CWGroup AND _Y.cw_eid IN(1, 2, 3) AND NOT EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=_X.cw_eid AND rel_read_permission0.eid_to=_Y.cw_eid)'''), # should generate the same query as above ('DISTINCT Any X,Y WHERE X name "CWGroup", Y eid IN(1, 2, 3), NOT X read_permission Y', - '''SELECT DISTINCT X.cw_eid, Y.cw_eid -FROM cw_CWEType AS X, cw_CWGroup AS Y -WHERE X.cw_name=CWGroup AND Y.cw_eid IN(1, 2, 3) AND NOT EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=X.cw_eid AND rel_read_permission0.eid_to=Y.cw_eid) + '''SELECT DISTINCT _X.cw_eid, _Y.cw_eid +FROM cw_CWEType AS _X, cw_CWGroup AS _Y +WHERE _X.cw_name=CWGroup AND _Y.cw_eid IN(1, 2, 3) AND NOT EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=_X.cw_eid AND rel_read_permission0.eid_to=_Y.cw_eid) UNION -SELECT DISTINCT X.cw_eid, Y.cw_eid -FROM cw_CWEType AS X, cw_RQLExpression AS Y -WHERE X.cw_name=CWGroup AND Y.cw_eid IN(1, 2, 3) AND NOT EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=X.cw_eid AND rel_read_permission0.eid_to=Y.cw_eid) +SELECT DISTINCT _X.cw_eid, _Y.cw_eid +FROM cw_CWEType AS _X, cw_RQLExpression AS _Y +WHERE _X.cw_name=CWGroup AND _Y.cw_eid IN(1, 2, 3) AND NOT EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=_X.cw_eid AND rel_read_permission0.eid_to=_Y.cw_eid) UNION -SELECT DISTINCT X.cw_eid, Y.cw_eid -FROM cw_CWGroup AS Y, cw_CWRType AS X -WHERE X.cw_name=CWGroup AND Y.cw_eid IN(1, 2, 3) AND NOT EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=X.cw_eid AND rel_read_permission0.eid_to=Y.cw_eid) +SELECT DISTINCT _X.cw_eid, _Y.cw_eid +FROM cw_CWGroup AS _Y, cw_CWRType AS _X +WHERE _X.cw_name=CWGroup AND _Y.cw_eid IN(1, 2, 3) AND NOT EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=_X.cw_eid AND rel_read_permission0.eid_to=_Y.cw_eid) UNION -SELECT DISTINCT X.cw_eid, Y.cw_eid -FROM cw_CWRType AS X, cw_RQLExpression AS Y -WHERE X.cw_name=CWGroup AND Y.cw_eid IN(1, 2, 3) AND NOT EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=X.cw_eid AND rel_read_permission0.eid_to=Y.cw_eid)'''), +SELECT DISTINCT _X.cw_eid, _Y.cw_eid +FROM cw_CWRType AS _X, cw_RQLExpression AS _Y +WHERE _X.cw_name=CWGroup AND _Y.cw_eid IN(1, 2, 3) AND NOT EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=_X.cw_eid AND rel_read_permission0.eid_to=_Y.cw_eid)'''), # neged relation, can't be inveriant ('Any X,Y WHERE X name "CWGroup", Y eid IN(1, 2, 3), NOT X read_permission Y', - '''SELECT X.cw_eid, Y.cw_eid -FROM cw_CWEType AS X, cw_CWGroup AS Y -WHERE X.cw_name=CWGroup AND Y.cw_eid IN(1, 2, 3) AND NOT EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=X.cw_eid AND rel_read_permission0.eid_to=Y.cw_eid) + '''SELECT _X.cw_eid, _Y.cw_eid +FROM cw_CWEType AS _X, cw_CWGroup AS _Y +WHERE _X.cw_name=CWGroup AND _Y.cw_eid IN(1, 2, 3) AND NOT EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=_X.cw_eid AND rel_read_permission0.eid_to=_Y.cw_eid) UNION ALL -SELECT X.cw_eid, Y.cw_eid -FROM cw_CWEType AS X, cw_RQLExpression AS Y -WHERE X.cw_name=CWGroup AND Y.cw_eid IN(1, 2, 3) AND NOT EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=X.cw_eid AND rel_read_permission0.eid_to=Y.cw_eid) +SELECT _X.cw_eid, _Y.cw_eid +FROM cw_CWEType AS _X, cw_RQLExpression AS _Y +WHERE _X.cw_name=CWGroup AND _Y.cw_eid IN(1, 2, 3) AND NOT EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=_X.cw_eid AND rel_read_permission0.eid_to=_Y.cw_eid) UNION ALL -SELECT X.cw_eid, Y.cw_eid -FROM cw_CWGroup AS Y, cw_CWRType AS X -WHERE X.cw_name=CWGroup AND Y.cw_eid IN(1, 2, 3) AND NOT EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=X.cw_eid AND rel_read_permission0.eid_to=Y.cw_eid) +SELECT _X.cw_eid, _Y.cw_eid +FROM cw_CWGroup AS _Y, cw_CWRType AS _X +WHERE _X.cw_name=CWGroup AND _Y.cw_eid IN(1, 2, 3) AND NOT EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=_X.cw_eid AND rel_read_permission0.eid_to=_Y.cw_eid) UNION ALL -SELECT X.cw_eid, Y.cw_eid -FROM cw_CWRType AS X, cw_RQLExpression AS Y -WHERE X.cw_name=CWGroup AND Y.cw_eid IN(1, 2, 3) AND NOT EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=X.cw_eid AND rel_read_permission0.eid_to=Y.cw_eid)'''), +SELECT _X.cw_eid, _Y.cw_eid +FROM cw_CWRType AS _X, cw_RQLExpression AS _Y +WHERE _X.cw_name=CWGroup AND _Y.cw_eid IN(1, 2, 3) AND NOT EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=_X.cw_eid AND rel_read_permission0.eid_to=_Y.cw_eid)'''), ('Any MAX(X)+MIN(X), N GROUPBY N WHERE X name N, X is IN (Basket, Folder, Tag);', - '''SELECT (MAX(T1.C0) + MIN(T1.C0)), T1.C1 FROM (SELECT X.cw_eid AS C0, X.cw_name AS C1 -FROM cw_Basket AS X + '''SELECT (MAX(T1.C0) + MIN(T1.C0)), T1.C1 FROM (SELECT _X.cw_eid AS C0, _X.cw_name AS C1 +FROM cw_Basket AS _X UNION ALL -SELECT X.cw_eid AS C0, X.cw_name AS C1 -FROM cw_Folder AS X +SELECT _X.cw_eid AS C0, _X.cw_name AS C1 +FROM cw_Folder AS _X UNION ALL -SELECT X.cw_eid AS C0, X.cw_name AS C1 -FROM cw_Tag AS X) AS T1 +SELECT _X.cw_eid AS C0, _X.cw_name AS C1 +FROM cw_Tag AS _X) AS T1 GROUP BY T1.C1'''), ('Any MAX(X)+MIN(LENGTH(D)), N GROUPBY N ORDERBY 1, N, DF WHERE X data_name N, X data D, X data_format DF;', - '''SELECT (MAX(T1.C1) + MIN(LENGTH(T1.C0))), T1.C2 FROM (SELECT X.cw_data AS C0, X.cw_eid AS C1, X.cw_data_name AS C2, X.cw_data_format AS C3 -FROM cw_File AS X + '''SELECT (MAX(T1.C1) + MIN(LENGTH(T1.C0))), T1.C2 FROM (SELECT _X.cw_data AS C0, _X.cw_eid AS C1, _X.cw_data_name AS C2, _X.cw_data_format AS C3 +FROM cw_File AS _X UNION ALL -SELECT X.cw_data AS C0, X.cw_eid AS C1, X.cw_data_name AS C2, X.cw_data_format AS C3 -FROM cw_Image AS X) AS T1 +SELECT _X.cw_data AS C0, _X.cw_eid AS C1, _X.cw_data_name AS C2, _X.cw_data_format AS C3 +FROM cw_Image AS _X) AS T1 GROUP BY T1.C2,T1.C3 ORDER BY 1,2,T1.C3'''), ('DISTINCT Any S ORDERBY R WHERE A is Affaire, A sujet S, A ref R', - '''SELECT T1.C0 FROM (SELECT DISTINCT A.cw_sujet AS C0, A.cw_ref AS C1 -FROM cw_Affaire AS A + '''SELECT T1.C0 FROM (SELECT DISTINCT _A.cw_sujet AS C0, _A.cw_ref AS C1 +FROM cw_Affaire AS _A ORDER BY 2) AS T1'''), ('DISTINCT Any MAX(X)+MIN(LENGTH(D)), N GROUPBY N ORDERBY 2, DF WHERE X data_name N, X data D, X data_format DF;', - '''SELECT T1.C0,T1.C1 FROM (SELECT DISTINCT (MAX(T1.C1) + MIN(LENGTH(T1.C0))) AS C0, T1.C2 AS C1, T1.C3 AS C2 FROM (SELECT DISTINCT X.cw_data AS C0, X.cw_eid AS C1, X.cw_data_name AS C2, X.cw_data_format AS C3 -FROM cw_File AS X + '''SELECT T1.C0,T1.C1 FROM (SELECT DISTINCT (MAX(T1.C1) + MIN(LENGTH(T1.C0))) AS C0, T1.C2 AS C1, T1.C3 AS C2 FROM (SELECT DISTINCT _X.cw_data AS C0, _X.cw_eid AS C1, _X.cw_data_name AS C2, _X.cw_data_format AS C3 +FROM cw_File AS _X UNION -SELECT DISTINCT X.cw_data AS C0, X.cw_eid AS C1, X.cw_data_name AS C2, X.cw_data_format AS C3 -FROM cw_Image AS X) AS T1 +SELECT DISTINCT _X.cw_data AS C0, _X.cw_eid AS C1, _X.cw_data_name AS C2, _X.cw_data_format AS C3 +FROM cw_Image AS _X) AS T1 GROUP BY T1.C2,T1.C3 ORDER BY 2,3) AS T1 '''), # ambiguity in EXISTS() -> should union the sub-query ('Any T WHERE T is Tag, NOT T name in ("t1", "t2"), EXISTS(T tags X, X is IN (CWUser, CWGroup))', - '''SELECT T.cw_eid -FROM cw_Tag AS T -WHERE NOT (T.cw_name IN(t1, t2)) AND EXISTS(SELECT 1 FROM tags_relation AS rel_tags0, cw_CWGroup AS X WHERE rel_tags0.eid_from=T.cw_eid AND rel_tags0.eid_to=X.cw_eid UNION SELECT 1 FROM tags_relation AS rel_tags1, cw_CWUser AS X WHERE rel_tags1.eid_from=T.cw_eid AND rel_tags1.eid_to=X.cw_eid)'''), + '''SELECT _T.cw_eid +FROM cw_Tag AS _T +WHERE NOT (_T.cw_name IN(t1, t2)) AND EXISTS(SELECT 1 FROM tags_relation AS rel_tags0, cw_CWGroup AS _X WHERE rel_tags0.eid_from=_T.cw_eid AND rel_tags0.eid_to=_X.cw_eid UNION SELECT 1 FROM tags_relation AS rel_tags1, cw_CWUser AS _X WHERE rel_tags1.eid_from=_T.cw_eid AND rel_tags1.eid_to=_X.cw_eid)'''), # must not use a relation in EXISTS scope to inline a variable ('Any U WHERE U eid IN (1,2), EXISTS(X owned_by U)', - '''SELECT U.cw_eid -FROM cw_CWUser AS U -WHERE U.cw_eid IN(1, 2) AND EXISTS(SELECT 1 FROM owned_by_relation AS rel_owned_by0 WHERE rel_owned_by0.eid_to=U.cw_eid)'''), + '''SELECT _U.cw_eid +FROM cw_CWUser AS _U +WHERE _U.cw_eid IN(1, 2) AND EXISTS(SELECT 1 FROM owned_by_relation AS rel_owned_by0 WHERE rel_owned_by0.eid_to=_U.cw_eid)'''), ('Any U WHERE EXISTS(U eid IN (1,2), X owned_by U)', - '''SELECT U.cw_eid -FROM cw_CWUser AS U -WHERE EXISTS(SELECT 1 FROM owned_by_relation AS rel_owned_by0 WHERE U.cw_eid IN(1, 2) AND rel_owned_by0.eid_to=U.cw_eid)'''), + '''SELECT _U.cw_eid +FROM cw_CWUser AS _U +WHERE EXISTS(SELECT 1 FROM owned_by_relation AS rel_owned_by0 WHERE _U.cw_eid IN(1, 2) AND rel_owned_by0.eid_to=_U.cw_eid)'''), ('Any COUNT(U) WHERE EXISTS (P owned_by U, P is IN (Note, Affaire))', - '''SELECT COUNT(U.cw_eid) -FROM cw_CWUser AS U -WHERE EXISTS(SELECT 1 FROM owned_by_relation AS rel_owned_by0, cw_Affaire AS P WHERE rel_owned_by0.eid_from=P.cw_eid AND rel_owned_by0.eid_to=U.cw_eid UNION SELECT 1 FROM owned_by_relation AS rel_owned_by1, cw_Note AS P WHERE rel_owned_by1.eid_from=P.cw_eid AND rel_owned_by1.eid_to=U.cw_eid)'''), + '''SELECT COUNT(_U.cw_eid) +FROM cw_CWUser AS _U +WHERE EXISTS(SELECT 1 FROM owned_by_relation AS rel_owned_by0, cw_Affaire AS _P WHERE rel_owned_by0.eid_from=_P.cw_eid AND rel_owned_by0.eid_to=_U.cw_eid UNION SELECT 1 FROM owned_by_relation AS rel_owned_by1, cw_Note AS _P WHERE rel_owned_by1.eid_from=_P.cw_eid AND rel_owned_by1.eid_to=_U.cw_eid)'''), ('Any MAX(X)', - '''SELECT MAX(X.eid) -FROM entities AS X'''), + '''SELECT MAX(_X.eid) +FROM entities AS _X'''), ('Any MAX(X) WHERE X is Note', - '''SELECT MAX(X.cw_eid) -FROM cw_Note AS X'''), + '''SELECT MAX(_X.cw_eid) +FROM cw_Note AS _X'''), ('Any X WHERE X eid > 12', - '''SELECT X.eid -FROM entities AS X -WHERE X.eid>12'''), + '''SELECT _X.eid +FROM entities AS _X +WHERE _X.eid>12'''), ('Any X WHERE X eid > 12, X is Note', - """SELECT X.eid -FROM entities AS X -WHERE X.type='Note' AND X.eid>12"""), + """SELECT _X.eid +FROM entities AS _X +WHERE _X.type='Note' AND _X.eid>12"""), ('Any X, T WHERE X eid > 12, X title T, X is IN (Bookmark, Card)', - """SELECT X.cw_eid, X.cw_title -FROM cw_Bookmark AS X -WHERE X.cw_eid>12 + """SELECT _X.cw_eid, _X.cw_title +FROM cw_Bookmark AS _X +WHERE _X.cw_eid>12 UNION ALL -SELECT X.cw_eid, X.cw_title -FROM cw_Card AS X -WHERE X.cw_eid>12"""), +SELECT _X.cw_eid, _X.cw_title +FROM cw_Card AS _X +WHERE _X.cw_eid>12"""), ('Any X', - '''SELECT X.eid -FROM entities AS X'''), + '''SELECT _X.eid +FROM entities AS _X'''), ('Any X GROUPBY X WHERE X eid 12', '''SELECT 12'''), ('Any X GROUPBY X ORDERBY Y WHERE X eid 12, X login Y', - '''SELECT X.cw_eid -FROM cw_CWUser AS X -WHERE X.cw_eid=12 -GROUP BY X.cw_eid,X.cw_login -ORDER BY X.cw_login'''), + '''SELECT _X.cw_eid +FROM cw_CWUser AS _X +WHERE _X.cw_eid=12 +GROUP BY _X.cw_eid,_X.cw_login +ORDER BY _X.cw_login'''), ('Any U,COUNT(X) GROUPBY U WHERE U eid 12, X owned_by U HAVING COUNT(X) > 10', '''SELECT rel_owned_by0.eid_to, COUNT(rel_owned_by0.eid_from) @@ -535,36 +539,36 @@ HAVING COUNT(rel_owned_by0.eid_from)>10'''), ('DISTINCT Any X ORDERBY stockproc(X) WHERE U login X', - '''SELECT T1.C0 FROM (SELECT DISTINCT U.cw_login AS C0, STOCKPROC(U.cw_login) AS C1 -FROM cw_CWUser AS U + '''SELECT T1.C0 FROM (SELECT DISTINCT _U.cw_login AS C0, STOCKPROC(_U.cw_login) AS C1 +FROM cw_CWUser AS _U ORDER BY 2) AS T1'''), ('DISTINCT Any X ORDERBY Y WHERE B bookmarked_by X, X login Y', - '''SELECT T1.C0 FROM (SELECT DISTINCT X.cw_eid AS C0, X.cw_login AS C1 -FROM bookmarked_by_relation AS rel_bookmarked_by0, cw_CWUser AS X -WHERE rel_bookmarked_by0.eid_to=X.cw_eid + '''SELECT T1.C0 FROM (SELECT DISTINCT _X.cw_eid AS C0, _X.cw_login AS C1 +FROM bookmarked_by_relation AS rel_bookmarked_by0, cw_CWUser AS _X +WHERE rel_bookmarked_by0.eid_to=_X.cw_eid ORDER BY 2) AS T1'''), ('DISTINCT Any X ORDERBY SN WHERE X in_state S, S name SN', - '''SELECT T1.C0 FROM (SELECT DISTINCT X.cw_eid AS C0, S.cw_name AS C1 -FROM cw_Affaire AS X, cw_State AS S -WHERE X.cw_in_state=S.cw_eid + '''SELECT T1.C0 FROM (SELECT DISTINCT _X.cw_eid AS C0, _S.cw_name AS C1 +FROM cw_Affaire AS _X, cw_State AS _S +WHERE _X.cw_in_state=_S.cw_eid UNION -SELECT DISTINCT X.cw_eid AS C0, S.cw_name AS C1 -FROM cw_CWUser AS X, cw_State AS S -WHERE X.cw_in_state=S.cw_eid +SELECT DISTINCT _X.cw_eid AS C0, _S.cw_name AS C1 +FROM cw_CWUser AS _X, cw_State AS _S +WHERE _X.cw_in_state=_S.cw_eid UNION -SELECT DISTINCT X.cw_eid AS C0, S.cw_name AS C1 -FROM cw_Note AS X, cw_State AS S -WHERE X.cw_in_state=S.cw_eid +SELECT DISTINCT _X.cw_eid AS C0, _S.cw_name AS C1 +FROM cw_Note AS _X, cw_State AS _S +WHERE _X.cw_in_state=_S.cw_eid ORDER BY 2) AS T1'''), ('Any O,AA,AB,AC ORDERBY AC DESC ' 'WHERE NOT S use_email O, S eid 1, O is EmailAddress, O address AA, O alias AB, O modification_date AC, ' 'EXISTS(A use_email O, EXISTS(A identity B, NOT B in_group D, D name "guests", D is CWGroup), A is CWUser), B eid 2', - '''SELECT O.cw_eid, O.cw_address, O.cw_alias, O.cw_modification_date -FROM cw_EmailAddress AS O -WHERE NOT EXISTS(SELECT 1 FROM use_email_relation AS rel_use_email0 WHERE rel_use_email0.eid_from=1 AND rel_use_email0.eid_to=O.cw_eid) AND EXISTS(SELECT 1 FROM use_email_relation AS rel_use_email1 WHERE rel_use_email1.eid_to=O.cw_eid AND EXISTS(SELECT 1 FROM cw_CWGroup AS D WHERE rel_use_email1.eid_from=2 AND NOT EXISTS(SELECT 1 FROM in_group_relation AS rel_in_group2 WHERE rel_in_group2.eid_from=2 AND rel_in_group2.eid_to=D.cw_eid) AND D.cw_name=guests)) + '''SELECT _O.cw_eid, _O.cw_address, _O.cw_alias, _O.cw_modification_date +FROM cw_EmailAddress AS _O +WHERE NOT EXISTS(SELECT 1 FROM use_email_relation AS rel_use_email0 WHERE rel_use_email0.eid_from=1 AND rel_use_email0.eid_to=_O.cw_eid) AND EXISTS(SELECT 1 FROM use_email_relation AS rel_use_email1 WHERE rel_use_email1.eid_to=_O.cw_eid AND EXISTS(SELECT 1 FROM cw_CWGroup AS _D WHERE rel_use_email1.eid_from=2 AND NOT EXISTS(SELECT 1 FROM in_group_relation AS rel_in_group2 WHERE rel_in_group2.eid_from=2 AND rel_in_group2.eid_to=_D.cw_eid) AND _D.cw_name=guests)) ORDER BY 4 DESC'''), @@ -572,29 +576,29 @@ '''SELECT 0'''), ("Any X WHERE X eid 0, X eid 0, X test TRUE", - '''SELECT X.cw_eid -FROM cw_Personne AS X -WHERE X.cw_eid=0 AND X.cw_eid=0 AND X.cw_test=TRUE'''), + '''SELECT _X.cw_eid +FROM cw_Personne AS _X +WHERE _X.cw_eid=0 AND _X.cw_eid=0 AND _X.cw_test=TRUE'''), ("Any X,GROUP_CONCAT(TN) GROUPBY X ORDERBY XN WHERE T tags X, X name XN, T name TN, X is CWGroup", - '''SELECT X.cw_eid, GROUP_CONCAT(T.cw_name) -FROM cw_CWGroup AS X, cw_Tag AS T, tags_relation AS rel_tags0 -WHERE rel_tags0.eid_from=T.cw_eid AND rel_tags0.eid_to=X.cw_eid -GROUP BY X.cw_eid,X.cw_name -ORDER BY X.cw_name'''), + '''SELECT _X.cw_eid, GROUP_CONCAT(_T.cw_name) +FROM cw_CWGroup AS _X, cw_Tag AS _T, tags_relation AS rel_tags0 +WHERE rel_tags0.eid_from=_T.cw_eid AND rel_tags0.eid_to=_X.cw_eid +GROUP BY _X.cw_eid,_X.cw_name +ORDER BY _X.cw_name'''), ("Any X,GROUP_CONCAT(TN) GROUPBY X ORDERBY XN WHERE T tags X, X name XN, T name TN", - '''SELECT T1.C0, GROUP_CONCAT(T1.C1) FROM (SELECT X.cw_eid AS C0, T.cw_name AS C1, X.cw_name AS C2 -FROM cw_CWGroup AS X, cw_Tag AS T, tags_relation AS rel_tags0 -WHERE rel_tags0.eid_from=T.cw_eid AND rel_tags0.eid_to=X.cw_eid + '''SELECT T1.C0, GROUP_CONCAT(T1.C1) FROM (SELECT _X.cw_eid AS C0, _T.cw_name AS C1, _X.cw_name AS C2 +FROM cw_CWGroup AS _X, cw_Tag AS _T, tags_relation AS rel_tags0 +WHERE rel_tags0.eid_from=_T.cw_eid AND rel_tags0.eid_to=_X.cw_eid UNION ALL -SELECT X.cw_eid AS C0, T.cw_name AS C1, X.cw_name AS C2 -FROM cw_State AS X, cw_Tag AS T, tags_relation AS rel_tags0 -WHERE rel_tags0.eid_from=T.cw_eid AND rel_tags0.eid_to=X.cw_eid +SELECT _X.cw_eid AS C0, _T.cw_name AS C1, _X.cw_name AS C2 +FROM cw_State AS _X, cw_Tag AS _T, tags_relation AS rel_tags0 +WHERE rel_tags0.eid_from=_T.cw_eid AND rel_tags0.eid_to=_X.cw_eid UNION ALL -SELECT X.cw_eid AS C0, T.cw_name AS C1, X.cw_name AS C2 -FROM cw_Tag AS T, cw_Tag AS X, tags_relation AS rel_tags0 -WHERE rel_tags0.eid_from=T.cw_eid AND rel_tags0.eid_to=X.cw_eid) AS T1 +SELECT _X.cw_eid AS C0, _T.cw_name AS C1, _X.cw_name AS C2 +FROM cw_Tag AS _T, cw_Tag AS _X, tags_relation AS rel_tags0 +WHERE rel_tags0.eid_from=_T.cw_eid AND rel_tags0.eid_to=_X.cw_eid) AS T1 GROUP BY T1.C0,T1.C2 ORDER BY T1.C2'''), @@ -602,52 +606,52 @@ MULTIPLE_SEL = [ ("DISTINCT Any X,Y where P is Personne, P nom X , P prenom Y;", - '''SELECT DISTINCT P.cw_nom, P.cw_prenom -FROM cw_Personne AS P'''), + '''SELECT DISTINCT _P.cw_nom, _P.cw_prenom +FROM cw_Personne AS _P'''), ("Any X,Y where P is Personne, P nom X , P prenom Y, not P nom NULL;", - '''SELECT P.cw_nom, P.cw_prenom -FROM cw_Personne AS P -WHERE NOT (P.cw_nom IS NULL)'''), + '''SELECT _P.cw_nom, _P.cw_prenom +FROM cw_Personne AS _P +WHERE NOT (_P.cw_nom IS NULL)'''), ("Personne X,Y where X nom NX, Y nom NX, X eid XE, not Y eid XE", - '''SELECT X.cw_eid, Y.cw_eid -FROM cw_Personne AS X, cw_Personne AS Y -WHERE Y.cw_nom=X.cw_nom AND NOT (Y.cw_eid=X.cw_eid)''') + '''SELECT _X.cw_eid, _Y.cw_eid +FROM cw_Personne AS _X, cw_Personne AS _Y +WHERE _Y.cw_nom=_X.cw_nom AND NOT (_Y.cw_eid=_X.cw_eid)''') ] NEGATIONS = [ ("Personne X WHERE NOT X evaluee Y;", - '''SELECT X.cw_eid -FROM cw_Personne AS X -WHERE NOT EXISTS(SELECT 1 FROM evaluee_relation AS rel_evaluee0 WHERE rel_evaluee0.eid_from=X.cw_eid)'''), + '''SELECT _X.cw_eid +FROM cw_Personne AS _X +WHERE NOT EXISTS(SELECT 1 FROM evaluee_relation AS rel_evaluee0 WHERE rel_evaluee0.eid_from=_X.cw_eid)'''), ("Note N WHERE NOT X evaluee N, X eid 0", - '''SELECT N.cw_eid -FROM cw_Note AS N -WHERE NOT EXISTS(SELECT 1 FROM evaluee_relation AS rel_evaluee0 WHERE rel_evaluee0.eid_from=0 AND rel_evaluee0.eid_to=N.cw_eid)'''), + '''SELECT _N.cw_eid +FROM cw_Note AS _N +WHERE NOT EXISTS(SELECT 1 FROM evaluee_relation AS rel_evaluee0 WHERE rel_evaluee0.eid_from=0 AND rel_evaluee0.eid_to=_N.cw_eid)'''), ('Any X WHERE NOT X travaille S, X is Personne', - '''SELECT X.cw_eid -FROM cw_Personne AS X -WHERE NOT EXISTS(SELECT 1 FROM travaille_relation AS rel_travaille0 WHERE rel_travaille0.eid_from=X.cw_eid)'''), + '''SELECT _X.cw_eid +FROM cw_Personne AS _X +WHERE NOT EXISTS(SELECT 1 FROM travaille_relation AS rel_travaille0 WHERE rel_travaille0.eid_from=_X.cw_eid)'''), ("Personne P where not P datenaiss TODAY", - '''SELECT P.cw_eid -FROM cw_Personne AS P -WHERE NOT (DATE(P.cw_datenaiss)=CURRENT_DATE)'''), + '''SELECT _P.cw_eid +FROM cw_Personne AS _P +WHERE NOT (DATE(_P.cw_datenaiss)=CURRENT_DATE)'''), ("Personne P where NOT P concerne A", - '''SELECT P.cw_eid -FROM cw_Personne AS P -WHERE NOT EXISTS(SELECT 1 FROM concerne_relation AS rel_concerne0 WHERE rel_concerne0.eid_from=P.cw_eid)'''), + '''SELECT _P.cw_eid +FROM cw_Personne AS _P +WHERE NOT EXISTS(SELECT 1 FROM concerne_relation AS rel_concerne0 WHERE rel_concerne0.eid_from=_P.cw_eid)'''), ("Affaire A where not P concerne A", - '''SELECT A.cw_eid -FROM cw_Affaire AS A -WHERE NOT EXISTS(SELECT 1 FROM concerne_relation AS rel_concerne0 WHERE rel_concerne0.eid_to=A.cw_eid)'''), + '''SELECT _A.cw_eid +FROM cw_Affaire AS _A +WHERE NOT EXISTS(SELECT 1 FROM concerne_relation AS rel_concerne0 WHERE rel_concerne0.eid_to=_A.cw_eid)'''), ("Personne P where not P concerne A, A sujet ~= 'TEST%'", - '''SELECT P.cw_eid -FROM cw_Affaire AS A, cw_Personne AS P -WHERE NOT EXISTS(SELECT 1 FROM concerne_relation AS rel_concerne0 WHERE rel_concerne0.eid_from=P.cw_eid AND rel_concerne0.eid_to=A.cw_eid) AND A.cw_sujet ILIKE TEST%'''), + '''SELECT _P.cw_eid +FROM cw_Affaire AS _A, cw_Personne AS _P +WHERE NOT EXISTS(SELECT 1 FROM concerne_relation AS rel_concerne0 WHERE rel_concerne0.eid_from=_P.cw_eid AND rel_concerne0.eid_to=_A.cw_eid) AND _A.cw_sujet ILIKE TEST%'''), ('Any S WHERE NOT T eid 28258, T tags S', '''SELECT rel_tags0.eid_to @@ -655,17 +659,17 @@ WHERE NOT (rel_tags0.eid_from=28258)'''), ('Any S WHERE T is Tag, T name TN, NOT T eid 28258, T tags S, S name SN', - '''SELECT S.cw_eid -FROM cw_CWGroup AS S, cw_Tag AS T, tags_relation AS rel_tags0 -WHERE NOT (T.cw_eid=28258) AND rel_tags0.eid_from=T.cw_eid AND rel_tags0.eid_to=S.cw_eid + '''SELECT _S.cw_eid +FROM cw_CWGroup AS _S, cw_Tag AS _T, tags_relation AS rel_tags0 +WHERE NOT (_T.cw_eid=28258) AND rel_tags0.eid_from=_T.cw_eid AND rel_tags0.eid_to=_S.cw_eid UNION ALL -SELECT S.cw_eid -FROM cw_State AS S, cw_Tag AS T, tags_relation AS rel_tags0 -WHERE NOT (T.cw_eid=28258) AND rel_tags0.eid_from=T.cw_eid AND rel_tags0.eid_to=S.cw_eid +SELECT _S.cw_eid +FROM cw_State AS _S, cw_Tag AS _T, tags_relation AS rel_tags0 +WHERE NOT (_T.cw_eid=28258) AND rel_tags0.eid_from=_T.cw_eid AND rel_tags0.eid_to=_S.cw_eid UNION ALL -SELECT S.cw_eid -FROM cw_Tag AS S, cw_Tag AS T, tags_relation AS rel_tags0 -WHERE NOT (T.cw_eid=28258) AND rel_tags0.eid_from=T.cw_eid AND rel_tags0.eid_to=S.cw_eid'''), +SELECT _S.cw_eid +FROM cw_Tag AS _S, cw_Tag AS _T, tags_relation AS rel_tags0 +WHERE NOT (_T.cw_eid=28258) AND rel_tags0.eid_from=_T.cw_eid AND rel_tags0.eid_to=_S.cw_eid'''), ('Any X,Y WHERE X created_by Y, X eid 5, NOT Y eid 6', '''SELECT 5, rel_created_by0.eid_to @@ -673,406 +677,406 @@ WHERE rel_created_by0.eid_from=5 AND NOT (rel_created_by0.eid_to=6)'''), ('Note X WHERE NOT Y evaluee X', - '''SELECT X.cw_eid -FROM cw_Note AS X -WHERE NOT EXISTS(SELECT 1 FROM evaluee_relation AS rel_evaluee0 WHERE rel_evaluee0.eid_to=X.cw_eid)'''), + '''SELECT _X.cw_eid +FROM cw_Note AS _X +WHERE NOT EXISTS(SELECT 1 FROM evaluee_relation AS rel_evaluee0 WHERE rel_evaluee0.eid_to=_X.cw_eid)'''), ('Any Y WHERE NOT Y evaluee X', - '''SELECT Y.cw_eid -FROM cw_CWUser AS Y -WHERE NOT EXISTS(SELECT 1 FROM evaluee_relation AS rel_evaluee0 WHERE rel_evaluee0.eid_from=Y.cw_eid) + '''SELECT _Y.cw_eid +FROM cw_CWUser AS _Y +WHERE NOT EXISTS(SELECT 1 FROM evaluee_relation AS rel_evaluee0 WHERE rel_evaluee0.eid_from=_Y.cw_eid) UNION ALL -SELECT Y.cw_eid -FROM cw_Division AS Y -WHERE NOT EXISTS(SELECT 1 FROM evaluee_relation AS rel_evaluee0 WHERE rel_evaluee0.eid_from=Y.cw_eid) +SELECT _Y.cw_eid +FROM cw_Division AS _Y +WHERE NOT EXISTS(SELECT 1 FROM evaluee_relation AS rel_evaluee0 WHERE rel_evaluee0.eid_from=_Y.cw_eid) UNION ALL -SELECT Y.cw_eid -FROM cw_Personne AS Y -WHERE NOT EXISTS(SELECT 1 FROM evaluee_relation AS rel_evaluee0 WHERE rel_evaluee0.eid_from=Y.cw_eid) +SELECT _Y.cw_eid +FROM cw_Personne AS _Y +WHERE NOT EXISTS(SELECT 1 FROM evaluee_relation AS rel_evaluee0 WHERE rel_evaluee0.eid_from=_Y.cw_eid) UNION ALL -SELECT Y.cw_eid -FROM cw_Societe AS Y -WHERE NOT EXISTS(SELECT 1 FROM evaluee_relation AS rel_evaluee0 WHERE rel_evaluee0.eid_from=Y.cw_eid) +SELECT _Y.cw_eid +FROM cw_Societe AS _Y +WHERE NOT EXISTS(SELECT 1 FROM evaluee_relation AS rel_evaluee0 WHERE rel_evaluee0.eid_from=_Y.cw_eid) UNION ALL -SELECT Y.cw_eid -FROM cw_SubDivision AS Y -WHERE NOT EXISTS(SELECT 1 FROM evaluee_relation AS rel_evaluee0 WHERE rel_evaluee0.eid_from=Y.cw_eid)'''), +SELECT _Y.cw_eid +FROM cw_SubDivision AS _Y +WHERE NOT EXISTS(SELECT 1 FROM evaluee_relation AS rel_evaluee0 WHERE rel_evaluee0.eid_from=_Y.cw_eid)'''), ('Any X WHERE NOT Y evaluee X, Y is CWUser', - '''SELECT X.cw_eid -FROM cw_Note AS X -WHERE NOT EXISTS(SELECT 1 FROM evaluee_relation AS rel_evaluee0,cw_CWUser AS Y WHERE rel_evaluee0.eid_from=Y.cw_eid AND rel_evaluee0.eid_to=X.cw_eid)'''), + '''SELECT _X.cw_eid +FROM cw_Note AS _X +WHERE NOT EXISTS(SELECT 1 FROM evaluee_relation AS rel_evaluee0,cw_CWUser AS _Y WHERE rel_evaluee0.eid_from=_Y.cw_eid AND rel_evaluee0.eid_to=_X.cw_eid)'''), ('Any X,RT WHERE X relation_type RT, NOT X is CWAttribute', - '''SELECT X.cw_eid, X.cw_relation_type -FROM cw_CWRelation AS X -WHERE X.cw_relation_type IS NOT NULL'''), + '''SELECT _X.cw_eid, _X.cw_relation_type +FROM cw_CWRelation AS _X +WHERE _X.cw_relation_type IS NOT NULL'''), ('Any K,V WHERE P is CWProperty, P pkey K, P value V, NOT P for_user U', - '''SELECT P.cw_pkey, P.cw_value -FROM cw_CWProperty AS P -WHERE P.cw_for_user IS NULL'''), + '''SELECT _P.cw_pkey, _P.cw_value +FROM cw_CWProperty AS _P +WHERE _P.cw_for_user IS NULL'''), ('Any S WHERE NOT X in_state S, X is IN(Affaire, CWUser)', - '''SELECT S.cw_eid -FROM cw_State AS S -WHERE NOT EXISTS(SELECT 1 FROM cw_Affaire AS X WHERE X.cw_in_state=S.cw_eid) + '''SELECT _S.cw_eid +FROM cw_State AS _S +WHERE NOT EXISTS(SELECT 1 FROM cw_Affaire AS _X WHERE _X.cw_in_state=_S.cw_eid) INTERSECT -SELECT S.cw_eid -FROM cw_State AS S -WHERE NOT EXISTS(SELECT 1 FROM cw_CWUser AS X WHERE X.cw_in_state=S.cw_eid)'''), +SELECT _S.cw_eid +FROM cw_State AS _S +WHERE NOT EXISTS(SELECT 1 FROM cw_CWUser AS _X WHERE _X.cw_in_state=_S.cw_eid)'''), ('Any S WHERE NOT(X in_state S, S name "somename"), X is CWUser', - '''SELECT S.cw_eid -FROM cw_State AS S -WHERE NOT EXISTS(SELECT 1 FROM cw_CWUser AS X WHERE X.cw_in_state=S.cw_eid AND S.cw_name=somename)'''), + '''SELECT _S.cw_eid +FROM cw_State AS _S +WHERE NOT EXISTS(SELECT 1 FROM cw_CWUser AS _X WHERE _X.cw_in_state=_S.cw_eid AND _S.cw_name=somename)'''), # XXXFIXME fail # ('Any X,RT WHERE X relation_type RT?, NOT X is CWAttribute', -# '''SELECT X.cw_eid, X.cw_relation_type -# FROM cw_CWRelation AS X'''), +# '''SELECT _X.cw_eid, _X.cw_relation_type +# FROM cw_CWRelation AS _X'''), ] OUTER_JOIN = [ ('Any X,S WHERE X travaille S?', - '''SELECT X.cw_eid, rel_travaille0.eid_to -FROM cw_Personne AS X LEFT OUTER JOIN travaille_relation AS rel_travaille0 ON (rel_travaille0.eid_from=X.cw_eid)''' + '''SELECT _X.cw_eid, rel_travaille0.eid_to +FROM cw_Personne AS _X LEFT OUTER JOIN travaille_relation AS rel_travaille0 ON (rel_travaille0.eid_from=_X.cw_eid)''' ), ('Any S,X WHERE X? travaille S, S is Societe', - '''SELECT S.cw_eid, rel_travaille0.eid_from -FROM cw_Societe AS S LEFT OUTER JOIN travaille_relation AS rel_travaille0 ON (rel_travaille0.eid_to=S.cw_eid)''' + '''SELECT _S.cw_eid, rel_travaille0.eid_from +FROM cw_Societe AS _S LEFT OUTER JOIN travaille_relation AS rel_travaille0 ON (rel_travaille0.eid_to=_S.cw_eid)''' ), ('Any N,A WHERE N inline1 A?', - '''SELECT N.cw_eid, N.cw_inline1 -FROM cw_Note AS N'''), + '''SELECT _N.cw_eid, _N.cw_inline1 +FROM cw_Note AS _N'''), ('Any SN WHERE X from_state S?, S name SN', - '''SELECT S.cw_name -FROM cw_TrInfo AS X LEFT OUTER JOIN cw_State AS S ON (X.cw_from_state=S.cw_eid)''' + '''SELECT _S.cw_name +FROM cw_TrInfo AS _X LEFT OUTER JOIN cw_State AS _S ON (_X.cw_from_state=_S.cw_eid)''' ), ('Any A,N WHERE N? inline1 A', - '''SELECT A.cw_eid, N.cw_eid -FROM cw_Affaire AS A LEFT OUTER JOIN cw_Note AS N ON (N.cw_inline1=A.cw_eid)''' + '''SELECT _A.cw_eid, _N.cw_eid +FROM cw_Affaire AS _A LEFT OUTER JOIN cw_Note AS _N ON (_N.cw_inline1=_A.cw_eid)''' ), ('Any A,B,C,D,E,F,G WHERE A eid 12,A creation_date B,A modification_date C,A comment D,A from_state E?,A to_state F?,A wf_info_for G?', - '''SELECT A.cw_eid, A.cw_creation_date, A.cw_modification_date, A.cw_comment, A.cw_from_state, A.cw_to_state, A.cw_wf_info_for -FROM cw_TrInfo AS A -WHERE A.cw_eid=12'''), + '''SELECT _A.cw_eid, _A.cw_creation_date, _A.cw_modification_date, _A.cw_comment, _A.cw_from_state, _A.cw_to_state, _A.cw_wf_info_for +FROM cw_TrInfo AS _A +WHERE _A.cw_eid=12'''), ('Any FS,TS,C,D,U ORDERBY D DESC WHERE WF wf_info_for X,WF from_state FS?, WF to_state TS, WF comment C,WF creation_date D, WF owned_by U, X eid 1', - '''SELECT WF.cw_from_state, WF.cw_to_state, WF.cw_comment, WF.cw_creation_date, rel_owned_by0.eid_to -FROM cw_TrInfo AS WF, owned_by_relation AS rel_owned_by0 -WHERE WF.cw_wf_info_for=1 AND WF.cw_to_state IS NOT NULL AND rel_owned_by0.eid_from=WF.cw_eid + '''SELECT _WF.cw_from_state, _WF.cw_to_state, _WF.cw_comment, _WF.cw_creation_date, rel_owned_by0.eid_to +FROM cw_TrInfo AS _WF, owned_by_relation AS rel_owned_by0 +WHERE _WF.cw_wf_info_for=1 AND _WF.cw_to_state IS NOT NULL AND rel_owned_by0.eid_from=_WF.cw_eid ORDER BY 4 DESC'''), ('Any X WHERE X is Affaire, S is Societe, EXISTS(X owned_by U OR (X concerne S?, S owned_by U))', - '''SELECT X.cw_eid -FROM cw_Affaire AS X -WHERE EXISTS(SELECT 1 FROM owned_by_relation AS rel_owned_by0, cw_CWUser AS U, cw_Affaire AS A LEFT OUTER JOIN concerne_relation AS rel_concerne1 ON (rel_concerne1.eid_from=A.cw_eid) LEFT OUTER JOIN cw_Societe AS S ON (rel_concerne1.eid_to=S.cw_eid), owned_by_relation AS rel_owned_by2 WHERE ((rel_owned_by0.eid_from=A.cw_eid AND rel_owned_by0.eid_to=U.cw_eid) OR (rel_owned_by2.eid_from=S.cw_eid AND rel_owned_by2.eid_to=U.cw_eid)) AND X.cw_eid=A.cw_eid)'''), + '''SELECT _X.cw_eid +FROM cw_Affaire AS _X +WHERE EXISTS(SELECT 1 FROM owned_by_relation AS rel_owned_by0, cw_CWUser AS _U, cw_Affaire AS _A LEFT OUTER JOIN concerne_relation AS rel_concerne1 ON (rel_concerne1.eid_from=_A.cw_eid) LEFT OUTER JOIN cw_Societe AS _S ON (rel_concerne1.eid_to=_S.cw_eid), owned_by_relation AS rel_owned_by2 WHERE ((rel_owned_by0.eid_from=_A.cw_eid AND rel_owned_by0.eid_to=_U.cw_eid) OR (rel_owned_by2.eid_from=_S.cw_eid AND rel_owned_by2.eid_to=_U.cw_eid)) AND _X.cw_eid=_A.cw_eid)'''), ('Any C,M WHERE C travaille G?, G evaluee M?, G is Societe', - '''SELECT C.cw_eid, rel_evaluee1.eid_to -FROM cw_Personne AS C LEFT OUTER JOIN travaille_relation AS rel_travaille0 ON (rel_travaille0.eid_from=C.cw_eid) LEFT OUTER JOIN cw_Societe AS G ON (rel_travaille0.eid_to=G.cw_eid) LEFT OUTER JOIN evaluee_relation AS rel_evaluee1 ON (rel_evaluee1.eid_from=G.cw_eid)''' + '''SELECT _C.cw_eid, rel_evaluee1.eid_to +FROM cw_Personne AS _C LEFT OUTER JOIN travaille_relation AS rel_travaille0 ON (rel_travaille0.eid_from=_C.cw_eid) LEFT OUTER JOIN cw_Societe AS _G ON (rel_travaille0.eid_to=_G.cw_eid) LEFT OUTER JOIN evaluee_relation AS rel_evaluee1 ON (rel_evaluee1.eid_from=_G.cw_eid)''' ), ('Any A,C WHERE A documented_by C?, (C is NULL) OR (EXISTS(C require_permission F, ' 'F name "read", F require_group E, U in_group E)), U eid 1', - '''SELECT A.cw_eid, rel_documented_by0.eid_to -FROM cw_Affaire AS A LEFT OUTER JOIN documented_by_relation AS rel_documented_by0 ON (rel_documented_by0.eid_from=A.cw_eid) -WHERE ((rel_documented_by0.eid_to IS NULL) OR (EXISTS(SELECT 1 FROM require_permission_relation AS rel_require_permission1, cw_CWPermission AS F, require_group_relation AS rel_require_group2, in_group_relation AS rel_in_group3 WHERE rel_documented_by0.eid_to=rel_require_permission1.eid_from AND rel_require_permission1.eid_to=F.cw_eid AND F.cw_name=read AND rel_require_group2.eid_from=F.cw_eid AND rel_in_group3.eid_to=rel_require_group2.eid_to AND rel_in_group3.eid_from=1)))'''), + '''SELECT _A.cw_eid, rel_documented_by0.eid_to +FROM cw_Affaire AS _A LEFT OUTER JOIN documented_by_relation AS rel_documented_by0 ON (rel_documented_by0.eid_from=_A.cw_eid) +WHERE ((rel_documented_by0.eid_to IS NULL) OR (EXISTS(SELECT 1 FROM require_permission_relation AS rel_require_permission1, cw_CWPermission AS _F, require_group_relation AS rel_require_group2, in_group_relation AS rel_in_group3 WHERE rel_documented_by0.eid_to=rel_require_permission1.eid_from AND rel_require_permission1.eid_to=_F.cw_eid AND _F.cw_name=read AND rel_require_group2.eid_from=_F.cw_eid AND rel_in_group3.eid_to=rel_require_group2.eid_to AND rel_in_group3.eid_from=1)))'''), ("Any X WHERE X eid 12, P? connait X", - '''SELECT X.cw_eid -FROM cw_Personne AS X LEFT OUTER JOIN connait_relation AS rel_connait0 ON (rel_connait0.eid_to=12) -WHERE X.cw_eid=12''' + '''SELECT _X.cw_eid +FROM cw_Personne AS _X LEFT OUTER JOIN connait_relation AS rel_connait0 ON (rel_connait0.eid_to=12) +WHERE _X.cw_eid=12''' ), ('Any GN, TN ORDERBY GN WHERE T tags G?, T name TN, G name GN', ''' -SELECT _T0.C1, T.cw_name -FROM cw_Tag AS T LEFT OUTER JOIN tags_relation AS rel_tags0 ON (rel_tags0.eid_from=T.cw_eid) LEFT OUTER JOIN (SELECT G.cw_eid AS C0, G.cw_name AS C1 -FROM cw_CWGroup AS G +SELECT _T0.C1, _T.cw_name +FROM cw_Tag AS _T LEFT OUTER JOIN tags_relation AS rel_tags0 ON (rel_tags0.eid_from=_T.cw_eid) LEFT OUTER JOIN (SELECT _G.cw_eid AS C0, _G.cw_name AS C1 +FROM cw_CWGroup AS _G UNION ALL -SELECT G.cw_eid AS C0, G.cw_name AS C1 -FROM cw_State AS G +SELECT _G.cw_eid AS C0, _G.cw_name AS C1 +FROM cw_State AS _G UNION ALL -SELECT G.cw_eid AS C0, G.cw_name AS C1 -FROM cw_Tag AS G) AS _T0 ON (rel_tags0.eid_to=_T0.C0) +SELECT _G.cw_eid AS C0, _G.cw_name AS C1 +FROM cw_Tag AS _G) AS _T0 ON (rel_tags0.eid_to=_T0.C0) ORDER BY 1'''), # optional variable with additional restriction ('Any T,G WHERE T tags G?, G name "hop", G is CWGroup', - '''SELECT T.cw_eid, G.cw_eid -FROM cw_Tag AS T LEFT OUTER JOIN tags_relation AS rel_tags0 ON (rel_tags0.eid_from=T.cw_eid) LEFT OUTER JOIN cw_CWGroup AS G ON (rel_tags0.eid_to=G.cw_eid AND G.cw_name=hop)'''), + '''SELECT _T.cw_eid, _G.cw_eid +FROM cw_Tag AS _T LEFT OUTER JOIN tags_relation AS rel_tags0 ON (rel_tags0.eid_from=_T.cw_eid) LEFT OUTER JOIN cw_CWGroup AS _G ON (rel_tags0.eid_to=_G.cw_eid AND _G.cw_name=hop)'''), # optional variable with additional invariant restriction ('Any T,G WHERE T tags G?, G eid 12', - '''SELECT T.cw_eid, rel_tags0.eid_to -FROM cw_Tag AS T LEFT OUTER JOIN tags_relation AS rel_tags0 ON (rel_tags0.eid_from=T.cw_eid AND rel_tags0.eid_to=12)'''), + '''SELECT _T.cw_eid, rel_tags0.eid_to +FROM cw_Tag AS _T LEFT OUTER JOIN tags_relation AS rel_tags0 ON (rel_tags0.eid_from=_T.cw_eid AND rel_tags0.eid_to=12)'''), # optional variable with additional restriction appearing before the relation ('Any T,G WHERE G name "hop", T tags G?, G is CWGroup', - '''SELECT T.cw_eid, G.cw_eid -FROM cw_Tag AS T LEFT OUTER JOIN tags_relation AS rel_tags0 ON (rel_tags0.eid_from=T.cw_eid) LEFT OUTER JOIN cw_CWGroup AS G ON (rel_tags0.eid_to=G.cw_eid AND G.cw_name=hop)'''), + '''SELECT _T.cw_eid, _G.cw_eid +FROM cw_Tag AS _T LEFT OUTER JOIN tags_relation AS rel_tags0 ON (rel_tags0.eid_from=_T.cw_eid) LEFT OUTER JOIN cw_CWGroup AS _G ON (rel_tags0.eid_to=_G.cw_eid AND _G.cw_name=hop)'''), # optional variable with additional restriction on inlined relation # XXX the expected result should be as the query below. So what, raise BadRQLQuery ? ('Any T,G,S WHERE T tags G?, G in_state S, S name "hop", G is CWUser', - '''SELECT T.cw_eid, G.cw_eid, S.cw_eid -FROM cw_State AS S, cw_Tag AS T LEFT OUTER JOIN tags_relation AS rel_tags0 ON (rel_tags0.eid_from=T.cw_eid) LEFT OUTER JOIN cw_CWUser AS G ON (rel_tags0.eid_to=G.cw_eid) -WHERE G.cw_in_state=S.cw_eid AND S.cw_name=hop + '''SELECT _T.cw_eid, _G.cw_eid, _S.cw_eid +FROM cw_State AS _S, cw_Tag AS _T LEFT OUTER JOIN tags_relation AS rel_tags0 ON (rel_tags0.eid_from=_T.cw_eid) LEFT OUTER JOIN cw_CWUser AS _G ON (rel_tags0.eid_to=_G.cw_eid) +WHERE _G.cw_in_state=_S.cw_eid AND _S.cw_name=hop '''), # optional variable with additional invariant restriction on an inlined relation ('Any T,G,S WHERE T tags G, G in_state S?, S eid 1, G is CWUser', - '''SELECT rel_tags0.eid_from, G.cw_eid, G.cw_in_state -FROM cw_CWUser AS G, tags_relation AS rel_tags0 -WHERE rel_tags0.eid_to=G.cw_eid AND (G.cw_in_state=1 OR G.cw_in_state IS NULL)'''), + '''SELECT rel_tags0.eid_from, _G.cw_eid, _G.cw_in_state +FROM cw_CWUser AS _G, tags_relation AS rel_tags0 +WHERE rel_tags0.eid_to=_G.cw_eid AND (_G.cw_in_state=1 OR _G.cw_in_state IS NULL)'''), # two optional variables with additional invariant restriction on an inlined relation ('Any T,G,S WHERE T tags G?, G in_state S?, S eid 1, G is CWUser', - '''SELECT T.cw_eid, G.cw_eid, G.cw_in_state -FROM cw_Tag AS T LEFT OUTER JOIN tags_relation AS rel_tags0 ON (rel_tags0.eid_from=T.cw_eid) LEFT OUTER JOIN cw_CWUser AS G ON (rel_tags0.eid_to=G.cw_eid AND (G.cw_in_state=1 OR G.cw_in_state IS NULL))'''), + '''SELECT _T.cw_eid, _G.cw_eid, _G.cw_in_state +FROM cw_Tag AS _T LEFT OUTER JOIN tags_relation AS rel_tags0 ON (rel_tags0.eid_from=_T.cw_eid) LEFT OUTER JOIN cw_CWUser AS _G ON (rel_tags0.eid_to=_G.cw_eid AND (_G.cw_in_state=1 OR _G.cw_in_state IS NULL))'''), # two optional variables with additional restriction on an inlined relation ('Any T,G,S WHERE T tags G?, G in_state S?, S name "hop", G is CWUser', - '''SELECT T.cw_eid, G.cw_eid, S.cw_eid -FROM cw_Tag AS T LEFT OUTER JOIN tags_relation AS rel_tags0 ON (rel_tags0.eid_from=T.cw_eid) LEFT OUTER JOIN cw_CWUser AS G ON (rel_tags0.eid_to=G.cw_eid) LEFT OUTER JOIN cw_State AS S ON (G.cw_in_state=S.cw_eid AND S.cw_name=hop)'''), + '''SELECT _T.cw_eid, _G.cw_eid, _S.cw_eid +FROM cw_Tag AS _T LEFT OUTER JOIN tags_relation AS rel_tags0 ON (rel_tags0.eid_from=_T.cw_eid) LEFT OUTER JOIN cw_CWUser AS _G ON (rel_tags0.eid_to=_G.cw_eid) LEFT OUTER JOIN cw_State AS _S ON (_G.cw_in_state=_S.cw_eid AND _S.cw_name=hop)'''), # two optional variables with additional restriction on an ambigous inlined relation ('Any T,G,S WHERE T tags G?, G in_state S?, S name "hop"', ''' -SELECT T.cw_eid, _T0.C0, _T0.C1 -FROM cw_Tag AS T LEFT OUTER JOIN tags_relation AS rel_tags0 ON (rel_tags0.eid_from=T.cw_eid) LEFT OUTER JOIN (SELECT G.cw_eid AS C0, S.cw_eid AS C1 -FROM cw_Affaire AS G LEFT OUTER JOIN cw_State AS S ON (G.cw_in_state=S.cw_eid AND S.cw_name=hop) +SELECT _T.cw_eid, _T0.C0, _T0.C1 +FROM cw_Tag AS _T LEFT OUTER JOIN tags_relation AS rel_tags0 ON (rel_tags0.eid_from=_T.cw_eid) LEFT OUTER JOIN (SELECT _G.cw_eid AS C0, _S.cw_eid AS C1 +FROM cw_Affaire AS _G LEFT OUTER JOIN cw_State AS _S ON (_G.cw_in_state=_S.cw_eid AND _S.cw_name=hop) UNION ALL -SELECT G.cw_eid AS C0, S.cw_eid AS C1 -FROM cw_CWUser AS G LEFT OUTER JOIN cw_State AS S ON (G.cw_in_state=S.cw_eid AND S.cw_name=hop) +SELECT _G.cw_eid AS C0, _S.cw_eid AS C1 +FROM cw_CWUser AS _G LEFT OUTER JOIN cw_State AS _S ON (_G.cw_in_state=_S.cw_eid AND _S.cw_name=hop) UNION ALL -SELECT G.cw_eid AS C0, S.cw_eid AS C1 -FROM cw_Note AS G LEFT OUTER JOIN cw_State AS S ON (G.cw_in_state=S.cw_eid AND S.cw_name=hop) ) AS _T0 ON (rel_tags0.eid_to=_T0.C0)'''), +SELECT _G.cw_eid AS C0, _S.cw_eid AS C1 +FROM cw_Note AS _G LEFT OUTER JOIN cw_State AS _S ON (_G.cw_in_state=_S.cw_eid AND _S.cw_name=hop) ) AS _T0 ON (rel_tags0.eid_to=_T0.C0)'''), ('Any O,AD WHERE NOT S inline1 O, S eid 123, O todo_by AD?', - '''SELECT O.cw_eid, rel_todo_by0.eid_to -FROM cw_Affaire AS O LEFT OUTER JOIN todo_by_relation AS rel_todo_by0 ON (rel_todo_by0.eid_from=O.cw_eid), cw_Note AS S -WHERE NOT EXISTS(SELECT 1 WHERE S.cw_inline1=O.cw_eid) AND S.cw_eid=123''') + '''SELECT _O.cw_eid, rel_todo_by0.eid_to +FROM cw_Affaire AS _O LEFT OUTER JOIN todo_by_relation AS rel_todo_by0 ON (rel_todo_by0.eid_from=_O.cw_eid), cw_Note AS _S +WHERE NOT EXISTS(SELECT 1 WHERE _S.cw_inline1=_O.cw_eid) AND _S.cw_eid=123''') ] VIRTUAL_VARS = [ ("Personne P WHERE P travaille S, S tel T, S fax T, S is Societe;", '''SELECT rel_travaille0.eid_from -FROM cw_Societe AS S, travaille_relation AS rel_travaille0 -WHERE rel_travaille0.eid_to=S.cw_eid AND S.cw_fax=S.cw_tel'''), +FROM cw_Societe AS _S, travaille_relation AS rel_travaille0 +WHERE rel_travaille0.eid_to=_S.cw_eid AND _S.cw_fax=_S.cw_tel'''), ("Personne P where X eid 0, X creation_date D, P datenaiss < D, X is Affaire", - '''SELECT P.cw_eid -FROM cw_Affaire AS X, cw_Personne AS P -WHERE X.cw_eid=0 AND P.cw_datenaiss1))', '''SELECT _T0.C0, _T0.C1 -FROM ((SELECT X.cw_name AS C0, COUNT(X.cw_eid) AS C1 -FROM cw_State AS X -GROUP BY X.cw_name -HAVING COUNT(X.cw_eid)>1) +FROM ((SELECT _X.cw_name AS C0, COUNT(_X.cw_eid) AS C1 +FROM cw_State AS _X +GROUP BY _X.cw_name +HAVING COUNT(_X.cw_eid)>1) UNION ALL -(SELECT X.cw_name AS C0, COUNT(X.cw_eid) AS C1 -FROM cw_Transition AS X -GROUP BY X.cw_name -HAVING COUNT(X.cw_eid)>1)) AS _T0 +(SELECT _X.cw_name AS C0, COUNT(_X.cw_eid) AS C1 +FROM cw_Transition AS _X +GROUP BY _X.cw_name +HAVING COUNT(_X.cw_eid)>1)) AS _T0 ORDER BY 2'''), ('Any N,COUNT(X) GROUPBY N HAVING COUNT(X)>1 ' 'WITH X, N BEING ((Any X, N WHERE X name N, X is State) UNION ' ' (Any X, N WHERE X name N, X is Transition))', '''SELECT _T0.C1, COUNT(_T0.C0) -FROM ((SELECT X.cw_eid AS C0, X.cw_name AS C1 -FROM cw_State AS X) +FROM ((SELECT _X.cw_eid AS C0, _X.cw_name AS C1 +FROM cw_State AS _X) UNION ALL -(SELECT X.cw_eid AS C0, X.cw_name AS C1 -FROM cw_Transition AS X)) AS _T0 +(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'''), ('Any ETN,COUNT(X) GROUPBY ETN WHERE X is ET, ET name ETN ' 'WITH X BEING ((Any X WHERE X is Societe) UNION (Any X WHERE X is Affaire, (EXISTS(X owned_by 1)) OR ((EXISTS(D concerne B?, B owned_by 1, X identity D, B is Note)) OR (EXISTS(F concerne E?, E owned_by 1, E is Societe, X identity F)))))', - '''SELECT ET.cw_name, COUNT(_T0.C0) -FROM ((SELECT X.cw_eid AS C0 -FROM cw_Societe AS X) + '''SELECT _ET.cw_name, COUNT(_T0.C0) +FROM ((SELECT _X.cw_eid AS C0 +FROM cw_Societe AS _X) UNION ALL -(SELECT X.cw_eid AS C0 -FROM cw_Affaire AS X -WHERE ((EXISTS(SELECT 1 FROM owned_by_relation AS rel_owned_by0 WHERE rel_owned_by0.eid_from=X.cw_eid AND rel_owned_by0.eid_to=1)) OR (((EXISTS(SELECT 1 FROM cw_Affaire AS D LEFT OUTER JOIN concerne_relation AS rel_concerne1 ON (rel_concerne1.eid_from=D.cw_eid) LEFT OUTER JOIN cw_Note AS B ON (rel_concerne1.eid_to=B.cw_eid), owned_by_relation AS rel_owned_by2 WHERE rel_owned_by2.eid_from=B.cw_eid AND rel_owned_by2.eid_to=1 AND X.cw_eid=D.cw_eid)) OR (EXISTS(SELECT 1 FROM cw_Affaire AS F LEFT OUTER JOIN concerne_relation AS rel_concerne3 ON (rel_concerne3.eid_from=F.cw_eid) LEFT OUTER JOIN cw_Societe AS E ON (rel_concerne3.eid_to=E.cw_eid), owned_by_relation AS rel_owned_by4 WHERE rel_owned_by4.eid_from=E.cw_eid AND rel_owned_by4.eid_to=1 AND X.cw_eid=F.cw_eid))))))) AS _T0, cw_CWEType AS ET, is_relation AS rel_is0 -WHERE rel_is0.eid_from=_T0.C0 AND rel_is0.eid_to=ET.cw_eid -GROUP BY ET.cw_name'''), +(SELECT _X.cw_eid AS C0 +FROM cw_Affaire AS _X +WHERE ((EXISTS(SELECT 1 FROM owned_by_relation AS rel_owned_by0 WHERE rel_owned_by0.eid_from=_X.cw_eid AND rel_owned_by0.eid_to=1)) OR (((EXISTS(SELECT 1 FROM cw_Affaire AS _D LEFT OUTER JOIN concerne_relation AS rel_concerne1 ON (rel_concerne1.eid_from=_D.cw_eid) LEFT OUTER JOIN cw_Note AS _B ON (rel_concerne1.eid_to=_B.cw_eid), owned_by_relation AS rel_owned_by2 WHERE rel_owned_by2.eid_from=_B.cw_eid AND rel_owned_by2.eid_to=1 AND _X.cw_eid=_D.cw_eid)) OR (EXISTS(SELECT 1 FROM cw_Affaire AS _F LEFT OUTER JOIN concerne_relation AS rel_concerne3 ON (rel_concerne3.eid_from=_F.cw_eid) LEFT OUTER JOIN cw_Societe AS _E ON (rel_concerne3.eid_to=_E.cw_eid), owned_by_relation AS rel_owned_by4 WHERE rel_owned_by4.eid_from=_E.cw_eid AND rel_owned_by4.eid_to=1 AND _X.cw_eid=_F.cw_eid))))))) AS _T0, cw_CWEType AS _ET, is_relation AS rel_is0 +WHERE rel_is0.eid_from=_T0.C0 AND rel_is0.eid_to=_ET.cw_eid +GROUP BY _ET.cw_name'''), )): yield t @@ -1353,29 +1357,29 @@ WHERE appears0.words @@ to_tsquery('default', 'toto&tata')"""), ('Personne X WHERE X has_text "toto tata"', - """SELECT X.eid -FROM appears AS appears0, entities AS X -WHERE appears0.words @@ to_tsquery('default', 'toto&tata') AND appears0.uid=X.eid AND X.type='Personne'"""), + """SELECT _X.eid +FROM appears AS appears0, entities AS _X +WHERE appears0.words @@ to_tsquery('default', 'toto&tata') AND appears0.uid=_X.eid AND _X.type='Personne'"""), ('Personne X WHERE X has_text %(text)s', - """SELECT X.eid -FROM appears AS appears0, entities AS X -WHERE appears0.words @@ to_tsquery('default', 'hip&hop&momo') AND appears0.uid=X.eid AND X.type='Personne'"""), + """SELECT _X.eid +FROM appears AS appears0, entities AS _X +WHERE appears0.words @@ to_tsquery('default', 'hip&hop&momo') AND appears0.uid=_X.eid AND _X.type='Personne'"""), ('Any X WHERE X has_text "toto tata", X name "tutu", X is IN (Basket,Folder)', - """SELECT X.cw_eid -FROM appears AS appears0, cw_Basket AS X -WHERE appears0.words @@ to_tsquery('default', 'toto&tata') AND appears0.uid=X.cw_eid AND X.cw_name=tutu + """SELECT _X.cw_eid +FROM appears AS appears0, cw_Basket AS _X +WHERE appears0.words @@ to_tsquery('default', 'toto&tata') AND appears0.uid=_X.cw_eid AND _X.cw_name=tutu UNION ALL -SELECT X.cw_eid -FROM appears AS appears0, cw_Folder AS X -WHERE appears0.words @@ to_tsquery('default', 'toto&tata') AND appears0.uid=X.cw_eid AND X.cw_name=tutu +SELECT _X.cw_eid +FROM appears AS appears0, cw_Folder AS _X +WHERE appears0.words @@ to_tsquery('default', 'toto&tata') AND appears0.uid=_X.cw_eid AND _X.cw_name=tutu """), ('Personne X where X has_text %(text)s, X travaille S, S has_text %(text)s', - """SELECT X.eid -FROM appears AS appears0, appears AS appears2, entities AS X, travaille_relation AS rel_travaille1 -WHERE appears0.words @@ to_tsquery('default', 'hip&hop&momo') AND appears0.uid=X.eid AND X.type='Personne' AND X.eid=rel_travaille1.eid_from AND appears2.uid=rel_travaille1.eid_to AND appears2.words @@ to_tsquery('default', 'hip&hop&momo')"""), + """SELECT _X.eid +FROM appears AS appears0, appears AS appears2, entities AS _X, travaille_relation AS rel_travaille1 +WHERE appears0.words @@ to_tsquery('default', 'hip&hop&momo') AND appears0.uid=_X.eid AND _X.type='Personne' AND _X.eid=rel_travaille1.eid_from AND appears2.uid=rel_travaille1.eid_to AND appears2.words @@ to_tsquery('default', 'hip&hop&momo')"""), )): yield t @@ -1383,7 +1387,7 @@ 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)'''), +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)'''), @@ -1394,7 +1398,7 @@ 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 owned_by_relation AS rel_owned_by0, cw_Affaire AS P WHERE rel_owned_by0.eid_from=P.cw_eid AND rel_owned_by0.eid_to=1 UNION SELECT 1 FROM owned_by_relation AS rel_owned_by1, cw_Note AS P WHERE rel_owned_by1.eid_from=P.cw_eid AND rel_owned_by1.eid_to=1)''') +WHERE EXISTS(SELECT 1 FROM owned_by_relation AS rel_owned_by0, cw_Affaire AS _P WHERE rel_owned_by0.eid_from=_P.cw_eid AND rel_owned_by0.eid_to=1 UNION SELECT 1 FROM owned_by_relation AS rel_owned_by1, cw_Note AS _P WHERE rel_owned_by1.eid_from=_P.cw_eid AND rel_owned_by1.eid_to=1)''') def test_attr_map(self): def generate_ref(gen, linkedvar, rel): @@ -1403,12 +1407,12 @@ self.o.attr_map['Affaire.ref'] = generate_ref try: self._check('Any R WHERE X ref R', - '''SELECT VERSION_DATA(X.cw_eid) -FROM cw_Affaire AS X''') + '''SELECT VERSION_DATA(_X.cw_eid) +FROM cw_Affaire AS _X''') self._check('Any X WHERE X ref 1', - '''SELECT X.cw_eid -FROM cw_Affaire AS X -WHERE VERSION_DATA(X.cw_eid)=1''') + '''SELECT _X.cw_eid +FROM cw_Affaire AS _X +WHERE VERSION_DATA(_X.cw_eid)=1''') finally: self.o.attr_map.clear() @@ -1433,12 +1437,12 @@ ('(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 + '''SELECT _X.cw_name +FROM cw_State AS _X ORDER BY 1 UNION ALL -SELECT XX.cw_name -FROM cw_Transition AS XX +SELECT _XX.cw_name +FROM cw_Transition AS _XX ORDER BY 1'''), )): yield t @@ -1453,11 +1457,11 @@ ' UNION ' '(Any NN WHERE XX name NN, XX is Transition))', '''SELECT _T0.C0 -FROM (SELECT X.cw_name AS C0 -FROM cw_State AS X +FROM (SELECT _X.cw_name AS C0 +FROM cw_State AS _X UNION ALL -SELECT XX.cw_name AS C0 -FROM cw_Transition AS XX) AS _T0 +SELECT _XX.cw_name AS C0 +FROM cw_Transition AS _XX) AS _T0 ORDER BY 1'''), ('Any N,NX ORDERBY NX WITH N,NX BEING ' @@ -1465,26 +1469,26 @@ ' UNION ' '(Any N,COUNT(X) GROUPBY N WHERE X name N, X is Transition HAVING COUNT(X)>1))', '''SELECT _T0.C0, _T0.C1 -FROM (SELECT X.cw_name AS C0, COUNT(X.cw_eid) AS C1 -FROM cw_State AS X -GROUP BY X.cw_name -HAVING COUNT(X.cw_eid)>1 +FROM (SELECT _X.cw_name AS C0, COUNT(_X.cw_eid) AS C1 +FROM cw_State AS _X +GROUP BY _X.cw_name +HAVING COUNT(_X.cw_eid)>1 UNION ALL -SELECT X.cw_name AS C0, COUNT(X.cw_eid) AS C1 -FROM cw_Transition AS X -GROUP BY X.cw_name -HAVING COUNT(X.cw_eid)>1) AS _T0 +SELECT _X.cw_name AS C0, COUNT(_X.cw_eid) AS C1 +FROM cw_Transition AS _X +GROUP BY _X.cw_name +HAVING COUNT(_X.cw_eid)>1) AS _T0 ORDER BY 2'''), ('Any N,COUNT(X) GROUPBY N HAVING COUNT(X)>1 ' 'WITH X, N BEING ((Any X, N WHERE X name N, X is State) UNION ' ' (Any X, N WHERE X name N, X is Transition))', '''SELECT _T0.C1, COUNT(_T0.C0) -FROM (SELECT X.cw_eid AS C0, X.cw_name AS C1 -FROM cw_State AS X +FROM (SELECT _X.cw_eid AS C0, _X.cw_name AS C1 +FROM cw_State AS _X UNION ALL -SELECT X.cw_eid AS C0, X.cw_name AS C1 -FROM cw_Transition AS X) AS _T0 +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'''), )): @@ -1503,18 +1507,18 @@ WHERE appears0.word_id IN (SELECT word_id FROM word WHERE word in ('hip', 'hop', 'momo'))"""), ('Personne X WHERE X has_text "toto tata"', - """SELECT X.eid -FROM appears AS appears0, entities AS X -WHERE appears0.word_id IN (SELECT word_id FROM word WHERE word in ('toto', 'tata')) AND appears0.uid=X.eid AND X.type='Personne'"""), + """SELECT _X.eid +FROM appears AS appears0, entities AS _X +WHERE appears0.word_id IN (SELECT word_id FROM word WHERE word in ('toto', 'tata')) AND appears0.uid=_X.eid AND _X.type='Personne'"""), ('Any X WHERE X has_text "toto tata", X name "tutu", X is IN (Basket,Folder)', - """SELECT X.cw_eid -FROM appears AS appears0, cw_Basket AS X -WHERE appears0.word_id IN (SELECT word_id FROM word WHERE word in ('toto', 'tata')) AND appears0.uid=X.cw_eid AND X.cw_name=tutu + """SELECT _X.cw_eid +FROM appears AS appears0, cw_Basket AS _X +WHERE appears0.word_id IN (SELECT word_id FROM word WHERE word in ('toto', 'tata')) AND appears0.uid=_X.cw_eid AND _X.cw_name=tutu UNION ALL -SELECT X.cw_eid -FROM appears AS appears0, cw_Folder AS X -WHERE appears0.word_id IN (SELECT word_id FROM word WHERE word in ('toto', 'tata')) AND appears0.uid=X.cw_eid AND X.cw_name=tutu +SELECT _X.cw_eid +FROM appears AS appears0, cw_Folder AS _X +WHERE appears0.word_id IN (SELECT word_id FROM word WHERE word in ('toto', 'tata')) AND appears0.uid=_X.cw_eid AND _X.cw_name=tutu """), )): yield t @@ -1540,7 +1544,7 @@ queries = [("Any 1 WHERE EXISTS(T is CWGroup, T name 'managers')", '''SELECT 1 FROM (SELECT 1) AS _T -WHERE EXISTS(SELECT 1 FROM cw_CWGroup AS T WHERE T.cw_name=managers)'''), +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 FROM (SELECT 1) AS _T @@ -1557,21 +1561,21 @@ FROM appears AS appears0 WHERE MATCH (appears0.words) AGAINST ('toto tata' IN BOOLEAN MODE)"""), ('Personne X WHERE X has_text "toto tata"', - """SELECT X.eid -FROM appears AS appears0, entities AS X -WHERE MATCH (appears0.words) AGAINST ('toto tata' IN BOOLEAN MODE) AND appears0.uid=X.eid AND X.type='Personne'"""), + """SELECT _X.eid +FROM appears AS appears0, entities AS _X +WHERE MATCH (appears0.words) AGAINST ('toto tata' IN BOOLEAN MODE) AND appears0.uid=_X.eid AND _X.type='Personne'"""), ('Personne X WHERE X has_text %(text)s', - """SELECT X.eid -FROM appears AS appears0, entities AS X -WHERE MATCH (appears0.words) AGAINST ('hip hop momo' IN BOOLEAN MODE) AND appears0.uid=X.eid AND X.type='Personne'"""), + """SELECT _X.eid +FROM appears AS appears0, entities AS _X +WHERE MATCH (appears0.words) AGAINST ('hip hop momo' IN BOOLEAN MODE) AND appears0.uid=_X.eid AND _X.type='Personne'"""), ('Any X WHERE X has_text "toto tata", X name "tutu", X is IN (Basket,Folder)', - """SELECT X.cw_eid -FROM appears AS appears0, cw_Basket AS X -WHERE MATCH (appears0.words) AGAINST ('toto tata' IN BOOLEAN MODE) AND appears0.uid=X.cw_eid AND X.cw_name=tutu + """SELECT _X.cw_eid +FROM appears AS appears0, cw_Basket AS _X +WHERE MATCH (appears0.words) AGAINST ('toto tata' IN BOOLEAN MODE) AND appears0.uid=_X.cw_eid AND _X.cw_name=tutu UNION ALL -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 +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): @@ -1582,7 +1586,7 @@ self._check('Any COUNT(U) WHERE U eid 1, EXISTS (P owned_by U, P is IN (Note, Affaire))', '''SELECT COUNT(1) FROM (SELECT 1) AS _T -WHERE EXISTS(SELECT 1 FROM owned_by_relation AS rel_owned_by0, cw_Affaire AS P WHERE rel_owned_by0.eid_from=P.cw_eid AND rel_owned_by0.eid_to=1 UNION SELECT 1 FROM owned_by_relation AS rel_owned_by1, cw_Note AS P WHERE rel_owned_by1.eid_from=P.cw_eid AND rel_owned_by1.eid_to=1)''') +WHERE EXISTS(SELECT 1 FROM owned_by_relation AS rel_owned_by0, cw_Affaire AS _P WHERE rel_owned_by0.eid_from=_P.cw_eid AND rel_owned_by0.eid_to=1 UNION SELECT 1 FROM owned_by_relation AS rel_owned_by1, cw_Note AS _P WHERE rel_owned_by1.eid_from=_P.cw_eid AND rel_owned_by1.eid_to=1)''')