--- a/server/msplanner.py Wed Jan 07 14:42:43 2009 +0100
+++ b/server/msplanner.py Wed Jan 07 15:37:04 2009 +0100
@@ -180,8 +180,6 @@
# processing
self._compute_sourcesvars()
self._remove_invalid_sources()
- #if server.DEBUG:
- # print 'planner sources vars', self._sourcesvars
self._compute_needsplit()
self._inputmaps = {}
if rqlhelper is not None: # else test
@@ -212,6 +210,7 @@
for solidx in self._solindices
if not (source.support_relation(rtype)
or rtype in source.dont_cross_relations))
+
def _compute_sourcesvars(self):
"""compute for each variable/solution in the rqlst which sources support
@@ -277,11 +276,9 @@
# during bootstrap)
if not rel.is_types_restriction() and not rschema(rel.r_type).is_final():
# nothing to do if relation is not supported by multiple sources
- relsources = [source for source in repo.sources
- if source.support_relation(rel.r_type)
- or rel.r_type in source.dont_cross_relations]
+ relsources = repo.rel_type_sources(rel.r_type)
if len(relsources) < 2:
- if relsources:# and not relsources[0] in self._sourcesvars:
+ if relsources:
# this means the relation is using a variable inlined as
# a constant and another unsupported variable, in which
# case we put the relation in sourcesvars
@@ -344,7 +341,7 @@
for const in vconsts:
if const.scope in source_scopes:
self._set_source_for_var(source, const)
-
+
def _extern_term(self, term, vsources, inserted):
var = term.variable
if var.stinfo['constnode']:
@@ -361,13 +358,24 @@
return termv
def _remove_sources_until_stable(self, var, vsources):
+ sourcesvars = self._sourcesvars
for ovar, rel in self._linkedvars.get(var, ()):
if not var.scope is ovar.scope and rel.scope.neged(strict=True):
# can't get information from relation inside a NOT exists
# where variables don't belong to the same scope
continue
- if rel.neged(strict=True):
- # neged relation doesn't allow to infer variable sources
+ relsources = self._session.repo.rel_type_sources(rel.r_type)
+ if rel.neged(strict=True) and (
+ len(relsources) < 2
+ or not isinstance(ovar, Variable)
+ or ovar.valuable_references() != 1
+ or any(sourcesvars[source][var] != sourcesvars[source][ovar]
+ for source in relsources
+ if var in sourcesvars.get(source, ())
+ and ovar in sourcesvars.get(source, ()))):
+ # neged relation doesn't allow to infer variable sources unless we're
+ # on a multisource relation for a variable only used by this relation
+ # (eg "Any X WHERE NOT X multisource_rel Y" and over is Y), iif
continue
norelsup = self._norel_support_set(rel.r_type)
# compute invalid sources for variables and remove them
@@ -898,10 +906,16 @@
step = AggrStep(plan, selection, select, atemptable, temptable)
step.children = steps
elif len(steps) > 1:
- if temptable:
- step = UnionFetchStep(plan)
+ if select.need_intersect:
+ if temptable:
+ step = IntersectFetchStep(plan)
+ else:
+ step = IntersectStep(plan)
else:
- step = UnionStep(plan)
+ if temptable:
+ step = UnionFetchStep(plan)
+ else:
+ step = UnionStep(plan)
step.children = steps
else:
step = steps[0]--- a/server/mssteps.py Wed Jan 07 14:42:43 2009 +0100
+++ b/server/mssteps.py Wed Jan 07 15:37:04 2009 +0100
@@ -264,6 +264,22 @@
return (self.__class__.__name__, self.limit, self.offset)
+class IntersectStep(UnionStep):
+ """return intersection of results of child in-memory steps (e.g. OneFetchStep / AggrStep)"""
+
+ def execute(self):
+ """execute this step"""
+ result = set()
+ for step in self.children:
+ result &= frozenset(step.execute())
+ result = list(result)
+ if self.offset:
+ result = result[offset:]
+ if self.limit:
+ result = result[:limit]
+ return result
+
+
class UnionFetchStep(Step):
"""union results of child steps using temporary tables (e.g. FetchStep)"""
@@ -272,4 +288,4 @@
self.execute_children()
-__all__ = ('FetchStep', 'AggrStep', 'UnionStep', 'UnionFetchStep')
+__all__ = ('FetchStep', 'AggrStep', 'UnionStep', 'UnionFetchStep', 'IntersectStep')--- a/server/repository.py Wed Jan 07 14:42:43 2009 +0100
+++ b/server/repository.py Wed Jan 07 15:37:04 2009 +0100
@@ -896,6 +896,11 @@
source = subjsource
return source
+ @cached
+ def rel_type_sources(self, rtype):
+ return [source for source in self.sources
+ if source.support_relation(rtype) or rtype in source.dont_cross_relations]
+
def locate_etype_source(self, etype):
for source in self.sources:
if source.support_entity(etype, 1):--- a/server/rqlannotation.py Wed Jan 07 14:42:43 2009 +0100
+++ b/server/rqlannotation.py Wed Jan 07 15:37:04 2009 +0100
@@ -20,7 +20,7 @@
#if server.DEBUG:
# print '-------- sql annotate', repr(rqlst)
getrschema = annotator.schema.rschema
- has_text_query = False
+ has_text_query = need_intersect = False
need_distinct = rqlst.distinct
for rel in rqlst.iget_nodes(Relation):
if rel.neged(strict=True):
@@ -28,14 +28,22 @@
need_distinct = True
else:
rschema = getrschema(rel.r_type)
- if rschema.inlined:
- try:
- var = rel.children[1].children[0].variable
- except AttributeError:
- pass # rewritten variable
- else:
- if not var.stinfo['constnode']:
- need_distinct = True
+ if not rschema.is_final():
+ # if one of the relation's variable is ambiguous, an intersection
+ # will be necessary
+ for vref in rel.get_nodes(VariableRef):
+ var = vref.variable
+ if not var.stinfo['selected'] and len(var.stinfo['possibletypes']) > 1:
+ need_intersect = True
+ break
+ if rschema.inlined:
+ try:
+ var = rel.children[1].children[0].variable
+ except AttributeError:
+ pass # rewritten variable
+ else:
+ if not var.stinfo['constnode']:
+ need_distinct = True
elif getrschema(rel.r_type).symetric:
for vref in rel.iget_nodes(VariableRef):
stinfo = vref.variable.stinfo
@@ -139,6 +147,7 @@
except CantSelectPrincipal:
stinfo['invariant'] = False
rqlst.need_distinct = need_distinct
+ rqlst.need_intersect = need_intersect
return has_text_query
--- a/server/sources/rql2sql.py Wed Jan 07 14:42:43 2009 +0100
+++ b/server/sources/rql2sql.py Wed Jan 07 15:37:04 2009 +0100
@@ -76,7 +76,7 @@
unstable.remove(varname)
torewrite.add(var)
newselect = Select()
- newselect.need_distinct = False
+ newselect.need_distinct = newselect.need_intersect = False
myunion = Union()
myunion.append(newselect)
# extract aliases / selection
@@ -487,7 +487,12 @@
elif self._state.restrictions and self.dbms_helper.needs_from_clause:
sql.insert(1, 'FROM (SELECT 1) AS _T')
sqls.append('\n'.join(sql))
- if distinct:
+ if select.need_intersect:
+ if distinct:
+ return '\nINTERSECT\n'.join(sqls)
+ else:
+ return '\nINTERSECT ALL\n'.join(sqls)
+ elif distinct:
return '\nUNION\n'.join(sqls)
else:
return '\nUNION ALL\n'.join(sqls)--- a/server/test/data/schema/Affaire.py Wed Jan 07 14:42:43 2009 +0100
+++ b/server/test/data/schema/Affaire.py Wed Jan 07 15:37:04 2009 +0100
@@ -26,6 +26,7 @@
wf_info_for = ObjectRelation('TrInfo', cardinality='1*', composite='object')
depends_on = SubjectRelation('Affaire')
+ require_permission = SubjectRelation('EPermission')
class concerne(RelationType):
permissions = {--- a/server/test/data/schema/custom.py Wed Jan 07 14:42:43 2009 +0100
+++ b/server/test/data/schema/custom.py Wed Jan 07 15:37:04 2009 +0100
@@ -15,6 +15,12 @@
subject = ('Card', 'Note')
object = 'Note'
+class multisource_inlined_rel(RelationType):
+ inlined = True
+ cardinality = '?*'
+ subject = ('Card', 'Note')
+ object = ('Affaire', 'Note')
+
class see_also(RelationDefinition):
subject = ('Bookmark', 'Note')--- a/server/test/unittest_msplanner.py Wed Jan 07 14:42:43 2009 +0100
+++ b/server/test/unittest_msplanner.py Wed Jan 07 15:37:04 2009 +0100
@@ -28,7 +28,7 @@
class FakeCardSource(AbstractSource):
uri = 'ccc'
support_entities = {'Card': True, 'Note': True, 'State': True}
- support_relations = {'in_state': True, 'multisource_rel': True}
+ support_relations = {'in_state': True, 'multisource_rel': True, 'multisource_inlined_rel': True}
dont_cross_relations = set(('fiche',))
def syntax_tree_search(self, *args, **kwargs):
@@ -60,6 +60,7 @@
def setUp(self):
#_QuerierTC.setUp(self)
+ clear_cache(repo, 'rel_type_sources')
self.o = repo.querier
self.session = repo._sessions.values()[0]
self.pool = self.session.set_pool()
@@ -1144,7 +1145,7 @@
('FetchStep', [('Any X WHERE X is Note', [{'X': 'Note'}])],
[self.rql, self.system], None, {'X': 'table1.C0'},
[]),
- ('UnionStep', None, None,
+ ('IntersectStep', None, None,
[('OneFetchStep',
[('Any SN WHERE NOT X in_state S, S name SN, S is State, X is IN(Affaire, EUser)',
[{'S': 'State', 'SN': 'String', 'X': 'Affaire'},
@@ -1435,7 +1436,29 @@
]),
],
{'x': ueid, 'y': ueid})
+
+ def test_delete_entity1(self):
+ repo._type_source_cache[999999] = ('Note', 'system', 999999)
+ self._test('DELETE Note X WHERE X eid %(x)s, NOT Y multisource_rel X',
+ [('DeleteEntitiesStep',
+ [('OneFetchStep', [('Any 999999 WHERE NOT Y multisource_rel 999999, Y is IN(Card, Note)',
+ [{'Y': 'Card'}, {'Y': 'Note'}])],
+ None, None, [self.system], {}, [])
+ ])
+ ],
+ {'x': 999999})
+ def test_delete_entity2(self):
+ repo._type_source_cache[999999] = ('Note', 'system', 999999)
+ self._test('DELETE Note X WHERE X eid %(x)s, NOT X multisource_inlined_rel Y',
+ [('DeleteEntitiesStep',
+ [('OneFetchStep', [('Any X WHERE X eid 999999, NOT X multisource_inlined_rel Y, X is Note, Y is IN(Affaire, Note)',
+ [{'X': 'Note', 'Y': 'Affaire'}, {'X': 'Note', 'Y': 'Note'}])],
+ None, None, [self.system], {}, [])
+ ])
+ ],
+ {'x': 999999})
+
def test_update(self):
self._test('SET X copain Y WHERE X login "comme", Y login "cochon"',
[('FetchStep',--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/server/test/unittest_multisources.py Wed Jan 07 15:37:04 2009 +0100
@@ -0,0 +1,249 @@
+from os.path import dirname, join, abspath
+from logilab.common.decorators import cached
+from mx.DateTime import now
+
+from cubicweb.devtools import TestServerConfiguration, init_test_database
+from cubicweb.devtools.apptest import RepositoryBasedTC
+from cubicweb.devtools.repotest import do_monkey_patch, undo_monkey_patch
+
+class TwoSourcesConfiguration(TestServerConfiguration):
+ sourcefile = 'sources_multi'
+
+
+class ExternalSourceConfiguration(TestServerConfiguration):
+ sourcefile = 'sources_extern'
+
+repo2, cnx2 = init_test_database('sqlite', config=ExternalSourceConfiguration('data'))
+cu = cnx2.cursor()
+ec1 = cu.execute('INSERT Card X: X title "C3: An external card", X wikiid "aaa"')[0][0]
+cu.execute('INSERT Card X: X title "C4: Ze external card", X wikiid "zzz"')
+aff1 = cu.execute('INSERT Affaire X: X ref "AFFREF", X in_state S WHERE S name "pitetre"')[0][0]
+cnx2.commit()
+
+MTIME = now() - 0.1
+
+# XXX, access existing connection, no pyro connection
+from cubicweb.server.sources.pyrorql import PyroRQLSource
+PyroRQLSource.get_connection = lambda x: cnx2
+# necessary since the repository is closing its initial connections pool though
+# we want to keep cnx2 valid
+from cubicweb.dbapi import Connection
+Connection.close = lambda x: None
+
+class TwoSourcesTC(RepositoryBasedTC):
+ repo_config = TwoSourcesConfiguration('data')
+
+ def setUp(self):
+ RepositoryBasedTC.setUp(self)
+ # trigger discovery
+ self.execute('Card X')
+ self.execute('Affaire X')
+ self.execute('State X')
+ self.commit()
+ # don't delete external entities!
+ self.maxeid = self.session.system_sql('SELECT MAX(eid) FROM entities').fetchone()[0]
+ # add some entities
+ self.ic1 = self.execute('INSERT Card X: X title "C1: An internal card", X wikiid "aaai"')[0][0]
+ self.ic2 = self.execute('INSERT Card X: X title "C2: Ze internal card", X wikiid "zzzi"')[0][0]
+ self.commit()
+ do_monkey_patch()
+
+ def tearDown(self):
+ RepositoryBasedTC.tearDown(self)
+ undo_monkey_patch()
+
+ def test_eid_comp(self):
+ rset = self.execute('Card X WHERE X eid > 1')
+ self.assertEquals(len(rset), 4)
+ rset = self.execute('Any X,T WHERE X title T, X eid > 1')
+ self.assertEquals(len(rset), 4)
+
+ def test_metainformation(self):
+ rset = self.execute('Card X ORDERBY T WHERE X title T')
+ # 2 added to the system source, 2 added to the external source
+ self.assertEquals(len(rset), 4)
+ # since they are orderd by eid, we know the 3 first one is coming from the system source
+ # and the others from external source
+ self.assertEquals(rset.get_entity(0, 0).metainformation(),
+ {'source': {'adapter': 'native', 'uri': 'system'},
+ 'type': u'Card', 'extid': None})
+ externent = rset.get_entity(3, 0)
+ metainf = externent.metainformation()
+ self.assertEquals(metainf['source'], {'adapter': 'pyrorql', 'uri': 'extern'})
+ self.assertEquals(metainf['type'], 'Card')
+ self.assert_(metainf['extid'])
+ etype = self.execute('Any ETN WHERE X is ET, ET name ETN, X eid %(x)s',
+ {'x': externent.eid}, 'x')[0][0]
+ self.assertEquals(etype, 'Card')
+
+ def test_order_limit_offset(self):
+ rsetbase = self.execute('Any W,X ORDERBY W,X WHERE X wikiid W')
+ self.assertEquals(len(rsetbase), 4)
+ self.assertEquals(sorted(rsetbase.rows), rsetbase.rows)
+ rset = self.execute('Any W,X ORDERBY W,X LIMIT 2 OFFSET 2 WHERE X wikiid W')
+ self.assertEquals(rset.rows, rsetbase.rows[2:4])
+
+ def test_has_text(self):
+ self.repo.sources[-1].synchronize(MTIME) # in case fti_update has been run before
+ self.failUnless(self.execute('Any X WHERE X has_text "affref"'))
+ self.failUnless(self.execute('Affaire X WHERE X has_text "affref"'))
+
+ def test_anon_has_text(self):
+ self.repo.sources[-1].synchronize(MTIME) # in case fti_update has been run before
+ self.execute('INSERT Affaire X: X ref "no readable card"')[0][0]
+ aff1 = self.execute('INSERT Affaire X: X ref "card"')[0][0]
+ # grant read access
+ self.execute('SET X owned_by U WHERE X eid %(x)s, U login "anon"', {'x': aff1}, 'x')
+ self.commit()
+ cnx = self.login('anon')
+ cu = cnx.cursor()
+ rset = cu.execute('Any X WHERE X has_text "card"')
+ self.assertEquals(len(rset), 5)
+
+ def test_synchronization(self):
+ cu = cnx2.cursor()
+ cu.execute('SET X ref "BLAH" WHERE X eid %(x)s', {'x': aff1}, 'x')
+ aff2 = cu.execute('INSERT Affaire X: X ref "AFFREUX", X in_state S WHERE S name "pitetre"')[0][0]
+ cnx2.commit()
+ try:
+ # force sync
+ self.repo.sources[-1].synchronize(MTIME)
+ self.failUnless(self.execute('Any X WHERE X has_text "blah"'))
+ self.failUnless(self.execute('Any X WHERE X has_text "affreux"'))
+ cu.execute('DELETE Affaire X WHERE X eid %(x)s', {'x': aff2})
+ cnx2.commit()
+ self.repo.sources[-1].synchronize(MTIME)
+ self.failIf(self.execute('Any X WHERE X has_text "affreux"'))
+ finally:
+ # restore state
+ cu.execute('SET X ref "AFFREF" WHERE X eid %(x)s', {'x': aff1}, 'x')
+ cnx2.commit()
+
+ def test_simplifiable_var(self):
+ affeid = self.execute('Affaire X WHERE X ref "AFFREF"')[0][0]
+ rset = self.execute('Any X,AA,AB WHERE E eid %(x)s, E in_state X, X name AA, X modification_date AB',
+ {'x': affeid}, 'x')
+ self.assertEquals(len(rset), 1)
+ self.assertEquals(rset[0][1], "pitetre")
+
+ def test_simplifiable_var_2(self):
+ affeid = self.execute('Affaire X WHERE X ref "AFFREF"')[0][0]
+ rset = self.execute('Any E WHERE E eid %(x)s, E in_state S, NOT S name "moved"',
+ {'x': affeid, 'u': self.session.user.eid}, 'x')
+ self.assertEquals(len(rset), 1)
+
+ def test_sort_func(self):
+ self.execute('Affaire X ORDERBY DUMB_SORT(RF) WHERE X ref RF')
+
+ def test_sort_func_ambigous(self):
+ self.execute('Any X ORDERBY DUMB_SORT(RF) WHERE X title RF')
+
+ def test_in_eid(self):
+ iec1 = self.repo.extid2eid(self.repo.sources[-1], ec1, 'Card', self.session)
+ rset = self.execute('Any X WHERE X eid IN (%s, %s)' % (iec1, self.ic1))
+ self.assertEquals(sorted(r[0] for r in rset.rows), sorted([iec1, self.ic1]))
+
+ def test_greater_eid(self):
+ rset = self.execute('Any X WHERE X eid > %s' % self.maxeid)
+ self.assertEquals(len(rset.rows), 2) # self.ic1 and self.ic2
+ ec2 = cu.execute('INSERT Card X: X title "glup"')[0][0]
+ cnx2.commit()
+ # 'X eid > something' should not trigger discovery
+ rset = self.execute('Any X WHERE X eid > %s' % self.maxeid)
+ self.assertEquals(len(rset.rows), 2)
+ # trigger discovery using another query
+ crset = self.execute('Card X WHERE X title "glup"')
+ self.assertEquals(len(crset.rows), 1)
+ rset = self.execute('Any X WHERE X eid > %s' % self.maxeid)
+ self.assertEquals(len(rset.rows), 3)
+ rset = self.execute('Any MAX(X)')
+ self.assertEquals(len(rset.rows), 1)
+ self.assertEquals(rset.rows[0][0], crset[0][0])
+
+ def test_attr_unification_1(self):
+ n1 = self.execute('INSERT Note X: X type "AFFREF"')[0][0]
+ n2 = self.execute('INSERT Note X: X type "AFFREU"')[0][0]
+ rset = self.execute('Any X,Y WHERE X is Note, Y is Affaire, X type T, Y ref T')
+ self.assertEquals(len(rset), 1, rset.rows)
+
+ def test_attr_unification_2(self):
+ ec2 = cu.execute('INSERT Card X: X title "AFFREF"')[0][0]
+ cnx2.commit()
+ try:
+ c1 = self.execute('INSERT Card C: C title "AFFREF"')[0][0]
+ rset = self.execute('Any X,Y WHERE X is Card, Y is Affaire, X title T, Y ref T')
+ self.assertEquals(len(rset), 2, rset.rows)
+ finally:
+ cu.execute('DELETE Card X WHERE X eid %(x)s', {'x': ec2}, 'x')
+ cnx2.commit()
+
+ def test_attr_unification_neq_1(self):
+ # XXX complete
+ self.execute('Any X,Y WHERE X is Note, Y is Affaire, X creation_date D, Y creation_date > D')
+
+ def test_attr_unification_neq_2(self):
+ # XXX complete
+ self.execute('Any X,Y WHERE X is Card, Y is Affaire, X creation_date D, Y creation_date > D')
+
+ def test_union(self):
+ afeids = self.execute('Affaire X')
+ ueids = self.execute('EUser X')
+ rset = self.execute('(Any X WHERE X is Affaire) UNION (Any X WHERE X is EUser)')
+ self.assertEquals(sorted(r[0] for r in rset.rows),
+ sorted(r[0] for r in afeids + ueids))
+
+ def test_subquery1(self):
+ rsetbase = self.execute('Any W,X WITH W,X BEING (Any W,X ORDERBY W,X WHERE X wikiid W)')
+ self.assertEquals(len(rsetbase), 4)
+ self.assertEquals(sorted(rsetbase.rows), rsetbase.rows)
+ rset = self.execute('Any W,X LIMIT 2 OFFSET 2 WITH W,X BEING (Any W,X ORDERBY W,X WHERE X wikiid W)')
+ self.assertEquals(rset.rows, rsetbase.rows[2:4])
+ rset = self.execute('Any W,X ORDERBY W,X LIMIT 2 OFFSET 2 WITH W,X BEING (Any W,X WHERE X wikiid W)')
+ self.assertEquals(rset.rows, rsetbase.rows[2:4])
+ rset = self.execute('Any W,X WITH W,X BEING (Any W,X ORDERBY W,X LIMIT 2 OFFSET 2 WHERE X wikiid W)')
+ self.assertEquals(rset.rows, rsetbase.rows[2:4])
+
+ def test_subquery2(self):
+ affeid = self.execute('Affaire X WHERE X ref "AFFREF"')[0][0]
+ rset =self.execute('Any X,AA,AB WITH X,AA,AB BEING (Any X,AA,AB WHERE E eid %(x)s, E in_state X, X name AA, X modification_date AB)',
+ {'x': affeid})
+ self.assertEquals(len(rset), 1)
+ self.assertEquals(rset[0][1], "pitetre")
+
+ def test_not_relation(self):
+ states = set(tuple(x) for x in self.execute('Any S,SN WHERE S is State, S name SN'))
+ userstate = self.session.user.in_state[0]
+ states.remove((userstate.eid, userstate.name))
+ notstates = set(tuple(x) for x in self.execute('Any S,SN WHERE S is State, S name SN, NOT X in_state S, X eid %(x)s',
+ {'x': self.session.user.eid}, 'x'))
+ self.assertEquals(notstates, states)
+ aff1 = self.execute('Any X WHERE X is Affaire, X ref "AFFREF"')[0][0]
+ aff1stateeid, aff1statename = self.execute('Any S,SN WHERE X eid %(x)s, X in_state S, S name SN', {'x': aff1}, 'x')[0]
+ self.assertEquals(aff1statename, 'pitetre')
+ states.add((userstate.eid, userstate.name))
+ states.remove((aff1stateeid, aff1statename))
+ notstates = set(tuple(x) for x in self.execute('Any S,SN WHERE S is State, S name SN, NOT X in_state S, X eid %(x)s',
+ {'x': aff1}, 'x'))
+ self.set_debug(False)
+ self.assertSetEquals(notstates, states)
+
+ def test_nonregr1(self):
+ ueid = self.session.user.eid
+ affaire = self.execute('Affaire X WHERE X ref "AFFREF"').get_entity(0, 0)
+ self.execute('Any U WHERE U in_group G, (G name IN ("managers", "logilab") OR (X require_permission P?, P name "bla", P require_group G)), X eid %(x)s, U eid %(u)s',
+ {'x': affaire.eid, 'u': ueid})
+
+ def test_nonregr2(self):
+ treid = self.session.user.latest_trinfo().eid
+ rset = self.execute('Any X ORDERBY D DESC WHERE E eid %(x)s, E wf_info_for X, X modification_date D',
+ {'x': treid})
+ self.assertEquals(len(rset), 1)
+ self.assertEquals(rset.rows[0], [self.session.user.eid])
+
+
+ def test_nonregr3(self):
+ self.execute('DELETE Card X WHERE X eid %(x)s, NOT X multisource_inlined_rel Y', {'x': self.ic1})
+
+if __name__ == '__main__':
+ from logilab.common.testlib import unittest_main
+ unittest_main()--- a/server/test/unittest_rql2sql.py Wed Jan 07 14:42:43 2009 +0100
+++ b/server/test/unittest_rql2sql.py Wed Jan 07 15:37:04 2009 +0100
@@ -745,6 +745,14 @@
FROM EProperty AS P
WHERE P.for_user IS NULL'''),
+ ('Any S WHERE NOT X in_state S, X is IN(Affaire, EUser)',
+ '''SELECT DISTINCT S.eid
+FROM Affaire AS X, State AS S
+WHERE (X.in_state IS NULL OR X.in_state!=S.eid)
+INTERSECT
+SELECT DISTINCT S.eid
+FROM EUser AS X, State AS S
+WHERE (X.in_state IS NULL OR X.in_state!=S.eid)'''),
]
OUTER_JOIN = [--- a/web/facet.py Wed Jan 07 14:42:43 2009 +0100
+++ b/web/facet.py Wed Jan 07 15:37:04 2009 +0100
@@ -356,7 +356,12 @@
mainvar = self.filtered_variable
insert_attr_select_relation(rqlst, mainvar, self.rtype, self.role,
self.target_attr, self.sortfunc, self.sortasc)
- rset = self.rqlexec(rqlst.as_string(), self.rset.args, self.rset.cachekey)
+ try:
+ rset = self.rqlexec(rqlst.as_string(), self.rset.args, self.rset.cachekey)
+ except:
+ self.exception('error while getting vocabulary for %s, rql: %s',
+ self, rqlst.as_string())
+ return ()
finally:
rqlst.recover()
return self.rset_vocabulary(rset)
@@ -436,8 +441,12 @@
_cleanup_rqlst(rqlst, mainvar)
newvar, rel = _prepare_vocabulary_rqlst(rqlst, mainvar, self.rtype, self.role)
_set_orderby(rqlst, newvar, self.sortasc, self.sortfunc)
- rset = self.rqlexec(rqlst.as_string(), self.rset.args,
- self.rset.cachekey)
+ try:
+ rset = self.rqlexec(rqlst.as_string(), self.rset.args, self.rset.cachekey)
+ except:
+ self.exception('error while getting vocabulary for %s, rql: %s',
+ self, rqlst.as_string())
+ return ()
finally:
rqlst.recover()
return self.rset_vocabulary(rset)