# HG changeset patch # User sylvain.thenault@logilab.fr # Date 1239809769 -7200 # Node ID 9d61b146f5059394e2b4122b796caf24c5bbbf16 # Parent 8a3102fb47605a4c297b64b2a84b07efd570ad30# Parent a81d3babb5825e9ddd96f326ceadc9f65adb5485 backport 3.1 branch to default (duh...) diff -r a81d3babb582 -r 9d61b146f505 .hgtags --- a/.hgtags Thu Jan 15 10:13:25 2009 +0100 +++ b/.hgtags Wed Apr 15 17:36:09 2009 +0200 @@ -12,3 +12,17 @@ 18d3e56c1de4a6597ab36536964bc66b5550cf98 cubicweb-debian-version-3_0_2-1 0cb027c056f939ec3580ea1cc0aeda9f9884f0fa cubicweb-version-3_0_3 a736bae56d4a703a26933fb9875fb9caab216c6b cubicweb-debian-version-3_0_3-1 +2e400b8dfc25ae30db602f64601e30e210b3fade cubicweb-version-3_0_4 +fc222bc99929d395c1c2235c40d3bb6f247b4ba9 cubicweb-debian-version-3_0_4-1 +7ad527099393ef56f27af313392022bb8ed73082 cubicweb-version-3_0_9 +a8e9e53b245d53838a07aa8c76d1bed352692a9f cubicweb-debian-version-3_0_9-1 +a711c7c185d15a1bd22b7eaab46a26b98b74fbf3 cubicweb-version-3_1_0 +dd3efdf58d281286d6f52f7416db349b75b7789c cubicweb-debian-version-3_1_0-1 +ce8094084165419ff1717bdb2f426574bcaaad93 cubicweb-version-3_1_1 +dfaedb0bba88e3a4e931948bb0c6a9587269303f cubicweb-debian-version-3_1_1-1 +a9ba200ab15098704a6255387c558c02488551c6 cubicweb-version-3_1_2 +a823124b812f4fa494bfceb773f3ca1cd00407e8 cubicweb-debian-version-3_1_2-1 +a5dc91adb7c133f83f5ad9cceb07bc246d21ed01 cubicweb-version-3_1_3 +9e98dec0768b87363a7826a04636dc161ed0ec7d cubicweb-debian-version-3_1_3-1 +e0e0a1c3d80f4fbf4bbd55066278e467b75df8a4 cubicweb-version-3_1_4 +0e132fbae9cc5e004f4b79a8b842addad43519a7 cubicweb-debian-version-3_1_4-1 diff -r a81d3babb582 -r 9d61b146f505 MANIFEST.in --- a/MANIFEST.in Thu Jan 15 10:13:25 2009 +0100 +++ b/MANIFEST.in Wed Apr 15 17:36:09 2009 +0200 @@ -25,6 +25,6 @@ recursive-include web/test/data *.js *.css *.png *.gif *.jpg *.ico external_resources recursive-include devtools/test/data * -recursive-include skeleton *.py*.css *.js *.po compat *.in *.tmpl +recursive-include skeleton *.py *.css *.js *.po compat *.in *.tmpl prune misc/cwfs diff -r a81d3babb582 -r 9d61b146f505 __init__.py --- a/__init__.py Thu Jan 15 10:13:25 2009 +0100 +++ b/__init__.py Wed Apr 15 17:36:09 2009 +0200 @@ -2,9 +2,9 @@ relations between entitites. :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr -:license: General Public License version 2 - http://www.gnu.org/licenses +:license: Library General Public License version 2 - http://www.gnu.org/licenses """ __docformat__ = "restructuredtext en" from cubicweb.__pkginfo__ import version as __version__ diff -r a81d3babb582 -r 9d61b146f505 __pkginfo__.py --- a/__pkginfo__.py Thu Jan 15 10:13:25 2009 +0100 +++ b/__pkginfo__.py Wed Apr 15 17:36:09 2009 +0200 @@ -6,11 +6,11 @@ distname = "cubicweb" modname = "cubicweb" -numversion = (3, 0, 3) +numversion = (3, 1, 5) version = '.'.join(str(num) for num in numversion) -license = 'LCL' -copyright = '''Copyright (c) 2003-2008 LOGILAB S.A. (Paris, FRANCE). +license = 'LGPL v2' +copyright = '''Copyright (c) 2003-2009 LOGILAB S.A. (Paris, FRANCE). http://www.logilab.fr/ -- mailto:contact@logilab.fr''' author = "Logilab" @@ -27,11 +27,12 @@ * a bunch of other management tools """ -web = '' -ftp = '' -pyversions = ['2.4'] +web = 'http://www.cubicweb.org' +ftp = 'ftp://ftp.logilab.org/pub/cubicweb' +pyversions = ['2.4', '2.5'] +import sys from os import listdir, environ from os.path import join, isdir import glob @@ -60,7 +61,8 @@ # --home install pydir = 'python' else: - pydir = join('python2.4', 'site-packages') + python_version = '.'.join(str(num) for num in sys.version_info[0:2]) + pydir = join('python' + python_version, 'site-packages') try: data_files = [ @@ -90,7 +92,6 @@ [join('share', 'cubicweb', 'cubes', 'shared', 'i18n'), [join(i18n_dir, fname) for fname in listdir(i18n_dir)]], # skeleton - ] except OSError: # we are in an installed directory, don't care about this diff -r a81d3babb582 -r 9d61b146f505 _exceptions.py --- a/_exceptions.py Thu Jan 15 10:13:25 2009 +0100 +++ b/_exceptions.py Wed Apr 15 17:36:09 2009 +0200 @@ -2,7 +2,7 @@ :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" diff -r a81d3babb582 -r 9d61b146f505 common/appobject.py --- a/common/appobject.py Thu Jan 15 10:13:25 2009 +0100 +++ b/common/appobject.py Wed Apr 15 17:36:09 2009 +0200 @@ -1,7 +1,7 @@ """Base class for dynamically loaded objects manipulated in the web interface :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -12,6 +12,8 @@ from simplejson import dumps from logilab.common.deprecation import obsolete + +from rql.nodes import VariableRef, SubQuery from rql.stmts import Union, Select from cubicweb import Unauthorized diff -r a81d3babb582 -r 9d61b146f505 common/entity.py --- a/common/entity.py Thu Jan 15 10:13:25 2009 +0100 +++ b/common/entity.py Wed Apr 15 17:36:09 2009 +0200 @@ -1,7 +1,7 @@ """Base class for entity objects manipulated in clients :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -41,6 +41,8 @@ 'inlineview')) def __init__(self, eclass, tagdefs): + # XXX if a rtag is redefined in a subclass, + # the rtag of the base class overwrite the rtag of the subclass self.eclass = eclass self._tagdefs = {} for relation, tags in tagdefs.iteritems(): @@ -391,6 +393,10 @@ res['source'] = self.req.source_defs()[res['source']] return res + def clear_local_perm_cache(self, action): + for rqlexpr in self.e_schema.get_rqlexprs(action): + self.req.local_perm_cache.pop((rqlexpr.eid, (('x', self.eid),)), None) + def check_perm(self, action): self.e_schema.check_perm(self.req, action, self.eid) @@ -998,6 +1004,7 @@ _done.add(self.eid) containers = tuple(self.e_schema.fulltext_containers()) if containers: + yielded = False for rschema, target in containers: if target == 'object': targets = getattr(self, rschema.type) @@ -1008,6 +1015,9 @@ continue for container in entity.fti_containers(_done): yield container + yielded = True + if not yielded: + yield self else: yield self diff -r a81d3babb582 -r 9d61b146f505 common/migration.py --- a/common/migration.py Thu Jan 15 10:13:25 2009 +0100 +++ b/common/migration.py Wed Apr 15 17:36:09 2009 +0200 @@ -312,12 +312,18 @@ """a configuration option's type has changed""" self._option_changes.append(('typechanged', optname, oldtype, newvalue)) - def cmd_add_cube(self, cube): + def cmd_add_cubes(self, cubes): + """modify the list of used cubes in the in-memory config + returns newly inserted cubes, including dependencies + """ + if isinstance(cubes, basestring): + cubes = (cubes,) origcubes = self.config.cubes() - newcubes = [p for p in self.config.expand_cubes([cube]) + newcubes = [p for p in self.config.expand_cubes(cubes) if not p in origcubes] if newcubes: - assert cube in newcubes + for cube in cubes: + assert cube in newcubes self.config.add_cubes(newcubes) return newcubes @@ -346,7 +352,7 @@ if optdescr[0] == 'added': optdict = self.config.get_option_def(optdescr[1]) if optdict.get('default') is REQUIRED: - self.config.input_option(option, optdict) + self.config.input_option(optdescr[1], optdict) self.config.generate_config(open(newconfig, 'w')) show_diffs(configfile, newconfig) if exists(newconfig): diff -r a81d3babb582 -r 9d61b146f505 common/mixins.py --- a/common/mixins.py Thu Jan 15 10:13:25 2009 +0100 +++ b/common/mixins.py Wed Apr 15 17:36:09 2009 +0200 @@ -2,7 +2,7 @@ :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -145,7 +145,6 @@ return self.iterchildren() def is_leaf(self): - print '*' * 80 return len(self.children()) == 0 def is_root(self): @@ -165,21 +164,25 @@ @property def state(self): - return self.in_state[0].name + try: + return self.in_state[0].name + except IndexError: + self.warning('entity %s has no state', self) + return None @property def displayable_state(self): return self.req._(self.state) def wf_state(self, statename): - rset = self.req.execute('Any S, SN WHERE S name %(n)s, S state_of E, E name %(e)s', + rset = self.req.execute('Any S, SN WHERE S name SN, S name %(n)s, S state_of E, E name %(e)s', {'n': statename, 'e': str(self.e_schema)}) if rset: return rset.get_entity(0, 0) return None def wf_transition(self, trname): - rset = self.req.execute('Any T, TN WHERE T name %(n)s, T transition_of E, E name %(e)s', + rset = self.req.execute('Any T, TN WHERE T name TN, T name %(n)s, T transition_of E, E name %(e)s', {'n': trname, 'e': str(self.e_schema)}) if rset: return rset.get_entity(0, 0) @@ -189,6 +192,7 @@ """change the entity's state according to a state defined in given parameters """ + assert not isinstance(stateeid, basestring), 'change_state wants a state eid' if trcomment: self.req.set_shared_data('trcomment', trcomment) if trcommentformat: @@ -366,22 +370,18 @@ """provide default implementations for IProgress interface methods""" @property - @cached def cost(self): return self.progress_info()['estimated'] @property - @cached def revised_cost(self): return self.progress_info().get('estimatedcorrected', self.cost) @property - @cached def done(self): return self.progress_info()['done'] @property - @cached def todo(self): return self.progress_info()['todo'] @@ -400,6 +400,6 @@ return 100. * self.done / self.revised_cost except ZeroDivisionError: # total cost is 0 : if everything was estimated, task is completed - if self.progress_info().get('notestmiated'): + if self.progress_info().get('notestimated'): return 0. return 100 diff -r a81d3babb582 -r 9d61b146f505 common/registerers.py --- a/common/registerers.py Thu Jan 15 10:13:25 2009 +0100 +++ b/common/registerers.py Wed Apr 15 17:36:09 2009 +0200 @@ -101,6 +101,8 @@ def equivalent(self, other): if _accepts_interfaces(self.vobject) != _accepts_interfaces(other): return False + if getattr(self.vobject, 'require_groups', ()) != getattr(other, 'require_groups', ()): + return False try: newaccepts = list(other.accepts) for etype in self.vobject.accepts: diff -r a81d3babb582 -r 9d61b146f505 common/rest.py --- a/common/rest.py Thu Jan 15 10:13:25 2009 +0100 +++ b/common/rest.py Wed Apr 15 17:36:09 2009 +0200 @@ -1,9 +1,19 @@ """rest publishing functions -contains some functions and setup of docutils for cubicweb +contains some functions and setup of docutils for cubicweb. Provides the +following ReST directives: + +* `eid`, create link to entity in the repository by their eid + +* `card`, create link to card entity in the repository by their wikiid + (proposing to create it when the refered card doesn't exist yet) + +* `winclude`, reference to a web documentation file (in wdoc/ directories) + +* `sourcecode` (if pygments is installed), source code colorization :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -156,6 +166,36 @@ 'encoding': directives.encoding} directives.register_directive('winclude', winclude_directive) +try: + from pygments import highlight + from pygments.lexers import get_lexer_by_name, LEXERS + from pygments.formatters import HtmlFormatter +except ImportError: + pass +else: + _PYGMENTS_FORMATTER = HtmlFormatter() + + def pygments_directive(name, arguments, options, content, lineno, + content_offset, block_text, state, state_machine): + try: + lexer = get_lexer_by_name(arguments[0]) + except ValueError: + import traceback + traceback.print_exc() + print sorted(aliases for module_name, name, aliases, _, _ in LEXERS.itervalues()) + # no lexer found + lexer = get_lexer_by_name('text') + print 'LEXER', lexer + parsed = highlight(u'\n'.join(content), lexer, _PYGMENTS_FORMATTER) + context = state.document.settings.context + context.req.add_css('pygments.css') + return [nodes.raw('', parsed, format='html')] + + pygments_directive.arguments = (1, 0, 1) + pygments_directive.content = 1 + directives.register_directive('sourcecode', pygments_directive) + + class CubicWebReSTParser(Parser): """The (customized) reStructuredText parser.""" diff -r a81d3babb582 -r 9d61b146f505 common/selectors.py --- a/common/selectors.py Thu Jan 15 10:13:25 2009 +0100 +++ b/common/selectors.py Wed Apr 15 17:36:09 2009 +0200 @@ -20,12 +20,12 @@ above by:: # in Python2.5 - from cubicweb.selectors import traced_selection + from cubicweb.common.selectors import traced_selection with traced_selection(): self.view('calendar', myrset) # in Python2.4 - from cubicweb import selectors + from cubicweb.common import selectors selectors.TRACED_OIDS = ('calendar',) self.view('calendar', myrset) selectors.TRACED_OIDS = () @@ -50,7 +50,6 @@ from cubicweb.cwconfig import CubicWebConfiguration from cubicweb.schema import split_expression - # helpers for debugging selectors SELECTOR_LOGGER = logging.getLogger('cubicweb.selectors') TRACED_OIDS = () @@ -62,8 +61,9 @@ def traced(cls, *args, **kwargs): ret = selector(cls, *args, **kwargs) if TRACED_OIDS == 'all' or cls.id in TRACED_OIDS: - SELECTOR_LOGGER.warning('selector %s returned %s for %s', selector.__name__, ret, cls) + SELECTOR_LOGGER.critical('selector %s returned %s for %s', selector.__name__, ret, cls) return ret + traced.__name__ = selector.__name__ return traced class traced_selection(object): @@ -110,12 +110,12 @@ norset_selector = deprecated_function(none_rset) @lltrace -def rset(cls, req, rset, *args, **kwargs): +def any_rset(cls, req, rset, *args, **kwargs): """accept result set, whatever the number of result""" if rset is not None: return 1 return 0 -rset_selector = deprecated_function(rset) +rset_selector = deprecated_function(any_rset) @lltrace def nonempty_rset(cls, req, rset, *args, **kwargs): @@ -161,13 +161,20 @@ def paginated_rset(cls, req, rset, *args, **kwargs): """accept result sets with more rows than the page size """ - if rset is None or len(rset) <= req.property_value('navigation.page-size'): + page_size = kwargs.get('page_size') + if page_size is None: + page_size = req.form.get('page_size') + if page_size is None: + page_size = req.property_value('navigation.page-size') + else: + page_size = int(page_size) + if rset is None or len(rset) <= page_size: return 0 return 1 largerset_selector = deprecated_function(paginated_rset) @lltrace -def sorted_rset(cls, req, rset, row=None, col=None): +def sorted_rset(cls, req, rset, row=None, col=None, **kwargs): """accept sorted result set""" rqlst = rset.syntax_tree() if len(rqlst.children) > 1 or not rqlst.children[0].orderby: @@ -222,7 +229,7 @@ @lltrace def authenticated_user(cls, req, *args, **kwargs): """accept if user is authenticated""" - return not anonymous_selector(cls, req, *args, **kwargs) + return not anonymous_user(cls, req, *args, **kwargs) not_anonymous_selector = deprecated_function(authenticated_user) @lltrace @@ -499,7 +506,7 @@ propval = req.property_value('%s.%s.context' % (cls.__registry__, cls.id)) if not propval: propval = cls.context - if context is not None and propval is not None and context != propval: + if context is not None and propval and context != propval: return 0 return 1 contextprop_selector = deprecated_function(match_context_prop) @@ -529,28 +536,36 @@ # compound selectors ########################################################## non_final_entity = chainall(nonempty_rset, _non_final_entity) +non_final_entity.__name__ = 'non_final_entity' nfentity_selector = deprecated_function(non_final_entity) implement_interface = chainall(non_final_entity, _implement_interface) +implement_interface.__name__ = 'implement_interface' interface_selector = deprecated_function(implement_interface) accept = chainall(non_final_entity, accept_rset) +accept.__name__ = 'accept' accept_selector = deprecated_function(accept) -accept_one = chainall(one_line_rset, accept_selector) +accept_one = chainall(one_line_rset, accept) +accept_one.__name__ = 'accept_one' accept_one_selector = deprecated_function(accept_one) rql_condition = chainall(non_final_entity, one_line_rset, _rql_condition) +rql_condition.__name__ = 'rql_condition' rqlcondition_selector = deprecated_function(rql_condition) searchstate_accept = chainall(nonempty_rset, match_search_state, accept) +searchstate_accept.__name__ = 'searchstate_accept' searchstate_accept_selector = deprecated_function(searchstate_accept) searchstate_accept_one = chainall(one_line_rset, match_search_state, accept, _rql_condition) +searchstate_accept_one.__name__ = 'searchstate_accept_one' searchstate_accept_one_selector = deprecated_function(searchstate_accept_one) searchstate_accept_one_but_etype = chainall(searchstate_accept_one, but_etype) +searchstate_accept_one_but_etype.__name__ = 'searchstate_accept_one_but_etype' searchstate_accept_one_but_etype_selector = deprecated_function( searchstate_accept_one_but_etype) diff -r a81d3babb582 -r 9d61b146f505 common/test/unittest_entity.py --- a/common/test/unittest_entity.py Thu Jan 15 10:13:25 2009 +0100 +++ b/common/test/unittest_entity.py Wed Apr 15 17:36:09 2009 +0200 @@ -250,8 +250,7 @@ self.assertListEquals(rbc(e.relations_by_category('generic')), [('primary_email', 'subject'), ('evaluee', 'subject'), - ('for_user', 'object'), - ('bookmarked_by', 'object')]) + ('for_user', 'object')]) # owned_by is defined both as subject and object relations on EUser self.assertListEquals(rbc(e.relations_by_category('generated')), [('last_login_time', 'subject'), @@ -263,7 +262,8 @@ ('owned_by', 'subject'), ('created_by', 'object'), ('wf_info_for', 'object'), - ('owned_by', 'object')]) + ('owned_by', 'object'), + ('bookmarked_by', 'object')]) e = self.etype_instance('Personne') self.assertListEquals(rbc(e.relations_by_category('primary')), [('nom', 'subject'), ('eid', 'subject')]) diff -r a81d3babb582 -r 9d61b146f505 common/test/unittest_mixins.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/test/unittest_mixins.py Wed Apr 15 17:36:09 2009 +0200 @@ -0,0 +1,25 @@ +from logilab.common.testlib import unittest_main +from cubicweb.devtools.apptest import EnvBasedTC + +class WorkfloableMixInTC(EnvBasedTC): + def test_wf_state(self): + s = self.add_entity('State', name=u'activated') + self.execute('SET X state_of ET WHERE ET name "Bookmark", X eid %(x)s', + {'x': s.eid}) + es = self.user().wf_state('activated') + self.assertEquals(es.state_of[0].name, 'EUser') + + def test_wf_transition(self): + t = self.add_entity('Transition', name=u'deactivate') + self.execute('SET X transition_of ET WHERE ET name "Bookmark", X eid %(x)s', + {'x': t.eid}) + et = self.user().wf_transition('deactivate') + self.assertEquals(et.transition_of[0].name, 'EUser') + + def test_change_state(self): + user = self.user() + user.change_state(user.wf_state('deactivated').eid) + self.assertEquals(user.state, 'deactivated') + +if __name__ == '__main__': + unittest_main() diff -r a81d3babb582 -r 9d61b146f505 common/uilib.py --- a/common/uilib.py Thu Jan 15 10:13:25 2009 +0100 +++ b/common/uilib.py Wed Apr 15 17:36:09 2009 +0200 @@ -4,7 +4,7 @@ contains some functions designed to help implementation of cubicweb user interface :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -180,21 +180,27 @@ if add_ellipsis: return text + u'...' return text - -def text_cut(text, nbwords=30): + +def text_cut(text, nbwords=30, gotoperiod=True): """from the given plain text, return a text with at least words, trying to go to the end of the current sentence. + :param nbwords: the minimum number of words required + :param gotoperiod: specifies if the function should try to go to + the first period after the cut (i.e. finish + the sentence if possible) + Note that spaces are normalized. """ if text is None: return u'' words = text.split() - text = ' '.join(words) # normalize spaces - minlength = len(' '.join(words[:nbwords])) - textlength = text.find('.', minlength) + 1 - if textlength == 0: # no point found - textlength = minlength + text = u' '.join(words) # normalize spaces + textlength = minlength = len(' '.join(words[:nbwords])) + if gotoperiod: + textlength = text.find('.', minlength) + 1 + if textlength == 0: # no period found + textlength = minlength return text[:textlength] def cut(text, length): @@ -213,6 +219,21 @@ # HTML generation helper functions ############################################ +def simple_sgml_tag(tag, content=None, **attrs): + """generation of a simple sgml tag (eg without children tags) easier + + content and attributes will be escaped + """ + value = u'<%s' % tag + if attrs: + value += u' ' + u' '.join(u'%s="%s"' % (attr, html_escape(unicode(value))) + for attr, value in attrs.items()) + if content: + value += u'>%s' % (html_escape(unicode(content)), tag) + else: + value += u'/>' + return value + def tooltipize(text, tooltip, url=None): """make an HTML tooltip""" url = url or '#' diff -r a81d3babb582 -r 9d61b146f505 common/view.py --- a/common/view.py Thu Jan 15 10:13:25 2009 +0100 +++ b/common/view.py Wed Apr 15 17:36:09 2009 +0200 @@ -2,7 +2,7 @@ :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -28,9 +28,9 @@ ] ''' TRANSITIONAL_DOCTYPE = u'\n' @@ -71,7 +73,7 @@ A view is instantiated to render a [part of a] result set. View subclasses may be parametred using the following class attributes: - + * `templatable` indicates if the view may be embeded in a main template or if it has to be rendered standalone (i.e. XML for instance) @@ -85,14 +87,14 @@ time to a write function to use. """ __registry__ = 'views' - + templatable = True need_navigation = True # content_type = 'application/xhtml+xml' # text/xhtml' binary = False add_to_breadcrumbs = True category = 'view' - + def __init__(self, req, rset): super(View, self).__init__(req, rset) self.w = None @@ -102,7 +104,7 @@ if self.req.xhtml_browser(): return 'application/xhtml+xml' return 'text/html' - + def set_stream(self, w=None): if self.w is not None: return @@ -118,14 +120,14 @@ return stream # main view interface ##################################################### - + def dispatch(self, w=None, **context): """called to render a view object for a result set. This method is a dispatched to an actual method selected according to optional row and col parameters, which are locating a particular row or cell in the result set: - + * if row [and col] are specified, `cell_call` is called * if none of them is supplied, the view is considered to apply on the whole result set (which may be None in this case), `call` is @@ -147,7 +149,7 @@ # should default .call() method add a
around each # rset item add_div_section = True - + def call(self, **kwargs): """the view is called for an entire result set, by default loop other rows of the result set and call the same view on the @@ -169,10 +171,10 @@ def cell_call(self, row, col, **kwargs): """the view is called for a particular result set cell""" raise NotImplementedError, self - + def linkable(self): """return True if the view may be linked in a menu - + by default views without title are not meant to be displayed """ if not getattr(self, 'title', None): @@ -181,7 +183,7 @@ def is_primary(self): return self.id == 'primary' - + def url(self): """return the url associated with this view. Should not be necessary for non linkable views, but a default implementation @@ -197,7 +199,7 @@ self.req.set_content_type(self.content_type) # view utilities ########################################################## - + def view(self, __vid, rset, __fallback_vid=None, **kwargs): """shortcut to self.vreg.render method avoiding to pass self.req""" try: @@ -207,7 +209,7 @@ raise view = self.vreg.select_view(__fallback_vid, self.req, rset, **kwargs) return view.dispatch(**kwargs) - + def wview(self, __vid, rset, __fallback_vid=None, **kwargs): """shortcut to self.view method automatically passing self.w as argument """ @@ -234,7 +236,7 @@ label = label or self.req._(action.title) return u'%s' % (html_escape(action.url()), label) return u'' - + def html_headers(self): """return a list of html headers (eg something to be inserted between and of the returned page @@ -242,7 +244,7 @@ by default return a meta tag to disable robot indexation of the page """ return [NOINDEX] - + def page_title(self): """returns a title according to the result set - used for the title in the HTML header @@ -292,7 +294,7 @@ """ return the url of the entity creation form for a given entity type""" return self.req.build_url('add/%s'%etype, **kwargs) - + # concrete views base classes ################################################# class EntityView(View): @@ -300,8 +302,9 @@ """ __registerer__ = accepts_registerer __selectors__ = (accept,) + accepts = ('Any',) category = 'entityview' - + def field(self, label, value, row=True, show_label=True, w=None, tr=True): """ read-only field """ if w is None: @@ -316,7 +319,7 @@ if row: w(u'
') - + class StartupView(View): """base class for views which doesn't need a particular result set to be displayed (so they can always be displayed !) @@ -325,7 +328,7 @@ __selectors__ = (match_user_group, none_rset) require_groups = () category = 'startupview' - + def url(self): """return the url associated with this view. We can omit rql here""" return self.build_url('view', vid=self.id) @@ -345,9 +348,9 @@ """ __registerer__ = accepts_registerer __selectors__ = (chainfirst(none_rset, accept),) - + default_rql = None - + def __init__(self, req, rset): super(EntityStartupView, self).__init__(req, rset) if rset is None: @@ -357,7 +360,7 @@ def startup_rql(self): """return some rql to be executedif the result set is None""" return self.default_rql - + def call(self, **kwargs): """override call to execute rql returned by the .startup_rql method if necessary @@ -376,14 +379,14 @@ return self.build_url(vid=self.id) return super(EntityStartupView, self).url() - + class AnyRsetView(View): """base class for views applying on any non empty result sets""" __registerer__ = priority_registerer __selectors__ = (nonempty_rset,) - + category = 'anyrsetview' - + def columns_labels(self, tr=True): if tr: translate = display_name @@ -400,7 +403,7 @@ label = translate(self.req, attr) labels.append(label) return labels - + class EmptyRsetView(View): """base class for views applying on any empty result sets""" @@ -419,7 +422,7 @@ __selectors__ = (match_user_group,) require_groups = () - + def template(self, oid, **kwargs): """shortcut to self.registry.render method on the templates registry""" w = kwargs.pop('w', self.w) diff -r a81d3babb582 -r 9d61b146f505 cwconfig.py --- a/cwconfig.py Thu Jan 15 10:13:25 2009 +0100 +++ b/cwconfig.py Wed Apr 15 17:36:09 2009 +0200 @@ -2,7 +2,7 @@ """common configuration utilities for cubicweb :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -10,7 +10,7 @@ import sys import os import logging -from os.path import exists, join, expanduser, abspath, basename +from os.path import exists, join, expanduser, abspath, normpath, basename, isdir from logilab.common.decorators import cached from logilab.common.logging_ext import set_log_methods, init_log @@ -148,9 +148,11 @@ if os.environ.get('APYCOT_ROOT'): mode = 'test' CUBES_DIR = '%(APYCOT_ROOT)s/local/share/cubicweb/cubes/' % os.environ + # create __init__ file + file(join(CUBES_DIR, '__init__.py'), 'w').close() elif exists(join(CW_SOFTWARE_ROOT, '.hg')): mode = 'dev' - CUBES_DIR = join(CW_SOFTWARE_ROOT, '../cubes') + CUBES_DIR = abspath(normpath(join(CW_SOFTWARE_ROOT, '../cubes'))) else: mode = 'installed' CUBES_DIR = '/usr/share/cubicweb/cubes/' @@ -223,7 +225,7 @@ """ if cls.mode in ('dev', 'test') and not os.environ.get('APYCOT_ROOT'): return join(CW_SOFTWARE_ROOT, 'web') - return join(cls.cubes_dir(), 'shared') + return cls.cube_dir('shared') @classmethod def i18n_lib_dir(cls): @@ -234,26 +236,38 @@ @classmethod def available_cubes(cls): - cubes_dir = cls.cubes_dir() - return sorted(cube for cube in os.listdir(cubes_dir) - if os.path.isdir(os.path.join(cubes_dir, cube)) - and not cube in ('CVS', '.svn', 'shared', '.hg')) + cubes = set() + for directory in cls.cubes_search_path(): + for cube in os.listdir(directory): + if isdir(join(directory, cube)) and not cube in ('CVS', '.svn', 'shared', '.hg'): + cubes.add(cube) + return sorted(cubes) @classmethod - def cubes_dir(cls): - """return the application cubes directory""" - return env_path('CW_CUBES', cls.CUBES_DIR, 'cubes') + def cubes_search_path(cls): + """return the path of directories where cubes should be searched""" + path = [] + try: + for directory in os.environ['CW_CUBES_PATH'].split(os.pathsep): + directory = abspath(normpath(directory)) + if exists(directory) and not directory in path: + path.append(directory) + except KeyError: + pass + if not cls.CUBES_DIR in path: + path.append(cls.CUBES_DIR) + return path @classmethod def cube_dir(cls, cube): """return the cube directory for the given cube id, raise ConfigurationError if it doesn't exists """ - cube_dir = join(cls.cubes_dir(), cube) - if not exists(cube_dir): - raise ConfigurationError('no cube %s in %s' % ( - cube, cls.cubes_dir())) - return cube_dir + for directory in cls.cubes_search_path(): + cubedir = join(directory, cube) + if exists(cubedir): + return cubedir + raise ConfigurationError('no cube %s in %s' % (cube, cls.cubes_search_path())) @classmethod def cube_migration_scripts_dir(cls, cube): @@ -339,12 +353,14 @@ @classmethod def cls_adjust_sys_path(cls): """update python path if necessary""" + cubes_parent_dir = normpath(join(cls.CUBES_DIR, '..')) + if not cubes_parent_dir in sys.path: + sys.path.insert(0, cubes_parent_dir) try: - templdir = abspath(join(cls.cubes_dir(), '..')) - if not templdir in sys.path: - sys.path.insert(0, templdir) - except ConfigurationError: - return # cube dir doesn't exists + import cubes + cubes.__path__ = cls.cubes_search_path() + except ImportError: + return # cubes dir doesn't exists @classmethod def load_cwctl_plugins(cls): @@ -356,10 +372,9 @@ if exists(join(CW_SOFTWARE_ROOT, ctlfile)): load_module_from_file(join(CW_SOFTWARE_ROOT, ctlfile)) cls.info('loaded cubicweb-ctl plugin %s', ctlfile) - templdir = cls.cubes_dir() for cube in cls.available_cubes(): - pluginfile = join(templdir, cube, 'ecplugin.py') - initfile = join(templdir, cube, '__init__.py') + pluginfile = join(cls.cube_dir(cube), 'ecplugin.py') + initfile = join(cls.cube_dir(cube), '__init__.py') if exists(pluginfile): try: __import__('cubes.%s.ecplugin' % cube) @@ -486,17 +501,16 @@ class CubicWebConfiguration(CubicWebNoAppConfiguration): """base class for cubicweb server and web configurations""" + INSTANCE_DATA_DIR = None if CubicWebNoAppConfiguration.mode == 'test': root = os.environ['APYCOT_ROOT'] REGISTRY_DIR = '%s/etc/cubicweb.d/' % root - INSTANCE_DATA_DIR = REGISTRY_DIR RUNTIME_DIR = '/tmp/' MIGRATION_DIR = '%s/local/share/cubicweb/migration/' % root if not exists(REGISTRY_DIR): os.makedirs(REGISTRY_DIR) elif CubicWebNoAppConfiguration.mode == 'dev': REGISTRY_DIR = expanduser('~/etc/cubicweb.d/') - INSTANCE_DATA_DIR = REGISTRY_DIR RUNTIME_DIR = '/tmp/' MIGRATION_DIR = join(CW_SOFTWARE_ROOT, 'misc', 'migration') else: #mode = 'installed' @@ -559,7 +573,8 @@ @classmethod def instance_data_dir(cls): """return the instance data directory""" - return env_path('CW_INSTANCE_DATA', cls.INSTANCE_DATA_DIR, + return env_path('CW_INSTANCE_DATA', + cls.INSTANCE_DATA_DIR or cls.REGISTRY_DIR, 'additional data') @classmethod diff -r a81d3babb582 -r 9d61b146f505 cwctl.py --- a/cwctl.py Thu Jan 15 10:13:25 2009 +0100 +++ b/cwctl.py Wed Apr 15 17:36:09 2009 +0200 @@ -173,19 +173,18 @@ continue print ' ', line print + cubesdirs = ', '.join(CubicWebConfiguration.cubes_search_path()) try: - cubesdir = CubicWebConfiguration.cubes_dir() namesize = max(len(x) for x in CubicWebConfiguration.available_cubes()) except ConfigurationError, ex: print 'No cubes available:', ex except ValueError: - print 'No cubes available in %s' % cubesdir + print 'No cubes available in %s' % cubesdirs else: - print 'Available cubes (%s):' % cubesdir + print 'Available cubes (%s):' % cubesdirs for cube in CubicWebConfiguration.available_cubes(): if cube in ('CVS', '.svn', 'shared', '.hg'): continue - templdir = join(cubesdir, cube) try: tinfo = CubicWebConfiguration.cube_pkginfo(cube) tversion = tinfo.version @@ -198,7 +197,7 @@ or tinfo.__doc__) if shortdesc: print ' '+ ' \n'.join(shortdesc.splitlines()) - modes = detect_available_modes(templdir) + modes = detect_available_modes(CubicWebConfiguration.cube_dir(cube)) print ' available modes: %s' % ', '.join(modes) print try: @@ -620,7 +619,11 @@ config = CubicWebConfiguration.config_for(appid) config.creating = True # notice we're not starting the server config.verbosity = self.config.verbosity - config.set_sources_mode(self.config.ext_sources or ('migration',)) + try: + config.set_sources_mode(self.config.ext_sources or ('migration',)) + except AttributeError: + # not a server config + pass # get application and installed versions for the server and the componants print 'getting versions configuration from the repository...' mih = config.migration_handler() diff -r a81d3babb582 -r 9d61b146f505 cwvreg.py --- a/cwvreg.py Thu Jan 15 10:13:25 2009 +0100 +++ b/cwvreg.py Wed Apr 15 17:36:09 2009 +0200 @@ -1,7 +1,7 @@ """extend the generic VRegistry with some cubicweb specific stuff :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -12,7 +12,7 @@ from rql import RQLHelper -from cubicweb import Binary, UnknownProperty +from cubicweb import Binary, UnknownProperty, UnknownEid from cubicweb.vregistry import VRegistry, ObjectNotFound, NoSelectableObject _ = unicode @@ -322,9 +322,9 @@ if vocab is not None: if callable(vocab): # list() just in case its a generator function - vocabfunc = lambda e: list(vocab(propkey, req)) + vocabfunc = lambda **kwargs: list(vocab(propkey, req)) else: - vocabfunc = lambda e: vocab + vocabfunc = lambda **kwargs: vocab w = StaticComboBoxWidget(self, 'EProperty', self.schema['value'], 'String', vocabfunc=vocabfunc, description=tr(pdef['help']), **attrs) @@ -337,7 +337,11 @@ rqlst = self.rqlhelper.parse(rql) def type_from_eid(eid, session=session): return session.describe(eid)[0] - self.rqlhelper.compute_solutions(rqlst, {'eid': type_from_eid}, args) + try: + self.rqlhelper.compute_solutions(rqlst, {'eid': type_from_eid}, args) + except UnknownEid: + for select in rqlst.children: + select.solutions = [] return rqlst @property diff -r a81d3babb582 -r 9d61b146f505 debian.hardy/compat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian.hardy/compat Wed Apr 15 17:36:09 2009 +0200 @@ -0,0 +1,1 @@ +5 diff -r a81d3babb582 -r 9d61b146f505 debian.hardy/control --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian.hardy/control Wed Apr 15 17:36:09 2009 +0200 @@ -0,0 +1,131 @@ +Source: cubicweb +Section: web +Priority: optional +Maintainer: Logilab S.A. +Uploaders: Sylvain Thenault , + Julien Jehannet , + Aurélien Campéas +Build-Depends: debhelper (>= 5), python-dev (>=2.4), python-central (>= 0.5) +Standards-Version: 3.8.0 +Homepage: http://www.cubicweb.org +XS-Python-Version: >= 2.4, << 2.6 + + +Package: cubicweb +Architecture: all +XB-Python-Version: ${python:Versions} +Depends: ${python:Depends}, cubicweb-server (= ${source:Version}), cubicweb-twisted (= ${source:Version}), cubicweb-client (= ${source:Version}) +XB-Recommends: (postgresql, postgresql-plpython, postgresql-contrib) | mysql | sqlite3 +Recommends: postgresql | mysql | sqlite3 +Description: the complete CubicWeb framework + CubicWeb is a semantic web application framework. + . + This package will install all the components you need to run cubicweb on + a single machine. You can also deploy cubicweb by running the different + process on different computers, in which case you need to install the + corresponding packages on the different hosts. + + +Package: cubicweb-server +Architecture: all +XB-Python-Version: ${python:Versions} +Conflicts: cubicweb-multisources +Replaces: cubicweb-multisources +Provides: cubicweb-multisources +Depends: ${python:Depends}, cubicweb-common (= ${source:Version}), cubicweb-ctl (= ${source:Version}), python-indexer (>= 0.6.1), python-psycopg2 | python-mysqldb | python-pysqlite2 +Recommends: pyro, cubicweb-documentation (= ${source:Version}) +Description: server part of the CubicWeb framework + CubicWeb is a semantic web application framework. + . + This package provides the repository server part of the system. + . + This package provides the repository server part of the library and + necessary shared data files such as the schema library. + + +Package: cubicweb-twisted +Architecture: all +XB-Python-Version: ${python:Versions} +Provides: cubicweb-web-frontend +Depends: ${python:Depends}, cubicweb-web (= ${source:Version}), cubicweb-ctl (= ${source:Version}), python-twisted-web2 +Recommends: pyro, cubicweb-documentation (= ${source:Version}) +Description: twisted-based web interface for the CubicWeb framework + CubicWeb is a semantic web application framework. + . + This package provides a twisted based HTTP server to serve + the adaptative web interface (see cubicweb-web package). + . + This package provides only the twisted server part of the library. + + +Package: cubicweb-web +Architecture: all +XB-Python-Version: ${python:Versions} +Depends: ${python:Depends}, cubicweb-common (= ${source:Version}), python-docutils, python-vobject, python-elementtree +Recommends: fckeditor +Description: web interface library for the CubicWeb framework + CubicWeb is a semantic web application framework. + . + This package provides an adaptative web interface to the CubicWeb server. + Install the cubicweb-twisted package to serve this interface via HTTP. + . + This package provides the web interface part of the library and + necessary shared data files such as defaut views, images... + + +Package: cubicweb-common +Architecture: all +XB-Python-Version: ${python:Versions} +Depends: ${python:Depends}, python-logilab-mtconverter (>= 0.6.0), python-simpletal (>= 4.0), graphviz, gettext, python-lxml, python-logilab-common (>= 0.38.1), python-yams (>= 0.20.2), python-rql (>= 0.20.2), python-simplejson (>= 1.3) +Recommends: python-psyco +Conflicts: cubicweb-core +Replaces: cubicweb-core +Description: common library for the CubicWeb framework + CubicWeb is a semantic web application framework. + . + This package provides the common parts of the library used by both server + code and web application code. + + +Package: cubicweb-ctl +Architecture: all +XB-Python-Version: ${python:Versions} +Depends: ${python:Depends}, cubicweb-common (= ${source:Version}) +Description: tool to manage the CubicWeb framework + CubicWeb is a semantic web application framework. + . + This package provides a control script to manage (create, upgrade, start, + stop, etc) CubicWeb applications. It also include the init.d script + to automatically start and stop CubicWeb applications on boot or shutdown. + + +Package: cubicweb-client +Architecture: all +XB-Python-Version: ${python:Versions} +Depends: ${python:Depends}, cubicweb-ctl (= ${source:Version}), pyro +Description: RQL command line client for the CubicWeb framework + CubicWeb is a semantic web application framework. + . + This package provides a RQL (Relation Query Language) command line client using + pyro to connect to a repository server. + + +Package: cubicweb-dev +Architecture: all +XB-Python-Version: ${python:Versions} +Depends: ${python:Depends}, cubicweb-server (= ${source:Version}), cubicweb-web (= ${source:Version}), python-pysqlite2 +Suggests: w3c-dtd-xhtml +Description: tests suite and development tools for the CubicWeb framework + CubicWeb is a semantic web application framework. + . + This package provides the CubicWeb tests suite and some development tools + helping in the creation of application. + + +Package: cubicweb-documentation +Architecture: all +Recommends: doc-base +Description: documentation for the CubicWeb framework + CubicWeb is a semantic web application framework. + . + This package provides the system's documentation. diff -r a81d3babb582 -r 9d61b146f505 debian.hardy/rules --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian.hardy/rules Wed Apr 15 17:36:09 2009 +0200 @@ -0,0 +1,78 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +PY_VERSION:=$(shell pyversions -d) + +build: build-stamp +build-stamp: + dh_testdir + # XXX doesn't work if logilab-doctools, logilab-xml are not in build depends + # and I can't get pbuilder find them in its chroot :( + # cd doc && make + # FIXME cleanup and use sphinx-build as build-depends ? + python setup.py build + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + rm -rf build + #rm -rf debian/cubicweb-*/ + find . -name "*.pyc" -delete + rm -f $(basename $(wildcard debian/*.in)) + dh_clean + +install: build $(basename $(wildcard debian/*.in)) + dh_testdir + dh_testroot + dh_clean + dh_installdirs + + #python setup.py install_lib --no-compile --install-dir=debian/cubicweb-common/usr/lib/python2.4/site-packages/ + python setup.py -q install --no-compile --prefix=debian/tmp/usr + + # Put all the python library and data in cubicweb-common + # and scripts in cubicweb-server + dh_install -vi + #dh_lintian XXX not before debhelper 7 + + # Remove unittests directory (should be available in cubicweb-dev only) + rm -rf debian/cubicweb-server/usr/lib/${PY_VERSION}/site-packages/cubicweb/server/test + rm -rf debian/cubicweb-server/usr/lib/${PY_VERSION}/site-packages/cubicweb/sobjects/test + rm -rf debian/cubicweb-web/usr/lib/${PY_VERSION}/site-packages/cubicweb/web/test + rm -rf debian/cubicweb-common/usr/lib/${PY_VERSION}/site-packages/cubicweb/common/test + + # cubes directory must be managed as a valid python module + touch debian/cubicweb-common/usr/share/cubicweb/cubes/__init__.py + +%: %.in + sed "s/PY_VERSION/${PY_VERSION}/g" < $< > $@ + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir + dh_testroot -i + dh_pycentral -i + dh_installinit -i -n --name cubicweb -u"defaults 99" + dh_installlogrotate -i + dh_installdocs -i -A README + dh_installman -i + dh_installchangelogs -i + dh_link -i + dh_compress -i -X.py -X.ini -X.xml + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: + +binary: binary-indep +.PHONY: build clean binary binary-indep binary-arch + diff -r a81d3babb582 -r 9d61b146f505 debian/changelog --- a/debian/changelog Thu Jan 15 10:13:25 2009 +0100 +++ b/debian/changelog Wed Apr 15 17:36:09 2009 +0200 @@ -1,3 +1,52 @@ +cubicweb (3.1.4-1) unstable; urgency=low + + * new upstream release + + -- Aurélien Campéas Mon, 06 Apr 2009 14:30:00 +0200 + +cubicweb (3.1.3-1) unstable; urgency=low + + * new upstream release + + -- Sylvain Thénault Mon, 06 Apr 2009 08:52:27 +0200 + +cubicweb (3.1.2-1) unstable; urgency=low + + * new upstream release + + -- Aurélien Campéas Wed, 10 Mar 2009 12:30:00 +0100 + +cubicweb (3.1.1-1) unstable; urgency=low + + * new upstream release + + -- Aurélien Campéas Wed, 9 Mar 2009 18:32:00 +0100 + +cubicweb (3.1.0-1) unstable; urgency=low + + * new upstream release + + -- Sylvain Thénault Wed, 25 Feb 2009 18:41:47 +0100 + +cubicweb (3.0.10-1) unstable; urgency=low + + * merge cubicweb-core package into cubicweb-common + * simplify debian/rules + + -- Julien Jehannet Thu, 19 Feb 2009 16:24:09 +0100 + +cubicweb (3.0.9-1) unstable; urgency=low + + * new upstream (interim) release + + -- Aurélien Campéas Tue, 10 Feb 2009 14:05:12 +0100 + +cubicweb (3.0.4-1) unstable; urgency=low + + * new upstream release + + -- Sylvain Thénault Tue, 27 Jan 2009 16:05:12 +0100 + cubicweb (3.0.3-1) DISTRIBUTION; urgency=low * new upstream release diff -r a81d3babb582 -r 9d61b146f505 debian/compat --- a/debian/compat Thu Jan 15 10:13:25 2009 +0100 +++ b/debian/compat Wed Apr 15 17:36:09 2009 +0200 @@ -1,1 +1,1 @@ -5 +7 diff -r a81d3babb582 -r 9d61b146f505 debian/control --- a/debian/control Thu Jan 15 10:13:25 2009 +0100 +++ b/debian/control Wed Apr 15 17:36:09 2009 +0200 @@ -1,17 +1,21 @@ Source: cubicweb Section: web Priority: optional -Maintainer: Logilab Packaging Team -Uploaders: Sylvain Thenault -Build-Depends: debhelper (>= 5.0.37.1), python (>=2.4), python-dev (>=2.4), python-central (>= 0.5) +Maintainer: Logilab S.A. +Uploaders: Sylvain Thenault , + Julien Jehannet , + Aurélien Campéas +Build-Depends: debhelper (>= 7), python-dev (>=2.4), python-central (>= 0.5) Standards-Version: 3.8.0 +Homepage: http://www.cubicweb.org XS-Python-Version: >= 2.4, << 2.6 + Package: cubicweb Architecture: all XB-Python-Version: ${python:Versions} Depends: ${python:Depends}, cubicweb-server (= ${source:Version}), cubicweb-twisted (= ${source:Version}), cubicweb-client (= ${source:Version}) -XBS-Recommends: (postgresql, postgresql-plpython, postgresql-contrib) | mysql | sqlite3 +XB-Recommends: (postgresql, postgresql-plpython, postgresql-contrib) | mysql | sqlite3 Recommends: postgresql | mysql | sqlite3 Description: the complete CubicWeb framework CubicWeb is a semantic web application framework. @@ -51,13 +55,13 @@ This package provides a twisted based HTTP server to serve the adaptative web interface (see cubicweb-web package). . - This package provides only the twisted server part of the library. + This package provides only the twisted server part of the library. Package: cubicweb-web Architecture: all XB-Python-Version: ${python:Versions} -Depends: ${python:Depends}, cubicweb-common (= ${source:Version}), python-simplejson (>= 1.3), python-docutils, python-vobject, python-elementtree +Depends: ${python:Depends}, cubicweb-common (= ${source:Version}), python-docutils, python-vobject, python-elementtree Recommends: fckeditor Description: web interface library for the CubicWeb framework CubicWeb is a semantic web application framework. @@ -72,8 +76,10 @@ Package: cubicweb-common Architecture: all XB-Python-Version: ${python:Versions} -Depends: ${python:Depends}, cubicweb-core (= ${source:Version}), python-logilab-mtconverter (>= 0.4.0), python-simpletal (>= 4.0), graphviz, gettext, python-lxml +Depends: ${python:Depends}, python-logilab-mtconverter (>= 0.6.0), python-simpletal (>= 4.0), graphviz, gettext, python-lxml, python-logilab-common (>= 0.38.1), python-yams (>= 0.20.2), python-rql (>= 0.20.2), python-simplejson (>= 1.3) Recommends: python-psyco +Conflicts: cubicweb-core +Replaces: cubicweb-core Description: common library for the CubicWeb framework CubicWeb is a semantic web application framework. . @@ -84,7 +90,7 @@ Package: cubicweb-ctl Architecture: all XB-Python-Version: ${python:Versions} -Depends: ${python:Depends}, cubicweb-core (= ${source:Version}) +Depends: ${python:Depends}, cubicweb-common (= ${source:Version}) Description: tool to manage the CubicWeb framework CubicWeb is a semantic web application framework. . @@ -100,21 +106,10 @@ Description: RQL command line client for the CubicWeb framework CubicWeb is a semantic web application framework. . - This package provides a RQL (Relation Query Language) command line client using + This package provides a RQL (Relation Query Language) command line client using pyro to connect to a repository server. -Package: cubicweb-core -Architecture: all -XB-Python-Version: ${python:Versions} -Depends: ${python:Depends}, python-logilab-common (>= 0.37.2), python-yams (>= 0.20.2), python-rql (>= 0.20.2) -Description: core library for the CubicWeb framework - CubicWeb is a semantic web application framework. - . - This package provides the core part of the library used by anyone having - to do some cubicweb programming in Python. - - Package: cubicweb-dev Architecture: all XB-Python-Version: ${python:Versions} diff -r a81d3babb582 -r 9d61b146f505 debian/cubicweb-client.dirs --- a/debian/cubicweb-client.dirs Thu Jan 15 10:13:25 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -usr/lib/python2.4/site-packages/cubicweb/ diff -r a81d3babb582 -r 9d61b146f505 debian/cubicweb-client.install.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/cubicweb-client.install.in Wed Apr 15 17:36:09 2009 +0200 @@ -0,0 +1,1 @@ +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/hercule.py usr/lib/PY_VERSION/site-packages/cubicweb diff -r a81d3babb582 -r 9d61b146f505 debian/cubicweb-common.dirs --- a/debian/cubicweb-common.dirs Thu Jan 15 10:13:25 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -usr/lib/python2.4/site-packages/cubicweb -usr/lib/python2.4/site-packages/cubicweb/common -usr/share/cubicweb/cubes/shared -usr/share/doc/cubicweb-common diff -r a81d3babb582 -r 9d61b146f505 debian/cubicweb-common.install.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/cubicweb-common.install.in Wed Apr 15 17:36:09 2009 +0200 @@ -0,0 +1,17 @@ +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/common/ usr/lib/PY_VERSION/site-packages/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/entities/ usr/lib/PY_VERSION/site-packages/cubicweb +debian/tmp/usr/share/cubicweb/cubes/shared/i18n usr/share/cubicweb/cubes/shared/ +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/rset.py usr/share/pyshared/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/gettext.py usr/share/pyshared/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/toolsutils.py usr/share/pyshared/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/cwvreg.py usr/share/pyshared/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/_exceptions.py usr/share/pyshared/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/schemaviewer.py usr/share/pyshared/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/dbapi.py usr/share/pyshared/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/cwconfig.py usr/share/pyshared/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/__init__.py usr/share/pyshared/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/md5crypt.py usr/share/pyshared/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/schema.py usr/share/pyshared/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/interfaces.py usr/share/pyshared/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/vregistry.py usr/share/pyshared/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/__pkginfo__.py usr/share/pyshared/cubicweb diff -r a81d3babb582 -r 9d61b146f505 debian/cubicweb-core.dirs --- a/debian/cubicweb-core.dirs Thu Jan 15 10:13:25 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -usr/lib/python2.4/site-packages/cubicweb -usr/share/doc/cubicweb-core diff -r a81d3babb582 -r 9d61b146f505 debian/cubicweb-ctl.cubicweb.init --- a/debian/cubicweb-ctl.cubicweb.init Thu Jan 15 10:13:25 2009 +0100 +++ b/debian/cubicweb-ctl.cubicweb.init Wed Apr 15 17:36:09 2009 +0200 @@ -11,5 +11,22 @@ # Short-Description: Start cubicweb application at boot time ### END INIT INFO +# FIXME Seems to be inadequate here +# FIXME If related to pyro, try instead: +# export PYRO_STORAGE="/tmp" cd /tmp -/usr/bin/cubicweb-ctl $1 --force + +# FIXME Work-around about the following lintian error +# E: cubicweb-ctl: init.d-script-does-not-implement-required-option /etc/init.d/cubicweb start +# +# Check if we are sure to not want the start-stop-daemon machinery here +# Refer to Debian Policy Manual section 9.3.2 (Writing the scripts) for details. + +case "$1" in + "force-reload") + /usr/bin/cubicweb-ctl reload --force + ;; + "*|restart") + /usr/bin/cubicweb-ctl $1 --force + ;; +esac diff -r a81d3babb582 -r 9d61b146f505 debian/cubicweb-ctl.install.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/cubicweb-ctl.install.in Wed Apr 15 17:36:09 2009 +0200 @@ -0,0 +1,3 @@ +debian/tmp/usr/bin/cubicweb-ctl usr/bin/ +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/cwctl.py usr/lib/PY_VERSION/site-packages/cubicweb +debian/cubicweb-ctl.bash_completion etc/bash_completion.d/cubicweb-ctl diff -r a81d3babb582 -r 9d61b146f505 debian/cubicweb-ctl.postinst --- a/debian/cubicweb-ctl.postinst Thu Jan 15 10:13:25 2009 +0100 +++ b/debian/cubicweb-ctl.postinst Wed Apr 15 17:36:09 2009 +0200 @@ -2,7 +2,7 @@ case "$1" in configure|abort-upgrade|abort-remove|abort-deconfigure) - update-rc.d cubicweb defaults >/dev/null + update-rc.d cubicweb defaults 99 >/dev/null ;; *) echo "postinst called with unknown argument \`$1'" >&2 diff -r a81d3babb582 -r 9d61b146f505 debian/cubicweb-dev.dirs --- a/debian/cubicweb-dev.dirs Thu Jan 15 10:13:25 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -usr/lib/python2.4/site-packages/cubicweb -usr/lib/python2.4/site-packages/cubicweb/common -usr/lib/python2.4/site-packages/cubicweb/web -usr/lib/python2.4/site-packages/cubicweb/server -usr/lib/python2.4/site-packages/cubicweb/sobjects -usr/lib/python2.4/site-packages/cubicweb/entities -usr/share/doc/cubicweb-dev diff -r a81d3babb582 -r 9d61b146f505 debian/cubicweb-dev.install.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/cubicweb-dev.install.in Wed Apr 15 17:36:09 2009 +0200 @@ -0,0 +1,7 @@ +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/devtools/ usr/lib/PY_VERSION/site-packages/cubicweb/ +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/skeleton/ usr/lib/PY_VERSION/site-packages/cubicweb/ +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/test usr/lib/PY_VERSION/site-packages/cubicweb/ +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/common/test usr/lib/PY_VERSION/site-packages/cubicweb/common/ +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/server/test usr/lib/PY_VERSION/site-packages/cubicweb/server/ +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/sobjects/test usr/lib/PY_VERSION/site-packages/cubicweb/sobjects/ +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/web/test usr/lib/PY_VERSION/site-packages/cubicweb/web/ diff -r a81d3babb582 -r 9d61b146f505 debian/cubicweb-documentation.dirs --- a/debian/cubicweb-documentation.dirs Thu Jan 15 10:13:25 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -usr/share/doc/cubicweb-documentation/ -usr/share/doc/cubicweb-documentation/devmanual_fr -usr/share/doc-base/ diff -r a81d3babb582 -r 9d61b146f505 debian/cubicweb-documentation.install --- a/debian/cubicweb-documentation.install Thu Jan 15 10:13:25 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -debian/cubicweb-doc usr/share/doc-base/ diff -r a81d3babb582 -r 9d61b146f505 debian/cubicweb-documentation.install.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/cubicweb-documentation.install.in Wed Apr 15 17:36:09 2009 +0200 @@ -0,0 +1,2 @@ +doc/book usr/share/doc/cubicweb-documentation +debian/cubicweb-doc usr/share/doc-base/cubicweb-doc diff -r a81d3babb582 -r 9d61b146f505 debian/cubicweb-server.dirs --- a/debian/cubicweb-server.dirs Thu Jan 15 10:13:25 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -usr/lib/python2.4/site-packages/cubicweb/ -usr/share/cubicweb -usr/share/doc/cubicweb-server diff -r a81d3babb582 -r 9d61b146f505 debian/cubicweb-server.install.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/cubicweb-server.install.in Wed Apr 15 17:36:09 2009 +0200 @@ -0,0 +1,4 @@ +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/server/ usr/lib/PY_VERSION/site-packages/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/sobjects/ usr/lib/PY_VERSION/site-packages/cubicweb +debian/tmp/usr/share/cubicweb/schemas/ usr/share/cubicweb/ +debian/tmp/usr/share/cubicweb/migration/ usr/share/cubicweb/ diff -r a81d3babb582 -r 9d61b146f505 debian/cubicweb-twisted.dirs --- a/debian/cubicweb-twisted.dirs Thu Jan 15 10:13:25 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -usr/lib/python2.4/site-packages -usr/lib/python2.4/site-packages/cubicweb -usr/share/doc/cubicweb-twisted diff -r a81d3babb582 -r 9d61b146f505 debian/cubicweb-twisted.install.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/cubicweb-twisted.install.in Wed Apr 15 17:36:09 2009 +0200 @@ -0,0 +1,1 @@ +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/etwist/ usr/lib/PY_VERSION/site-packages/cubicweb/ diff -r a81d3babb582 -r 9d61b146f505 debian/cubicweb-web.dirs --- a/debian/cubicweb-web.dirs Thu Jan 15 10:13:25 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -usr/lib/python2.4/site-packages/ -usr/lib/python2.4/site-packages/cubicweb -usr/share/cubicweb/cubes/shared -usr/share/doc/cubicweb-web diff -r a81d3babb582 -r 9d61b146f505 debian/cubicweb-web.install.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/cubicweb-web.install.in Wed Apr 15 17:36:09 2009 +0200 @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/web usr/lib/PY_VERSION/site-packages/cubicweb +debian/tmp/usr/share/cubicweb/cubes/shared/data usr/share/cubicweb/cubes/shared +debian/tmp/usr/share/cubicweb/cubes/shared/wdoc usr/share/cubicweb/cubes/shared diff -r a81d3babb582 -r 9d61b146f505 debian/cubicweb-web.lintian-overrides --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/cubicweb-web.lintian-overrides Wed Apr 15 17:36:09 2009 +0200 @@ -0,0 +1,1 @@ +cubicweb-web: embedded-javascript-library usr/share/cubicweb/cubes/shared/data/jquery.js diff -r a81d3babb582 -r 9d61b146f505 debian/rules --- a/debian/rules Thu Jan 15 10:13:25 2009 +0100 +++ b/debian/rules Wed Apr 15 17:36:09 2009 +0200 @@ -4,12 +4,16 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 + +PY_VERSION:=$(shell pyversions -d) + build: build-stamp build-stamp: dh_testdir # XXX doesn't work if logilab-doctools, logilab-xml are not in build depends # and I can't get pbuilder find them in its chroot :( - #cd doc && make + # cd doc && make + # FIXME cleanup and use sphinx-build as build-depends ? python setup.py build touch build-stamp @@ -18,78 +22,41 @@ dh_testroot rm -f build-stamp configure-stamp rm -rf build - rm -rf debian/cubicweb-*/ - find . -name "*.pyc" | xargs rm -f + #rm -rf debian/cubicweb-*/ + find . -name "*.pyc" -delete + rm -f $(basename $(wildcard debian/*.in)) dh_clean -install: build +install: build $(basename $(wildcard debian/*.in)) dh_testdir dh_testroot - dh_clean -k + dh_clean dh_installdirs - ########## core package ############################################# - # put : - # * all the python library and data in cubicweb-core - # * scripts in cubicweb-server - # - # pick from each latter to construct each package - python setup.py -q install_lib --no-compile --install-dir=debian/cubicweb-core/usr/lib/python2.4/site-packages/ - python setup.py -q install_data --install-dir=debian/cubicweb-core/usr/ - python setup.py -q install_scripts --install-dir=debian/cubicweb-server/usr/bin/ - ########## common package ############################################# - mv debian/cubicweb-core/usr/lib/python2.4/site-packages/cubicweb/common/ debian/cubicweb-common/usr/lib/python2.4/site-packages/cubicweb - mv debian/cubicweb-core/usr/lib/python2.4/site-packages/cubicweb/entities/ debian/cubicweb-common/usr/lib/python2.4/site-packages/cubicweb - # data - mv debian/cubicweb-core/usr/share/cubicweb/cubes/shared/i18n debian/cubicweb-common/usr/share/cubicweb/cubes/shared/ + + #python setup.py install_lib --no-compile --install-dir=debian/cubicweb-common/usr/lib/python2.4/site-packages/ + python setup.py -q install --no-compile --prefix=debian/tmp/usr + + # Put all the python library and data in cubicweb-common + # and scripts in cubicweb-server + dh_install -vi + dh_lintian + + # Remove unittests directory (should be available in cubicweb-dev only) + rm -rf debian/cubicweb-server/usr/lib/${PY_VERSION}/site-packages/cubicweb/server/test + rm -rf debian/cubicweb-server/usr/lib/${PY_VERSION}/site-packages/cubicweb/sobjects/test + rm -rf debian/cubicweb-web/usr/lib/${PY_VERSION}/site-packages/cubicweb/web/test + rm -rf debian/cubicweb-common/usr/lib/${PY_VERSION}/site-packages/cubicweb/common/test + + # cubes directory must be managed as a valid python module touch debian/cubicweb-common/usr/share/cubicweb/cubes/__init__.py - ########## server package ############################################# - # library - mv debian/cubicweb-core/usr/lib/python2.4/site-packages/cubicweb/server/ debian/cubicweb-server/usr/lib/python2.4/site-packages/cubicweb - mv debian/cubicweb-core/usr/lib/python2.4/site-packages/cubicweb/sobjects/ debian/cubicweb-server/usr/lib/python2.4/site-packages/cubicweb - # data - mv debian/cubicweb-core/usr/share/cubicweb/schemas/ debian/cubicweb-server/usr/share/cubicweb/ - mv debian/cubicweb-core/usr/share/cubicweb/migration/ debian/cubicweb-server/usr/share/cubicweb/ - ########## twisted package ############################################ - # library - mv debian/cubicweb-core/usr/lib/python2.4/site-packages/cubicweb/etwist/ debian/cubicweb-twisted/usr/lib/python2.4/site-packages/cubicweb/ - ########## web package ################################################ - # library - mv debian/cubicweb-core/usr/lib/python2.4/site-packages/cubicweb/web/ debian/cubicweb-web/usr/lib/python2.4/site-packages/cubicweb/ - # data / web documentation - mv debian/cubicweb-core/usr/share/cubicweb/cubes/shared/data debian/cubicweb-web/usr/share/cubicweb/cubes/shared/ - mv debian/cubicweb-core/usr/share/cubicweb/cubes/shared/wdoc debian/cubicweb-web/usr/share/cubicweb/cubes/shared/ - ########## ctl package ################################################ - # scripts - mv debian/cubicweb-server/usr/bin/cubicweb-ctl debian/cubicweb-ctl/usr/bin/ - mv debian/cubicweb-core/usr/lib/python2.4/site-packages/cubicweb/cwctl.py debian/cubicweb-ctl/usr/lib/python2.4/site-packages/cubicweb - mv debian/cubicweb-ctl.bash_completion debian/cubicweb-ctl/etc/bash_completion.d/cubicweb-ctl - ########## client package ############################################# - # library - mv debian/cubicweb-core/usr/lib/python2.4/site-packages/cubicweb/hercule.py debian/cubicweb-client/usr/lib/python2.4/site-packages/cubicweb - ########## dev package ################################################ - # devtools package - mv debian/cubicweb-core/usr/lib/python2.4/site-packages/cubicweb/devtools/ debian/cubicweb-dev/usr/lib/python2.4/site-packages/cubicweb/ - mv debian/cubicweb-core/usr/lib/python2.4/site-packages/cubicweb/skeleton/ debian/cubicweb-dev/usr/lib/python2.4/site-packages/cubicweb/ - # tests directories - mv debian/cubicweb-core/usr/lib/python2.4/site-packages/cubicweb/test debian/cubicweb-dev/usr/lib/python2.4/site-packages/cubicweb/ - mv debian/cubicweb-common/usr/lib/python2.4/site-packages/cubicweb/common/test debian/cubicweb-dev/usr/lib/python2.4/site-packages/cubicweb/common/ - mv debian/cubicweb-server/usr/lib/python2.4/site-packages/cubicweb/server/test debian/cubicweb-dev/usr/lib/python2.4/site-packages/cubicweb/server/ - mv debian/cubicweb-server/usr/lib/python2.4/site-packages/cubicweb/sobjects/test debian/cubicweb-dev/usr/lib/python2.4/site-packages/cubicweb/sobjects/ - mv debian/cubicweb-web/usr/lib/python2.4/site-packages/cubicweb/web/test debian/cubicweb-dev/usr/lib/python2.4/site-packages/cubicweb/web/ - ########## documentation package ###################################### - cp -r doc/book debian/cubicweb-documentation/usr/share/doc/cubicweb-documentation/ - ########## core package ############################################### - # small cleanup - rm -rf debian/cubicweb-core/usr/share/cubicweb/ - # undistributed for now - rm -rf debian/cubicweb-core/usr/lib/python2.4/site-packages/cubicweb/goa - rm -rf debian/cubicweb-core/usr/lib/python2.4/site-packages/cubicweb/wsgi + +%: %.in + sed "s/PY_VERSION/${PY_VERSION}/g" < $< > $@ # Build architecture-independent files here. binary-indep: build install dh_testdir dh_testroot -i - dh_install -i dh_pycentral -i dh_installinit -i -n --name cubicweb -u"defaults 99" dh_installlogrotate -i diff -r a81d3babb582 -r 9d61b146f505 devtools/__init__.py --- a/devtools/__init__.py Thu Jan 15 10:13:25 2009 +0100 +++ b/devtools/__init__.py Wed Apr 15 17:36:09 2009 +0200 @@ -260,6 +260,8 @@ - http://www.sqlite.org/cvstrac/tktview?tn=1327,33 (some dates are returned as strings rather thant date objects) """ + if hasattr(querier.__class__, '_devtools_sqlite_patched'): + return # already monkey patched def wrap_execute(base_execute): def new_execute(*args, **kwargs): rset = base_execute(*args, **kwargs) @@ -288,7 +290,7 @@ return rset return new_execute querier.__class__.execute = wrap_execute(querier.__class__.execute) - + querier.__class__._devtools_sqlite_patched = True def init_test_database(driver='sqlite', configdir='data', config=None, vreg=None): diff -r a81d3babb582 -r 9d61b146f505 devtools/apptest.py --- a/devtools/apptest.py Thu Jan 15 10:13:25 2009 +0100 +++ b/devtools/apptest.py Wed Apr 15 17:36:09 2009 +0200 @@ -407,6 +407,7 @@ self.__close(self.cnxid) # other utilities ######################################################### + def set_debug(self, debugmode): from cubicweb.server import set_debug set_debug(debugmode) @@ -452,7 +453,7 @@ self.__commit = repo.commit self.__rollback = repo.rollback self.__close = repo.close - self.cnxid = repo.connect(*self.default_user_password()) + self.cnxid = self.cnx.sessionid self.session = repo._sessions[self.cnxid] # XXX copy schema since hooks may alter it and it may be not fully # cleaned (missing some schema synchronization support) @@ -499,6 +500,6 @@ self.rollback() self.session.unsafe_execute('DELETE Any X WHERE X eid > %(x)s', {'x': self.maxeid}) self.commit() - if close: - self.close() + #if close: + # self.close() diff -r a81d3babb582 -r 9d61b146f505 devtools/devctl.py --- a/devtools/devctl.py Thu Jan 15 10:13:25 2009 +0100 +++ b/devtools/devctl.py Wed Apr 15 17:36:09 2009 +0200 @@ -284,12 +284,11 @@ def run(self, args): """run the command with its specific arguments""" - CUBEDIR = DevCubeConfiguration.cubes_dir() if args: - cubes = [join(CUBEDIR, app) for app in args] + cubes = [DevCubeConfiguration.cube_dir(cube) for cube in args] else: - cubes = [join(CUBEDIR, app) for app in listdir(CUBEDIR) - if exists(join(CUBEDIR, app, 'i18n'))] + cubes = [DevCubeConfiguration.cube_dir(cube) for cube in DevCubeConfiguration.available_cubes()] + cubes = [cubepath for cubepath in cubes if exists(join(cubepath, 'i18n'))] update_cubes_catalogs(cubes) def update_cubes_catalogs(cubes): @@ -385,6 +384,11 @@ arguments = '' options = ( + ("directory", + {'short': 'd', 'type' : 'string', 'metavar': '', + 'help': 'directory where the new cube should be created', + } + ), ("verbose", {'short': 'v', 'type' : 'yn', 'metavar': '', 'default': 'n', @@ -419,14 +423,20 @@ #if ServerConfiguration.mode != "dev": # self.fail("you can only create new cubes in development mode") verbose = self.get('verbose') - cubedir = ServerConfiguration.CUBES_DIR - if not isdir(cubedir): - print "creating apps directory", cubedir + cubesdir = self.get('directory') + if not cubesdir: + cubespath = ServerConfiguration.cubes_search_path() + if len(cubespath) > 1: + raise BadCommandUsage("can't guess directory where to put the new cube." + " Please specify it using the --directory option") + cubesdir = cubespath[0] + if not isdir(cubesdir): + print "creating cubes directory", cubesdir try: - mkdir(cubedir) + mkdir(cubesdir) except OSError, err: - self.fail("failed to create directory %r\n(%s)" % (cubedir, err)) - cubedir = join(cubedir, cubename) + self.fail("failed to create directory %r\n(%s)" % (cubesdir, err)) + cubedir = join(cubesdir, cubename) if exists(cubedir): self.fail("%s already exists !" % (cubedir)) skeldir = join(BASEDIR, 'skeleton') @@ -503,17 +513,22 @@ raise BadCommandUsage("no argument expected") import re requests = {} - for line in sys.stdin: + for lineno, line in enumerate(sys.stdin): if not ' WHERE ' in line: continue #sys.stderr.write( line ) - rql, time = line.split('--') - rql = re.sub("(\'\w+': \d*)", '', rql) - req = requests.setdefault(rql, []) - time.strip() - chunks = time.split() - cputime = float(chunks[-3]) - req.append( cputime ) + try: + rql, time = line.split('--') + rql = re.sub("(\'\w+': \d*)", '', rql) + if '{' in rql: + rql = rql[:rql.index('{')] + req = requests.setdefault(rql, []) + time.strip() + chunks = time.split() + cputime = float(chunks[-3]) + req.append( cputime ) + except Exception, exc: + sys.stderr.write('Line %s: %s (%s)\n' % (lineno, exc, line)) stat = [] for rql, times in requests.items(): @@ -521,8 +536,11 @@ stat.sort() stat.reverse() + + total_time = sum(time for time, occ, rql in stat)*0.01 + print 'Percentage;Cumulative Time;Occurences;Query' for time, occ, rql in stat: - print time, occ, rql + print '%.2f;%.2f;%s;%s' % (time/total_time, time, occ, rql) register_commands((UpdateCubicWebCatalogCommand, UpdateTemplateCatalogCommand, diff -r a81d3babb582 -r 9d61b146f505 devtools/fill.py --- a/devtools/fill.py Thu Jan 15 10:13:25 2009 +0100 +++ b/devtools/fill.py Wed Apr 15 17:36:09 2009 +0200 @@ -136,6 +136,9 @@ def generate_integer(self, attrname, index): """generates a consistent value for 'attrname' if it's an integer""" + choosed = self.generate_choice(attrname, index) + if choosed is not None: + return choosed minvalue, maxvalue = get_bounds(self.e_schema, attrname) if maxvalue is not None and maxvalue <= 0 and minvalue is None: minvalue = maxvalue - index # i.e. randint(-index, 0) diff -r a81d3babb582 -r 9d61b146f505 devtools/repotest.py --- a/devtools/repotest.py Thu Jan 15 10:13:25 2009 +0100 +++ b/devtools/repotest.py Wed Apr 15 17:36:09 2009 +0200 @@ -3,7 +3,7 @@ This module contains functions to initialize a new repository. :organization: Logilab -:copyright: 2003-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2003-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -72,7 +72,7 @@ def __contains__(self, key): return key in self.iterkeys() def __getitem__(self, key): - for key_, value in self.iteritems(): + for key_, value in list.__iter__(self): if key == key_: return value raise KeyError(key) @@ -80,6 +80,17 @@ return (x for x, y in list.__iter__(self)) def iteritems(self): return (x for x in list.__iter__(self)) + def items(self): + return [x for x in list.__iter__(self)] + +class DumbOrderedDict2(object): + def __init__(self, origdict, sortkey): + self.origdict = origdict + self.sortkey = sortkey + def __getattr__(self, attr): + return getattr(self.origdict, attr) + def __iter__(self): + return iter(sorted(self.origdict, key=self.sortkey)) from logilab.common.testlib import TestCase @@ -249,7 +260,8 @@ _orig_select_principal = rqlannotation._select_principal def _select_principal(scope, relations): - return _orig_select_principal(scope, sorted(relations, key=lambda x: x.r_type)) + return _orig_select_principal(scope, relations, + _sort=lambda rels: sorted(rels, key=lambda x: x.r_type)) try: from cubicweb.server.msplanner import PartPlanInformation @@ -257,15 +269,15 @@ class PartPlanInformation(object): def merge_input_maps(*args): pass - def _choose_var(self, sourcevars): + def _choose_term(self, sourceterms): pass _orig_merge_input_maps = PartPlanInformation.merge_input_maps -_orig_choose_var = PartPlanInformation._choose_var +_orig_choose_term = PartPlanInformation._choose_term def _merge_input_maps(*args): return sorted(_orig_merge_input_maps(*args)) -def _choose_var(self, sourcevars): +def _choose_term(self, sourceterms): # predictable order for test purpose def get_key(x): try: @@ -278,17 +290,7 @@ except AttributeError: # const return x.value - varsinorder = sorted(sourcevars, key=get_key) - if len(self._sourcesvars) > 1: - for var in varsinorder: - if not var.scope is self.rqlst: - return var, sourcevars.pop(var) - else: - for var in varsinorder: - if var.scope is self.rqlst: - return var, sourcevars.pop(var) - var = varsinorder[0] - return var, sourcevars.pop(var) + return _orig_choose_term(self, DumbOrderedDict2(sourceterms, get_key)) def do_monkey_patch(): @@ -298,7 +300,7 @@ ExecutionPlan.tablesinorder = None ExecutionPlan.init_temp_table = _init_temp_table PartPlanInformation.merge_input_maps = _merge_input_maps - PartPlanInformation._choose_var = _choose_var + PartPlanInformation._choose_term = _choose_term def undo_monkey_patch(): RQLRewriter.insert_snippets = _orig_insert_snippets @@ -306,5 +308,5 @@ ExecutionPlan._check_permissions = _orig_check_permissions ExecutionPlan.init_temp_table = _orig_init_temp_table PartPlanInformation.merge_input_maps = _orig_merge_input_maps - PartPlanInformation._choose_var = _orig_choose_var + PartPlanInformation._choose_term = _orig_choose_term diff -r a81d3babb582 -r 9d61b146f505 devtools/test/data/bootstrap_cubes --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/devtools/test/data/bootstrap_cubes Wed Apr 15 17:36:09 2009 +0200 @@ -0,0 +1,1 @@ +person, comment diff -r a81d3babb582 -r 9d61b146f505 devtools/test/data/bootstrap_packages --- a/devtools/test/data/bootstrap_packages Thu Jan 15 10:13:25 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -eperson, ecomment diff -r a81d3babb582 -r 9d61b146f505 devtools/testlib.py --- a/devtools/testlib.py Thu Jan 15 10:13:25 2009 +0100 +++ b/devtools/testlib.py Wed Apr 15 17:36:09 2009 +0200 @@ -78,6 +78,8 @@ return center - before <= line_no <= center + after ## base webtest class ######################################################### +VALMAP = {None: None, 'dtd': DTDValidator, 'xml': SaxOnlyValidator} + class WebTest(EnvBasedTC): """base class for web tests""" __abstract__ = True @@ -93,35 +95,28 @@ # SaxOnlyValidator : guarantees XML is well formed # None : do not try to validate anything # validators used must be imported from from.devtools.htmlparser - validators = { - # maps vid : validator name - 'hcal' : SaxOnlyValidator, - 'rss' : SaxOnlyValidator, - 'rssitem' : None, - 'xml' : SaxOnlyValidator, - 'xmlitem' : None, - 'xbel' : SaxOnlyValidator, - 'xbelitem' : None, - 'vcard' : None, - 'fulltext': None, - 'fullthreadtext': None, - 'fullthreadtext_descending': None, - 'text' : None, - 'treeitemview': None, - 'textincontext' : None, - 'textoutofcontext' : None, - 'combobox' : None, - 'csvexport' : None, - 'ecsvexport' : None, + content_type_validators = { + # maps MIME type : validator name + # + # do not set html validators here, we need HTMLValidator for html + # snippets + #'text/html': DTDValidator, + #'application/xhtml+xml': DTDValidator, + 'application/xml': SaxOnlyValidator, + 'text/xml': SaxOnlyValidator, + 'text/plain': None, + 'text/comma-separated-values': None, + 'text/x-vcard': None, + 'text/calendar': None, + 'application/json': None, + 'image/png': None, } - valmap = {None: None, 'dtd': DTDValidator, 'xml': SaxOnlyValidator} - no_auto_populate = () - ignored_relations = () + # maps vid : validator name (override content_type_validators) + vid_validators = dict((vid, VALMAP[valkey]) + for vid, valkey in VIEW_VALIDATORS.iteritems()) - def __init__(self, *args, **kwargs): - EnvBasedTC.__init__(self, *args, **kwargs) - for view, valkey in VIEW_VALIDATORS.iteritems(): - self.validators[view] = self.valmap[valkey] + no_auto_populate = () + ignored_relations = () def custom_populate(self, how_many, cursor): pass @@ -163,21 +158,24 @@ self.commit() @nocoverage - def _check_html(self, output, vid, template='main'): + def _check_html(self, output, view, template='main'): """raises an exception if the HTML is invalid""" - if template is None: - default_validator = HTMLValidator - else: - default_validator = DTDValidator - validatorclass = self.validators.get(vid, default_validator) + try: + validatorclass = self.vid_validators[view.id] + except KeyError: + if template is None: + default_validator = HTMLValidator + else: + default_validator = DTDValidator + validatorclass = self.content_type_validators.get(view.content_type, + default_validator) if validatorclass is None: return None validator = validatorclass() - output = output.strip() - return validator.parse_string(output) + return validator.parse_string(output.strip()) - def view(self, vid, rset, req=None, template='main', htmlcheck=True, **kwargs): + def view(self, vid, rset, req=None, template='main', **kwargs): """This method tests the view `vid` on `rset` using `template` If no error occured while rendering the view, the HTML is analyzed @@ -194,8 +192,6 @@ # print req.form['vid'] = vid view = self.vreg.select_view(vid, req, rset, **kwargs) - if view.content_type not in ('application/xml', 'application/xhtml+xml', 'text/html'): - htmlcheck = False # set explicit test description if rset is not None: self.set_description("testing %s, mod=%s (%s)" % (vid, view.__module__, rset.printable_rql())) @@ -207,15 +203,18 @@ elif template == 'main': _select_view_and_rset = TheMainTemplate._select_view_and_rset # patch TheMainTemplate.process_rql to avoid recomputing resultset - TheMainTemplate._select_view_and_rset = lambda *a, **k: (view, rset) + def __select_view_and_rset(self, view=view, rset=rset): + self.rset = rset + return view, rset + TheMainTemplate._select_view_and_rset = __select_view_and_rset try: - return self._test_view(viewfunc, vid, htmlcheck, template, **kwargs) + return self._test_view(viewfunc, view, template, **kwargs) finally: if template == 'main': TheMainTemplate._select_view_and_rset = _select_view_and_rset - def _test_view(self, viewfunc, vid, htmlcheck=True, template='main', **kwargs): + def _test_view(self, viewfunc, view, template='main', **kwargs): """this method does the actual call to the view If no error occured while rendering the view, the HTML is analyzed @@ -227,10 +226,7 @@ output = None try: output = viewfunc(**kwargs) - if htmlcheck: - return self._check_html(output, vid, template) - else: - return output + return self._check_html(output, view, template) except (SystemExit, KeyboardInterrupt): raise except: @@ -238,19 +234,16 @@ # is not an AssertionError klass, exc, tcbk = sys.exc_info() try: - msg = '[%s in %s] %s' % (klass, vid, exc) + msg = '[%s in %s] %s' % (klass, view.id, exc) except: - msg = '[%s in %s] undisplayable exception' % (klass, vid) + msg = '[%s in %s] undisplayable exception' % (klass, view.id) if output is not None: position = getattr(exc, "position", (0,))[0] if position: # define filter - - output = output.splitlines() width = int(log(len(output), 10)) + 1 line_template = " %" + ("%i" % width) + "i: %s" - # XXX no need to iterate the whole file except to get # the line number output = '\n'.join(line_template % (idx + 1, line) @@ -259,12 +252,15 @@ msg+= '\nfor output:\n%s' % output raise AssertionError, msg, tcbk - - def iter_automatic_rsets(self): + + def to_test_etypes(self): + return unprotected_entities(self.schema, strict=True) + + def iter_automatic_rsets(self, limit=10): """generates basic resultsets for each entity type""" - etypes = unprotected_entities(self.schema, strict=True) + etypes = self.to_test_etypes() for etype in etypes: - yield self.execute('Any X WHERE X is %s' % etype) + yield self.execute('Any X LIMIT %s WHERE X is %s' % (limit, etype)) etype1 = etypes.pop() etype2 = etypes.pop() @@ -281,23 +277,26 @@ """returns the list of views that can be applied on `rset`""" req = rset.req only_once_vids = ('primary', 'secondary', 'text') - skipped = ('restriction', 'cell') req.data['ex'] = ValueError("whatever") for vid, views in self.vreg.registry('views').items(): if vid[0] == '_': continue - try: - view = self.vreg.select(views, req, rset) - if view.id in skipped: - continue - if view.category == 'startupview': + if rset.rowcount > 1 and vid in only_once_vids: + continue + views = [view for view in views + if view.category != 'startupview' + and not issubclass(view, NotificationView)] + if views: + try: + view = self.vreg.select(views, req, rset) + if view.linkable(): + yield view + else: + not_selected(self.vreg, view) + # else the view is expected to be used as subview and should + # not be tested directly + except NoSelectableObject: continue - if rset.rowcount > 1 and view.id in only_once_vids: - continue - if not isinstance(view, NotificationView): - yield view - except NoSelectableObject: - continue def list_actions_for(self, rset): """returns the list of actions that can be applied on `rset`""" @@ -305,27 +304,25 @@ for action in self.vreg.possible_objects('actions', req, rset): yield action - def list_boxes_for(self, rset): """returns the list of boxes that can be applied on `rset`""" req = rset.req for box in self.vreg.possible_objects('boxes', req, rset): yield box - def list_startup_views(self): """returns the list of startup views""" req = self.request() for view in self.vreg.possible_views(req, None): - if view.category != 'startupview': - continue - yield view.id - + if view.category == 'startupview': + yield view.id + else: + not_selected(self.vreg, view) + def _test_everything_for(self, rset): """this method tries to find everything that can be tested for `rset` and yields a callable test (as needed in generative tests) """ - rqlst = parse(rset.rql) propdefs = self.vreg['propertydefs'] # make all components visible for k, v in propdefs.items(): @@ -335,7 +332,7 @@ backup_rset = rset._prepare_copy(rset.rows, rset.description) yield InnerTest(self._testname(rset, view.id, 'view'), self.view, view.id, rset, - rset.req.reset_headers(), 'main', not view.binary) + rset.req.reset_headers(), 'main') # We have to do this because some views modify the # resultset's syntax tree rset = backup_rset @@ -348,8 +345,6 @@ for box in self.list_boxes_for(rset): yield InnerTest(self._testname(rset, box.id, 'box'), box.dispatch) - - @staticmethod def _testname(rset, objid, objtype): return '%s_%s_%s' % ('_'.join(rset.column_types(0)), objid, objtype) @@ -360,14 +355,14 @@ ## one each def test_one_each_config(self): self.auto_populate(1) - for rset in self.iter_automatic_rsets(): + for rset in self.iter_automatic_rsets(limit=1): for testargs in self._test_everything_for(rset): yield testargs ## ten each def test_ten_each_config(self): self.auto_populate(10) - for rset in self.iter_automatic_rsets(): + for rset in self.iter_automatic_rsets(limit=10): for testargs in self._test_everything_for(rset): yield testargs @@ -390,4 +385,36 @@ rset2 = rset.limit(limit=1, offset=row) yield rset2 +def not_selected(vreg, vobject): + try: + vreg._selected[vobject.__class__] -= 1 + except (KeyError, AttributeError): + pass +def vreg_instrumentize(testclass): + from cubicweb.devtools.apptest import TestEnvironment + env = testclass._env = TestEnvironment('data', configcls=testclass.configcls, + requestcls=testclass.requestcls) + vreg = env.vreg + vreg._selected = {} + orig_select = vreg.__class__.select + def instr_select(self, *args, **kwargs): + selected = orig_select(self, *args, **kwargs) + try: + self._selected[selected.__class__] += 1 + except KeyError: + self._selected[selected.__class__] = 1 + except AttributeError: + pass # occurs on vreg used to restore database + return selected + vreg.__class__.select = instr_select + +def print_untested_objects(testclass, skipregs=('hooks', 'etypes')): + vreg = testclass._env.vreg + for registry, vobjectsdict in vreg.items(): + if registry in skipregs: + continue + for vobjects in vobjectsdict.values(): + for vobject in vobjects: + if not vreg._selected.get(vobject): + print 'not tested', registry, vobject diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/A000-introduction.en.txt --- a/doc/book/en/A000-introduction.en.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/A000-introduction.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -1,5 +1,6 @@ .. -*- coding: utf-8 -*- +.. _Part1: =================================== Part I - Introduction to `CubicWeb` diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/A020-tutorial.en.txt --- a/doc/book/en/A020-tutorial.en.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/A020-tutorial.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -20,6 +20,7 @@ This tutorial will show how to create a `cube` and how to use it as an application to run an `instance`. +.. include:: Z013-blog-less-ten-minutes.en.txt .. include:: A02a-create-cube.en.txt .. include:: A02b-components.en.txt .. include:: A02c-maintemplate.en.txt diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/A02a-create-cube.en.txt --- a/doc/book/en/A02a-create-cube.en.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/A02a-create-cube.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -169,47 +169,45 @@ .. _DefineViews: -Define your entities views --------------------------- +Define your entity views +------------------------ -Each entity defined in a model inherits defaults views allowing +Each entity defined in a model inherits default views allowing different rendering of the data. You can redefine each of them -according to your needs and preferences. If you feel like it then -you have to know how a view is defined. +according to your needs and preferences. So let's see how the +views are defined. -The views selection principle -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +The view selection principle +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ A view is defined by a Python class which includes: - an identifier (all objects in `CubicWeb` are entered in a registry and this identifier will be used as a key) - - a filter to select the resulsets it can be applied to + - a filter to select the result sets it can be applied to A view has a set of methods complying with the `View` class interface (`cubicweb.common.view`). -`CubicWeb` provides a lot of standard views for the type -`EntityView`, for a complete list, you -will have to read the code in directory ``cubicweb/web/views/`` +`CubicWeb` provides a lot of standard views for the type `EntityView`; +for a complete list, read the code in directory ``cubicweb/web/views/``. A view is applied on a `result set` which contains a set of entities we are trying to display. `CubicWeb` uses a selector -mechanism which computes a score used to identify which view -is the best to apply for the `result set` we are trying to -display. The standard library of selectors is in +mechanism which computes for each available view a score: +the view with the highest score is then used to display the given `result set`. +The standard library of selectors is in ``cubicweb.common.selector`` and a library of methods used to compute scores is available in ``cubicweb.vregistry.vreq``. It is possible to define multiple views for the same identifier and to associate selectors and filters to allow the application -to find the best way to render the data. We will see more details -on this in :ref:`DefinitionVues`. +to find the best way to render the data. For example, the view named ``primary`` is the one used to display -a single entity. We will now show you hos to customize this view. +a single entity. We will now show you how to customize this view. View customization @@ -219,8 +217,8 @@ overwrite the `primary` view defined in the module ``views`` of the cube ``cubes/blog/views.py``. -We can for example add in front of the pulication date a prefix specifying -the date we see is the publication date. +We can for example add in front of the publication date a prefix specifying +that the date we see is the publication date. To do so, please apply the following changes: @@ -263,12 +261,13 @@ :alt: modified primary view -The above source code defines a new primary view for -``BlogEntry``. +The above source code defines a new primary view for ``BlogEntry``. -Since views are applied to resultsets and resulsets can be tables of -data, it is needed to recover the entity from its (row,col) -coordinates. We will get to this in more detail later. +Since views are applied to result sets and result sets can be tables of +data, we have to recover the entity from its (row,col)-coordinates. +The view has a ``self.w()`` method that is used to output data, in our +example HTML output. -The view has a ``self.w()`` method that is used to output data. In our -example we use it to output HTML tags and values of the entity's attributes. +You can find more details about views and selectors in :ref:`ViewDefinition`. + + diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/A03a-concepts.en.txt --- a/doc/book/en/A03a-concepts.en.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/A03a-concepts.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -11,19 +11,19 @@ .. image:: images/archi_globale.en.png -`CubicWeb` framework is a server/client application framework. Those two -parties communicates through RQL (`CubicWeb` query language implementation) +`CubicWeb` framework is a server/client application framework. Those two +parts communicate through RQL (`CubicWeb` query language implementation) and ResultSet (which will be explained in :ref:`TermsVocabulary`). The server manages all interactions with sources. .. note:: - For real, the client and server sides are integrated in the same - process and interact directly, without the needs for distants - calls using Pyro. It is important to note down that those two + Usually, the client and server sides are integrated in the same + process and interact directly, without the need for distant + calls using Pyro. But, it is important to note that those two sides, client/server, are disjointed and it is possible to execute - a couple of calls in distincts processes to balance the load of + a couple of calls in distinct processes to balance the load of your web site on one or more machines. .. _TermsVocabulary: @@ -42,9 +42,9 @@ classes based on `yams`_ library. This is the core piece of an application. It is initially defined in the file system and is stored in the database at the time an instance is created. `CubicWeb` - provides a certain number of system entities included automatically as - it is necessary for the core of `CubicWeb` and a library of - cubes (which defined application entities) that can be explicitely + provides a certain number of system entities included automatically + (necessary for the core of `CubicWeb`) and a library of + cubes (which defined application entities) that can be explicitely included if necessary. *entity type* @@ -57,7 +57,7 @@ a relation the `subject` and the second the `object`. *final entity type* - Final types corresponds to the basic types such as string of characters, + Final types correspond to the basic types such as string of characters, integers... Those types have a main property which is that they can only be used as `object` of a relation. The attributes of an entity (non final) are entities (finals). @@ -69,7 +69,7 @@ *relation definition* A relation definition is a 3-uple (subject entity type, relation type, object entity type), with an associated set of property such as cardinality, constraints... - + *repository* This is the RQL server side of `CubicWeb`. Be carefull not to get confused with a Mercurial repository or a debian repository. @@ -77,42 +77,42 @@ *source* A data source is a container of data (SGBD, LDAP directory, `Google App Engine`'s datastore ...) integrated in the - `CubicWeb` repository. This repository has at least one source, `system` which - contains the schema of the application, plain-text index and others + `CubicWeb` repository. This repository has at least one source, `system` which + contains the schema of the application, plain-text index and other vital informations for the system. *configuration* - It is possible to create differents configurations for an instance: + It is possible to create different configurations for an instance: - ``repository`` : repository only, accessible for clients using Pyro - ``twisted`` : web interface only, access the repository using Pyro - - ``all-in-one`` : web interface and repository in a single process. + - ``all-in-one`` : web interface and repository in a single process. The repository could be or not accessible using Pyro. *cube* A cube is a model grouping one or multiple data types and/or views - to provide a specific functionnality or a complete `CubicWeb` application + to provide a specific functionality or a complete `CubicWeb` application potentially using other cubes. The available cubes are located in the file - system at `/path/to/forest/cubicweb/cubes` for a Mercurial forest installation, - for a debian packages installation they will be located in + system at `/path/to/forest/cubicweb/cubes` for a Mercurial forest installation. + For a debian packages installation they will be located in `/usr/share/cubicweb/cubes`. - Larger applications can be built faster by importing cubes, - adding entities and relationships and overriding the - views that need to display or edit informations not provided by - cubes. + Larger applications can be built quite fast by importing cubes, + adding entities and relationships, overriding the + *views* that display the cubes or by editing informations not provided by + the cubes. *instance* - An instance is a specific installation of one or multiple cubes. All the required + An instance is a specific installation of one or multiple cubes. All the required configuration files necessary for the well being of your web application are grouped in an instance. This will refer to the cube(s) your application is based on. For example logilab.org and our intranet are two instances of a single - cube jpl, developped internally. + cube "jpl", developped internally. The instances are defined in the directory `/etc/cubicweb.d`. *application* - The term application is sometime used to talk about an instance - and sometimes to talk of a cube depending on the context. + The term application is sometimes used to talk about an instance + and sometimes to talk of a cube depending on the context. So we would like to avoid using this term and try to use *cube* and *instance* instead. @@ -127,7 +127,7 @@ *query language* A full-blown query language named RQL is used to formulate requests - to the database or any sources such as LDAP or `Google App Engine`'s + to the database or any sources such as LDAP or `Google App Engine`'s datastore. *views* @@ -143,11 +143,11 @@ the same identifier. *rql* - Relation Query Language in order to empasize the way of browsing relations. - This query language is inspired by SQL but is highest level, its implementation - generates SQL. + Relation Query Language in order to emphasize the way of browsing relations. + This query language is inspired by SQL but is on a higher level; + its implementation generates SQL. - + .. _`Python Remote Object`: http://pyro.sourceforge.net/ .. _`yams`: http://www.logilab.org/project/yams/ @@ -156,9 +156,9 @@ ~~~~~~~~~~~~~~~~~ The engine in `CubicWeb` is a set of classes managing a set of objects loaded -dynamically at the startup of `CubicWeb` (*appobjects*). Those dynamics objects, +dynamically at the startup of `CubicWeb` (*appobjects*). Those dynamic objects, based on the schema or the library, are building the final application. -The differents dymanic components are for example: +The different dynamic components are for example: * client and server side @@ -194,36 +194,36 @@ ~~~~~~~~~~~~~~ The Python API developped to interface with RQL is inspired from the standard db-api, -with a Connection object having the methods cursor, rollback and commit essentially. +with a Connection object having the methods cursor, rollback and commit essentially. The most important method is the `execute` method of a cursor : `execute(rqlstring, args=None, eid_key=None, build_descr=True)` :rqlstring: the RQL query to execute (unicode) -:args: if the query contains substitutions, a dictionnary containing the values to use -:eid_key: - an implementation detail of the RQL queries cache implies that if a substitution +:args: if the query contains substitutions, a dictionary containing the values to use +:eid_key: + an implementation detail of the RQL cache implies that if a substitution is used to introduce an eid *susceptible to raise the ambiguities in the query - type resolution*, then we have to specify the correponding key in the dictionnary + type resolution*, then we have to specify the corresponding key in the dictionary through this argument The `Connection` object owns the methods `commit` and `rollback`. You *should never need to use them* during the development of the web interface based on -the `CubicWeb` framework as it determines the end of the transaction depending +the `CubicWeb` framework as it determines the end of the transaction depending on the query execution success. .. note:: - While executing updates queries (SET, INSERT, DELETE), if a query generates + While executing update queries (SET, INSERT, DELETE), if a query generates an error related to security, a rollback is automatically done on the current transaction. - + The `Request` class (`cubicweb.web`) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ A request instance is created when an HTTP request is sent to the web server. -It contains informations such as forms parameters, user authenticated, etc. +It contains informations such as form parameters, user authenticated, etc. **Globally, a request represents a user query, either through HTTP or not (we also talk about RQL queries on the server side for example).** @@ -232,21 +232,21 @@ * `user`, instance of `cubicweb.common.utils.User` corresponding to the authenticated user -* `form`, dictionnary containing the values of a web form -* `encoding`, characters encoding to use in the response +* `form`, dictionary containing the values of a web form +* `encoding`, character encoding to use in the response But also: :Session data handling: - * `session_data()`, returns a dictionnary containing all the session data + * `session_data()`, returns a dictionary containing all the session data * `get_session_data(key, default=None)`, returns a value associated to the given key or the value `default` if the key is not defined * `set_session_data(key, value)`, assign a value to a key * `del_session_data(key)`, suppress the value associated to a key - + :Cookies handling: - * `get_cookie()`, returns a dictionnary containing the value of the header + * `get_cookie()`, returns a dictionary containing the value of the header HTTP 'Cookie' * `set_cookie(cookie, key, maxage=300)`, adds a header HTTP `Set-Cookie`, with a minimal 5 minutes length of duration by default (`maxage` = None @@ -268,7 +268,7 @@ * `cursor()` returns a RQL cursor on the session * `execute(*args, **kwargs)`, shortcut to ``.cursor().execute()`` * `property_value(key)`, properties management (`EProperty`) - * dictionnary `data` to store data to share informations between components + * dictionary `data` to store data to share informations between components *while a request is executed* Please note that this class is abstract and that a concrete implementation @@ -290,7 +290,7 @@ `__registry__`) and its identifier (attribute `id`). Usually we do not have to take care of the register, only the identifier `id`. -We can find a certain number of attributes and methods defined in this class +We can find a certain number of attributes and methods defined in this class and common to all the application objects. At the recording, the following attributes are dynamically added to @@ -333,7 +333,7 @@ also call the method `complete()` on the entity before returning it :Data formatting: - * `format_date(date, date_format=None, time=False)` returns a string for a + * `format_date(date, date_format=None, time=False)` returns a string for a mx date time according to application's configuration * `format_time(time)` returns a string for a mx date time according to application's configuration @@ -342,8 +342,8 @@ * `external_resource(rid, default=_MARKER)`, access to a value defined in the configuration file `external_resource` - - * `tal_render(template, variables)`, renders a precompiled page template with + + * `tal_render(template, variables)`, renders a precompiled page template with variables in the given dictionary as context .. note:: @@ -357,7 +357,7 @@ PrimaryView.f(self, arg1) You'd better write: :: - + class Truc(PrimaryView): def f(self, arg1): super(Truc, self).f(arg1) @@ -372,9 +372,9 @@ A cube is a model grouping one or more entity types and/or views associated in order to provide a specific feature or even a complete application using -others cubes. +other cubes. -You can decide to write your own set of cubes if you wish to re-use the +You can decide to write your own set of cubes if you wish to re-use the entity types you develop. Lots of cubes are available from the `CubicWeb Forge`_ under a free software license. @@ -388,12 +388,12 @@ A cube is structured as follows: :: - + mycube/ | |-- data/ | |-- cubes.mycube.css - | |-- cubes.mycube.js + | |-- cubes.mycube.js | `-- external_resources | |-- debian/ @@ -437,12 +437,12 @@ | `-- views.py - + We can use subpackages instead of python modules for ``views.py``, ``entities.py``, ``schema.py`` or ``hooks.py``. For example, we could have: :: - + mycube/ | |-- entities.py @@ -451,7 +451,7 @@ |-- forms.py |-- primary.py `-- widgets.py - + where : @@ -460,7 +460,7 @@ * ``sobjects`` contains hooks and/or views notifications (server side only) * ``views`` contains the web interface components (web interface only) * ``test`` contains tests related to the application (not installed) -* ``i18n`` contains messages catalogs for supported languages (server side and +* ``i18n`` contains message catalogs for supported languages (server side and web interface) * ``data`` contains data files for static content (images, css, javascripts) ...(web interface only) @@ -472,14 +472,14 @@ * file ``__pkginfo__.py`` provides component meta-data, especially the distribution and the current version (server side and web interface) or sub-cubes used by the cube. - - + + At least you should have: * the file ``__pkginfo__.py`` * the schema definition - XXX false, we may want to have cubes which are only adding a service, - no persistent data (eg embeding for instance) + XXX false, we may want to have cubes which are only adding a service, + no persistent data (eg embedding for instance) Standard library diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/B000-development.en.txt --- a/doc/book/en/B000-development.en.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/B000-development.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -1,5 +1,6 @@ .. -*- coding: utf-8 -*- +.. _Part2: ===================== Part II - Development diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/B0010-define-schema.en.txt --- a/doc/book/en/B0010-define-schema.en.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/B0010-define-schema.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -1,17 +1,18 @@ .. -*- coding: utf-8 -*- -Data model definition (*schema*) -================================ +Data model definition: the *schema* +=================================== -The schema is the core piece of a `CubicWeb` application as it defines -the data model handled. It is based on entities types already defined -in the `CubicWeb` standard library and others, more specific, we would -expect to find in one or more Python files under the `schema` directory. +The **schema** is the core piece of a `CubicWeb` application as it defines +the handled data model. It is based on entity types that are either already +defined in the `CubicWeb` standard library; or more specific types, that +`CubicWeb` expects to find in one or more Python files under the directory +`schema`. At this point, it is important to make clear the difference between -relation type and relation definition: a relation type is only a relation +*relation type* and *relation definition*: a *relation type* is only a relation name with potentially other additionnal properties (see XXXX), whereas a -relation definition is a complete triplet +*relation definition* is a complete triplet " ". A relation type could have been implied if none is related to a relation definition of the schema. diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/B0011-schema-stdlib.en.txt --- a/doc/book/en/B0011-schema-stdlib.en.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/B0011-schema-stdlib.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -3,14 +3,14 @@ Pre-defined schemas in the library ---------------------------------- -The library defines a set of entities schemas that are required by the system +The library defines a set of entity schemas that are required by the system or commonly used in `CubicWeb` applications. Of course, you can extend those schemas if necessary. System schemas `````````````` -The system entities available are : +The available system entities are: * `EUser`, system users * `EGroup`, users groups @@ -31,40 +31,63 @@ * `Bookmark`, an entity type used to allow a user to customize his links within the application -Cubes available +(The first 'E' in some of the names is the first letter of 'Erudi', +`CubicWeb`'s old name; it might be changed/removed some day.) + +Available cubes ``````````````` An application is based on several basic cubes. In the set of available basic cubes we can find for example : -* `comment`, provides an entity type for `Comment` allowing us to comment others - site's entities - -* `mailinglist`, provides an entity type for `Mailinglist` which groups informations - in a discussion list +* addressbook_: PhoneNumber and PostalAddress -* `file`, provides entity types for `File` et `Image` used to represent - files (text or binary) with additionnal informations such as MIME type or - encoding. - -* `link`, provides an entity type for hypertext link (`Link`) +* basket_: Basket (like a shopping cart) -* `blog`, provides an entity type weblog (`Blog`) - -* `person`, provides an entity type for a person (`Person`) +* blog_: Blog (a *very* basic blog) -* `addressbook`, provides an entity type used to represent phone - numbers (`PhoneNumber`) and mailing address (`PostalAddress`) - -* `classtags`, categorization system based on tags (`Tag`) +* comment_: Comment (to attach comment threads to entities) -* `classfolders`, categorization system based on folders hierarchy in order - to create navigation sections (`Folder`) - -* `email`, archiving management for emails (`Email`, `Emailpart`, +* email_: archiving management for emails (`Email`, `Emailpart`, `Emailthread`) -* `basket`, basket management (`Basket`) allowing to group entities +* event_: Event (define events, display them in calendars) + +* file_: File (to allow users to upload and store binary or text files) + +* folder_: Folder (to organize things but grouping them in folders) + +* keyword_: Keyword (to define classification schemes) + +* link_: Link (to collect links to web resources) + +* mailinglist_: MailingList (to reference a mailing-list and the URLs + for its archives and its admin interface) + +* person_: Person (easily mixed with addressbook) + +* tag_: Tag (to tag anything) + +* task_: Task (something to be done between start and stop date) + +* zone_: Zone (to define places within larger places, for example a + city in a state in a country) + +.. _addressbook: http://www.cubicweb.org/project/cubicweb-addressbook +.. _basket: http://www.cubicweb.org/project/cubicweb-basket +.. _blog: http://www.cubicweb.org/project/cubicweb-blog +.. _comment: http://www.cubicweb.org/project/cubicweb-comment +.. _email: http://www.cubicweb.org/project/cubicweb-email +.. _event: http://www.cubicweb.org/project/cubicweb-event +.. _file: http://www.cubicweb.org/project/cubicweb-file +.. _folder: http://www.cubicweb.org/project/cubicweb-folder +.. _keyword: http://www.cubicweb.org/project/cubicweb-keyword +.. _link: http://www.cubicweb.org/project/cubicweb-link +.. _mailinglist: http://www.cubicweb.org/project/cubicweb-mailinglist +.. _person: http://www.cubicweb.org/project/cubicweb-person +.. _tag: http://www.cubicweb.org/project/cubicweb-tag +.. _task: http://www.cubicweb.org/project/cubicweb-task +.. _zone: http://www.cubicweb.org/project/cubicweb-zone To declare the use of a component, once installed, add the name of the component to the variable `__use__` in the file `__pkginfo__.py` of your own component. diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/B0012-schema-definition.en.txt --- a/doc/book/en/B0012-schema-definition.en.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/B0012-schema-definition.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -3,26 +3,32 @@ Entity type definition ---------------------- -An entity type is defined by a Python class which inherits `EntityType`. The -class name correponds to the type name. Then the content of the class contains -the description of attributes and relations for the defined entity type, -for example :: +An entity type is defined by a Python class which inherits from `EntityType`. +The class definition contains the description of attributes and relations +for the defined entity type. +The class name corresponds to the entity type name. It is exepected to be +defined in the module ``mycube.schema``. - class Personne(EntityType): + +For example :: + + class Person(EntityType): """A person with the properties and the relations necessary for my application""" last_name = String(required=True, fulltextindexed=True) first_name = String(required=True, fulltextindexed=True) - title = String(vocabulary=('M', 'Mme', 'Mlle')) + title = String(vocabulary=('Mr', 'Mrs', 'Miss')) date_of_birth = Date() works_for = SubjectRelation('Company', cardinality='?*') + * the name of the Python attribute corresponds to the name of the attribute or the relation in `CubicWeb` application. -* all built-in types are available : `String`, `Int`, `Float`, - `Boolean`, `Date`, `Datetime`, `Time`, `Byte`. +* all `CubicWeb` built-in types are available : `String`, `Int`, `Float`, + `Boolean`, `Date`, `Datetime`, `Time`, `Byte`; they are and implicitely + imported (as well as the special the function "_"). * each entity type has at least the following meta-relations : @@ -34,21 +40,19 @@ - `created_by` (`EUser`) (which user created the entity) - - `owned_by` (`EUser`) (who does the entity belongs to, by default the - creator but not necessary and it could have multiple owners) + - `owned_by` (`EUser`) (to whom the entity belongs; by default the + creator but not necessary, and it could have multiple owners) - `is` (`EEType`) - -* it is also possible to define relations of type object by using `ObjectRelation` - instead of `SubjectRelation` -* the first argument of `SubjectRelation` and `ObjectRelation` gives respectively +* relations can be defined by using `ObjectRelation` or `SubjectRelation`. + The first argument of `SubjectRelation` or `ObjectRelation` gives respectively the object/subject entity type of the relation. This could be : * a string corresponding to an entity type - * a tuple of string correponding to multiple entities types + * a tuple of string corresponding to multiple entity types * special string such as follows : @@ -62,20 +66,20 @@ * optional properties for attributes and relations : - - `description` : string describing an attribute or a relation. By default + - `description` : a string describing an attribute or a relation. By default this string will be used in the editing form of the entity, which means that it is supposed to help the end-user and should be flagged by the function `_` to be properly internationalized. - - `constraints` : list of conditions/constraints that the relation needs to + - `constraints` : a list of conditions/constraints that the relation has to satisfy (c.f. `Contraints`_) - - `cardinality` : two characters string which specify the cardinality of the + - `cardinality` : a two character string which specify the cardinality of the relation. The first character defines the cardinality of the relation on - the subject, the second on the object of the relation. When a relation - has multiple possible subjects or objects, the cardinality applies to all - and not on a one to one basis (so it must be consistent...). The possible - values are inspired from regular expressions syntax : + the subject, and the second on the object. When a relation can have + multiple subjects or objects, the cardinality applies to all, + not on a one-to-one basis (so it must be consistent...). The possible + values are inspired from regular expression syntax : * `1`: 1..1 * `?`: 0..1 @@ -85,7 +89,7 @@ - `meta` : boolean indicating that the relation is a meta-relation (false by default) -* optionnal properties for attributes : +* optional properties for attributes : - `required` : boolean indicating if the attribute is required (false by default) @@ -98,11 +102,11 @@ attribute. - `default` : default value of the attribute. In case of date types, the values - which could be used correpond to the RQL keywords `TODAY` and `NOW`. + which could be used correspond to the RQL keywords `TODAY` and `NOW`. - `vocabulary` : specify static possible values of an attribute -* optionnal properties of type `String` : +* optional properties of type `String` : - `fulltextindexed` : boolean indicating if the attribute is part of the full text index (false by default) (*applicable on the type `Byte` @@ -113,17 +117,17 @@ - `maxsize` : integer providing the maximum size of the string (no limit by default) -* optionnal properties for relations : +* optional properties for relations : - `composite` : string indicating that the subject (composite == 'subject') is composed of the objects of the relations. For the opposite case (when - the object is composed of the subjects of the relation), we just need - to set 'object' as the value. The composition implies that when the relation + the object is composed of the subjects of the relation), we just set + 'object' as value. The composition implies that when the relation is deleted (so when the composite is deleted), the composed are also deleted. Contraints `````````` -By default, the available constraints types are : +By default, the available constraint types are : * `SizeConstraint` : allows to specify a minimum and/or maximum size on string (generic case of `maxsize`) @@ -135,7 +139,7 @@ * `StaticVocabularyConstraint` : identical to "vocabulary=(...)" -* `RQLConstraint` : allows to specify a RQL query that needs to be satisfied +* `RQLConstraint` : allows to specify a RQL query that has to be satisfied by the subject and/or the object of the relation. In this query the variables `S` and `O` are reserved for the entities subject and object of the relation. @@ -143,18 +147,18 @@ * `RQLVocabularyConstraint` : similar to the previous type of constraint except that it does not express a "strong" constraint, which means it is only used to restrict the values listed in the drop-down menu of editing form, but it does - not prevent another entity to be selected + not prevent another entity to be selected. -Relation definition -------------------- +Definition of relations +----------------------- XXX add note about defining relation type / definition A relation is defined by a Python class heriting `RelationType`. The name of the class corresponds to the name of the type. The class then contains a description of the properties of this type of relation, and could as well -contains a string for the subject and a string for the object. This allows to create +contain a string for the subject and a string for the object. This allows to create new definition of associated relations, (so that the class can have the definition properties from the relation) for example :: @@ -174,14 +178,14 @@ table for the relation. This applies to the relation when the cardinality of subject->relation->object is 0..1 (`?`) or 1..1 (`1`) -* `symetric` : boolean indication that the relation is symetrical, which +* `symmetric` : boolean indicating that the relation is symmetrical, which means `X relation Y` implies `Y relation X` In the case of simultaneous relations definitions, `subject` and `object` can both be equal to the value of the first argument of `SubjectRelation` and `ObjectRelation`. -When a relation is not inlined and not symetrical, and it does not require +When a relation is not inlined and not symmetrical, and it does not require specific permissions, its definition (by using `SubjectRelation` and `ObjectRelation`) is all we need. @@ -219,8 +223,8 @@ Permissions definition `````````````````````` -Define permissions is set through to the attribute `permissions` of entities and -relations types. It defines a dictionnary where the keys are the access types +Setting permissions is done with the attribute `permissions` of entities and +relation types. It defines a dictionary where the keys are the access types (action), and the values are the authorized groups or expressions. For an entity type, the possible actions are `read`, `add`, `update` and @@ -375,12 +379,16 @@ Updating your application with your new schema `````````````````````````````````````````````` -You have to get a shell on your application :: +If you modified your schema, the update is not automatic; indeed, this is +in general not a good idea. +Instead, you call a shell on your application, which is a +an interactive python shell, with an appropriate +cubicweb environment :: - cubicweb-ctl shell moninstance + cubicweb-ctl shell myinstance and type :: - add_entity_type('Personne') + add_entity_type('Person') And restart your application! diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/B0020-define-workflows.en.txt --- a/doc/book/en/B0020-define-workflows.en.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/B0020-define-workflows.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -2,78 +2,43 @@ .. _Workflow: -Workflow definition -=================== +An Example: Workflow definition +=============================== General ------- -A workflow can be defined in a `CubicWeb` application thanks to the system -entities ``State`` and ``Transition``. Those are defined within all -`CubicWeb` application and can be set-up through the main administrator interface. - -Once your schema is defined, you can start creating the set of states and -the required transitions for your applications entities. - -You first need to define the states and then the transitions between those -to complete your workflow. - -A ``State`` defines the status of an entity. While creating a new state, -you will be first given the option to select the entity type the state -can be applied to. By choosing ``Apply``, a new section will be displayed -in the editing screen to enable you to add relation to the state you are -creating. +A workflow describes how certain entities have to evolve between +different states. Hence we have a set of states, and a "transition graph", +i.e. a list of possible transitions from one state to another state. -A ``Transition`` is also based on an entity type it can be applied to. -By choosing ``Apply``, a new section will be displayed in the editing -screen to enable you to add relation to the transition you are -creating. - -At the transition level you will also define the group of user which can -aplly this transition to an object. - - -Example of a simple workflow ----------------------------- - -Please see the tutorial to view and example of a simple workflow. - - -[Create a simple workflow for BlogDemo, to have a moderator approve new blog -entry to be published. This implies, specify a dedicated group of blog -moderator as well as hide the view of a blog entry to the user until -it reaches the state published] +We will define a simple workflow for a blog, with only the following +two states: `submitted` and `published`. So first, we create a simple +`CubicWeb` in ten minutes (see :ref:`BlogTenMinutes`). Set-up a workflow ----------------- We want to create a workflow to control the quality of the BlogEntry submitted on your application. When a BlogEntry is created by a user -its state should be `submitted`. To be visible to all, it needs to -be in the state `published`. To move from `submitted` to `published` -we need a transition that we can name `approve_blogentry`. - -We do not want every user to be allowed to change the state of a -BlogEntry. We need to define a group of user, `moderators`, and -this group will have appropriate permissions to approve BlogEntry -to be published and visible to all. +its state should be `submitted`. To be visible to all, it has to +be in the state `published`. To move it from `submitted` to `published`, +we need a transition that we can call `approve_blogentry`. -There are two ways to create a workflow, form the user interface, -and also by defining it in ``migration/postcreate.py``. +A BlogEntry state should not be modifiable by every user. +So we have to define a group of users, `moderators`, and +this group will have appropriate permissions to publish a BlogEntry. + +There are two ways to create a workflow: from the user interface, +or by defining it in ``migration/postcreate.py``. This script is executed each time a new ``cubicweb-ctl db-init`` is done. -If you create the states and transitions through the user interface -this means that next time you will need to initialize the database -you will have to re-create all the entities. -We strongly recommand you create the workflow in ``migration\postcreate.py`` -and we will now show you how. -The user interface would only be a reference for you to view the states -and transitions but is not the appropriate interface to define your -application workflow. +We strongly recommand to create the workflow in ``migration/postcreate.py`` +and we will now show you how. Read `Under the hood`_ to understand why. Update the schema ~~~~~~~~~~~~~~~~~ -To enable a BlogEntry to have a State, we have to define a relation -``in_state`` in the schema of BlogEntry. Please do as follows, add +If we want a State for our BlogEntry, we have to define a relation +``in_state`` in the schema of BlogEntry. So we add the line ``in_state (...)``:: class BlogEntry(EntityType): @@ -86,59 +51,64 @@ entry_of = SubjectRelation('Blog', cardinality='?*') in_state = SubjectRelation('State', cardinality='1*') -As you updated the schema, you will have re-execute ``cubicweb-ctl db-init`` +As you updated the schema, you have to re-execute ``cubicweb-ctl db-init`` to initialize the database and migrate your existing entities. + [WRITE ABOUT MIGRATION] Create states, transitions and group permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -At the time the ``postcreate.py`` script is executed, several methods -can be used. They are all defined in the ``class ServerMigrationHelper``. -We will only discuss the method we use to create a wrokflow here. +The ``postcreate.py`` script is executed in a special environment, adding +several `CubicWeb` primitives that can be used. +They are all defined in the ``class ServerMigrationHelper``. +We will only discuss the methods we use to create a workflow in this example. To define our workflow for BlogDemo, please add the following lines to ``migration/postcreate.py``:: _ = unicode - moderators = add_entity('EGroup', name=u"moderators") + moderators = add_entity('EGroup', name=u"moderators") + +This adds the `moderators` user group. + +:: submitted = add_state(_('submitted'), 'BlogEntry', initial=True) published = add_state(_('published'), 'BlogEntry') +``add_state`` expects as first argument the name of the state you want +to create, then the entity type on which the state can be applied, +and an optional argument to say if it is supposed to be the initial state +of the entity type. + +:: + add_transition(_('approve_blogentry'), 'BlogEntry', (submitted,), published, ('moderators', 'managers'),) + +``add_transition`` expects + + * as the first argument the name of the + transition, then the entity type on which the transition can be applied, + * then the list of states on which the transition can be trigged, + * the target state of the transition, + * and the permissions + (e.g. a list of user groups who can apply the transition; the user + has to belong to at least one of the listed group to perform the action). + +:: + checkpoint() .. note:: Do not forget to add the `_()` in front of all states and transitions names while creating a workflow so that they will be identified by the i18n catalog scripts. -``add_entity`` is used here to define the new group of users that we -need to define the transitions, `moderators`. -If this group required by the transition is not defined before the -transition is created, it will not create the relation `transition -require the group moderator`. - -``add_state`` expects as the first argument the name of the state you are -willing to create, then the entity type on which the state can be applied, -and an optionnal argument to set if the state is the initial state -of the entity type or not. - -``add_transition`` expects as the first argument the name of the -transition, then the entity type on which we can apply the transition, -then the list of possible initial states from which the transition -can be applied, the target state of the transition, and the permissions -(e.g. list of the groups of users who can apply the transition, the user -needs to belong to at least one of the listed group). - - -We could have also added a RQL condition in addition to a group to -which the user should belong to. - -If we use both RQL condition and group, the two must be satisfied -for the user to be allowed to apply the transition. +In addition to the user group condition, we could have added a RQL condition. +In this case, the user can only perform the action if +the two conditions are satisfied. If we use a RQL condition on a transition, we can use the following variables: @@ -150,9 +120,40 @@ .. image:: images/lax-book.03-transitions-view.en.png -You can now notice that in the actions box of a BlogEntry, the state -is now listed as well as the possible transitions from this state -defined by the workflow. This transition, as defined in the workflow, -will only being displayed for the users belonging to the group -moderators of managers. +You can notice that in the action box of a BlogEntry, the state +is now listed as well as the possible transitions defined by the workflow. +The transitions will only be displayed for users having the right permissions. +In our example, the transition `approve_blogentry` will only be displayed +for the users belonging to the group `moderators` or `managers`. + + +Under the hood +~~~~~~~~~~~~~~ + +A workflow is a collection of entities of type ``State`` and of type ``Transition`` +which are standard `CubicWeb` entity types. +For instance, the following lines:: + + submitted = add_state(_('submitted'), 'BlogEntry', initial=True) + published = add_state(_('published'), 'BlogEntry') +will create two entities of type ``State``, one with name 'submitted', and the other +with name 'published'. Whereas:: + + add_transition(_('approve_blogentry'), 'BlogEntry', (submitted,), published, ('moderators', 'managers'),) + +will create an entity of type ``Transition`` with name 'approve_blogentry' which will +be linked to the ``State`` entities created before. +As a consequence, we could use the administration interface to do these operations. +But it is not recommanded because it will be uselessly complicated +and will be only local to your instance. + + +Indeed, if you create the states and transitions through the user interface, +next time you initialize the database +you will have to re-create all the entities. +The user interface should only be a reference for you to view the states +and transitions, but is not the appropriate interface to define your +application workflow. + + diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/B0030-data-as-objects.en.txt --- a/doc/book/en/B0030-data-as-objects.en.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/B0030-data-as-objects.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -4,15 +4,15 @@ Data as objects =============== -We will in this chapter introduce the objects that are used to handle +In this chapter, we will introduce the objects that are used to handle the data stored in the database. -Classes `Entity` and `AnyEntity` --------------------------------- +Class `Entity` and `AnyEntity` +------------------------------ -To provide a specific behavior for each entity, we just need to define -a class inheriting from `cubicweb.entities.AnyEntity`. In general, we have -to defined those classes in a module of `entities` package of an application +To provide a specific behavior for each entity, we have to define +a class inheriting from `cubicweb.entities.AnyEntity`. In general, we +define this class in a module of `mycube.entities` package of an application so that it will be available on both server and client side. The class `AnyEntity` is loaded dynamically from the class `Entity` @@ -22,7 +22,7 @@ Descriptors are added when classes are registered in order to initialize the class according to its schema: -* we can access the defined attributes in the schema thanks the attributes of +* we can access the defined attributes in the schema thanks to the attributes of the same name on instances (typed value) * we can access the defined relations in the schema thanks to the relations of @@ -33,12 +33,12 @@ * `has_eid()`, returns true is the entity has an definitive eid (e.g. not in the creation process) -* `check_perm(action)`, checks if the user has the permission to execcute the +* `check_perm(action)`, checks if the user has the permission to execute the requested action on the entity :Formatting and output generation: - * `view(vid, **kwargs)`, apply the given view to the entity + * `view(vid, **kwargs)`, applies the given view to the entity * `absolute_url(**kwargs)`, returns an absolute URL to access the primary view of an entity @@ -114,34 +114,134 @@ * `relation_vocabulary(rtype, targettype, x, limit=None)`, called internally by `subject_relation_vocabulary` and `object_relation_vocabulary` +Class `TreeMixIn` +----------------- + +This class provides a tree interface. This mixin has to be inherited +explicitly and configured using the tree_attribute, parent_target and +children_target class attribute to benefit from this default implementation. + +This class provides the following methods: + + * `different_type_children(entities=True)`, returns children entities + of different type as this entity. According to the `entities` parameter, + returns entity objects (if entity=True) or the equivalent result set. + + * `same_type_children(entities=True)`, returns children entities of + the same type as this entity. According to the `entities` parameter, + return entity objects (if entity=True) or the equivalent result set. + + * `iterchildren( _done=None)`, iters on the children of the entity. + + * `prefixiter( _done=None)` + + * `path()`, returns the list of eids from the root object to this object. + + * `iterparents()`, iters on the parents of the entity. + + * `notification_references(view)`, used to control References field + of email send on notification for this entity. `view` is the notification view. + Should return a list of eids which can be used to generate message ids + of previously sent email. + +`TreeMixIn` implements also the ITree interface (``cubicweb.interfaces``): + + * `parent()`, returns the parent entity if any, else None (e.g. if we are on the + root) + + * `children(entities=True, sametype=False)`, returns children entities + according to the `entities` parameter, return entity objects or the + equivalent result set. + + * `children_rql()`, returns the RQL query corresponding to the children + of the entity. + + * `is_leaf()`, returns True if the entity does not have any children. + + * `is_root()`, returns True if the entity does not have any parent. + + * `root()`, returns the root object of the tree representation of + the entity and its related entities. + +Example of use +`````````````` + +Imagine you defined three types of entities in your schema, and they +relates to each others as follows in ``schema.py``:: + + class Entity1(EntityType): + title = String() + is_related_to = SubjectRelation('Entity2', 'subject') + + class Entity2(EntityType): + title = String() + belongs_to = SubjectRelation('Entity3', 'subject') + + class Entity3(EntityType): + name = String() + +You would like to create a view that applies to both entity types +`Entity1` and `Entity2` and which lists the entities they are related to. +That means when you view `Entity1` you want to list all `Entity2`, and +when you view `Entity2` you want to list all `Entity3`. + +In ``entities.py``:: + + class Entity1(TreeMixIn, AnyEntity): + id = 'Entity1' + __implements__ = AnyEntity.__implements__ + (ITree,) + __rtags__ = {('is_related_to', 'Entity2', 'object'): 'link'} + tree_attribute = 'is_related_to' + + def children(self, entities=True): + return self.different_type_children(entities) + + class Entity2(TreeMixIn, AnyEntity): + id = 'Entity2' + __implements__ = AnyEntity.__implements__ + (ITree,) + __rtags__ = {('belongs_to', 'Entity3', 'object'): 'link'} + tree_attribute = 'belongs_to' + + def children(self, entities=True): + return self.different_type_children(entities) + +Once this is done, you can define your common view as follows:: + + class E1E2CommonView(baseviews.PrimaryView): + accepts = ('Entity11, 'Entity2') + + def render_entity_relations(self, entity, siderelations): + self.wview('list', entity.children(entities=False)) + *rtags* ------- -*rtags* allows to specify certain behaviors of relations relative to a given +*rtags* allow to specify certain behaviors of relations relative to a given entity type (see later). They are defined on the entity class by the attribute -`rtags` which is a dictionnary with as its keys the triplet :: +`rtags` which is a dictionary with as keys the triplets :: , , -and as the values a `set` or a tuple of markers defining the properties that +and as values a `set` or a tuple of markers defining the properties that apply to this relation. -It is possible to simplify this dictionnary: +It is possible to simplify this dictionary: * if we want to specifiy a single marker, it is not necessary to - use a tuple as the value, the marker by itself (characters string) + use a tuple as value, the marker by itself (character string) is enough * if we only care about a single type of relation and not about the target and the context position (or when this one is not ambigous), we can simply - use the name of the relation type as the key + use the name of the relation type as key * if we want a marker to apply independently from the target entity type, - we have to use the string `*` as the target entity type + we have to use the string `*` as target entity type -Please note that this dictionnary is *treated at the time the class is created*. +Please note that this dictionary is *treated at the time the class is created*. It is automatically merged with the parent class(es) (no need to copy the -dictionnary from the parent class to modify it). Also, modify it after the +dictionary from the parent class to modify it). Also, modifying it after the class is created will not have any effect... .. include:: B0031-define-entities.en.txt + diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/B0031-define-entities.en.txt --- a/doc/book/en/B0031-define-entities.en.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/B0031-define-entities.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -5,8 +5,8 @@ Dynamic default values `````````````````````` -It is possible to define in the schema *static* default values. -It is also possible to define in the schema *dynamic* default values +It is possible to define *static* default values in the schema. +It is also possible to define *dynamic* default values by defining in the entity class a method `default_` for a given attribute. @@ -55,13 +55,21 @@ It is possible to manage attributes/relations in the simple or multiple editing form thanks to the following *rtags*: -* `primary`, indicates that an attribute or a relation has to be inserted - in the simple or multiple editing forms. In the case of a relation, - the related entity editing form will be included in the editing form. +* `primary`, indicates that an attribute or a relation has to be + inserted **in the simple or multiple editing forms**. In the case of + a relation, the related entity editing form will be included in the + editing form and represented as a combobox. Each item of the + combobox is a link to an existing entity. -* `secondary`, indicates that an attribute or a relation has to be inserted - in the simple editing form only. In the case of a relation, the related - entity editing form sill be included in the editing form. +* `secondary`, indicates that an attribute or a relation has to be + inserted **in the simple editing form only**. In the case of a + relation, the related entity editing form will be included in the + editing form and represented as a combobox. Each item of the combobox + is a link to an existing entity. + +* `inlineview`, includes the target entity's form in the editing form + of the current entity. It allows to create the target entity in the + same time as the current entity. * `generic`, indicates that a relation has to be inserted in the simple editing form, in the generic box of relation creation. @@ -110,20 +118,22 @@ 1. we consider that the first column contains the entities to constraint 2. we collect the first entity of the table (row 0) to represent all the others -3. for all the others variables defined in the original request: +3. for all the other variables defined in the original request: - 1. if the varaible is related to the main variable by at least one relation + 1. if the variable is related to the main variable by at least one relation 2. we call the method ``filterform_vocabulary(rtype, x)`` on the entity, if nothing is returned (meaning a tuple `Non`, see below), we go to the next variable, otherwise a form filtering element is created based on the vocabulary values returned -4. there is no others limitations to the `RQL`, it can include sorting, grouping - conditions... Javascripts functions are used to regenerate a request based on the +4. there are no other limitations to the `RQL`, it can include sorting, grouping + conditions... JavaScript functions are used to regenerate a request based on the initial request and on the selected values from the filtering form. The method ``filterform_vocabulary(rtype, x, var, rqlst, args, cachekey)`` takes -the name of a relation and the target as parameters, which indicates of the +the name of a relation and the target as parameters, +[XXX what does it mean ?] +which indicates of the entity on which we apply the method is subject or object of the relation. It has to return: @@ -149,18 +159,18 @@ class Ticket(AnyEntity): - ... + ... - def filterform_vocabulary(self, rtype, x, var, rqlst, args, cachekey): - _ = self.req._ - if rtype == 'type': - return 'string', [(x, _(x)) for x in ('bug', 'story')] - if rtype == 'priority': - return 'string', [(x, _(x)) for x in ('minor', 'normal', 'important')] - if rtype == 'done_in': - rql = insert_attr_select_relation(rqlst, var, rtype, 'num') - return 'eid', self.req.execute(rql, args, cachekey) - return super(Ticket, self).filterform_vocabulary(rtype, x, var, rqlst, + def filterform_vocabulary(self, rtype, x, var, rqlst, args, cachekey): + _ = self.req._ + if rtype == 'type': + return 'string', [(x, _(x)) for x in ('bug', 'story')] + if rtype == 'priority': + return 'string', [(x, _(x)) for x in ('minor', 'normal', 'important')] + if rtype == 'done_in': + rql = insert_attr_select_relation(rqlst, var, rtype, 'num') + return 'eid', self.req.execute(rql, args, cachekey) + return super(Ticket, self).filterform_vocabulary(rtype, x, var, rqlst, args, cachekey) .. note:: diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/B0040-migration.en.txt --- a/doc/book/en/B0040-migration.en.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/B0040-migration.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -5,10 +5,10 @@ Migration ========= -One of the main concept in `CubicWeb` is to create incremental applications -and for this purpose multiple actions are provided to facilitate the improvement -of an application and in particular changes applied to the data model -without loosing existing data. +One of the main concept in `CubicWeb` is to create incremental applications. +For this purpose, multiple actions are provided to facilitate the improvement +of an application, and in particular to handle the changes to be applied +to the data model, without loosing existing data. The current version of an application model is provided in the file `__pkginfo__.py` as a tuple of 3 integers. @@ -16,8 +16,8 @@ Migration scripts management ---------------------------- -Migration scripts needs to be located in the directory `migration` of your -application and nammed accordingly: +Migration scripts has to be located in the directory `migration` of your +application and named accordingly: :: @@ -25,26 +25,27 @@ in which : -* X.Y.Z is the model version number to which the script enable to migrate +* X.Y.Z is the model version number to which the script enables to migrate. -* *mode* (between the last "_" and the extension ".py") indicates which part - of the application (RQL server, web server) the script applies to in case - of distributed installation. Its value could be : +* *mode* (between the last "_" and the extension ".py") is used for + distributed installation. It indicates to which part + of the application (RQL server, web server) the script applies. + Its value could be : * `common`, applies to the RQL server as well as the web server and updates files on the hard drive (configuration files migration for example). - * `web`, applies only to the web server and updates files on the hard drive + * `web`, applies only to the web server and updates files on the hard drive. * `repository`, applies only to the RQL server and updates files on the - hard drive + hard drive. * `Any`, applies only to the RQL server and updates data in the database - (schema and data migration for example) + (schema and data migration for example). Again in the directory `migration`, the file `depends.map` allows to indicate -that to migrate to a particular model version, you always have to first migrate -to a particular `CubicWeb` version. This file can contains comments (lines +that for the migration to a particular model version, you always have to first +migrate to a particular `CubicWeb` version. This file can contain comments (lines starting by `#`) and a dependancy is listed as follows: :: : @@ -53,33 +54,31 @@ 0.12.0: 2.26.0 0.13.0: 2.27.0 - # 0.14 works with 2.27 <= erudi <= 2.28 at least + # 0.14 works with 2.27 <= cubicweb <= 2.28 at least 0.15.0: 2.28.0 Base context ------------ -The following identifiers are pre-defined in the migration scripts: +The following identifiers are pre-defined in migration scripts: * `config`, instance configuration * `interactive_mode`, boolean indicating that the script is executed in - an intercative mode or not + an interactive mode or not * `appltemplversion`, application model version of the instance -* `applerudiversion`, cubicweb instance version - * `templversion`, installed application model version -* `erudiversion`, installed cubicweb version +* `cubicwebversion`, installed cubicweb version -* `confirm(question)`, function interrogating the user and returning true - if the user answers yes, false otherwise (always returns true when in a +* `confirm(question)`, function asking the user and returning true + if the user answers yes, false otherwise (always returns true in non-interactive mode) -* `_`, function fonction equivalent to `unicode` allowing to flag the strings - to internationalize in the migration scripts +* the function `_`, it is equivalent to `unicode` allowing to flag the strings + to internationalize in the migration scripts. In the `repository` scripts, the following identifiers are also defined: @@ -89,7 +88,7 @@ current migration) * `newschema`, installed schema on the file system (e.g. schema of - the updated model and erudi) + the updated model and cubicweb) * `sqlcursor`, SQL cursor for very rare cases where it is really necessary or beneficial to go through the sql @@ -99,7 +98,7 @@ Schema migration ---------------- -The following functions for schema migration are available in the `repository` +The following functions for schema migration are available in `repository` scripts: * `add_attribute(etype, attrname, attrtype=None, commit=True)`, adds a new @@ -109,7 +108,7 @@ * `drop_attribute(etype, attrname, commit=True)`, removes an attribute from an existing entity type. -* `rename_attribute(etype, oldname, newname, commit=True)`, rename an attribute +* `rename_attribute(etype, oldname, newname, commit=True)`, renames an attribute * `add_entity_type(etype, auto=True, commit=True)`, adds a new entity type. If `auto` is True, all the relations using this entity type and having a known @@ -149,7 +148,7 @@ or even relations definitions). * `change_relation_props(subjtype, rtype, objtype, commit=True, **kwargs)`, changes - properties of a relation definition by using the nammed parameters of the properties + properties of a relation definition by using the named parameters of the properties to change. * `set_widget(etype, rtype, widget, commit=True)`, changes the widget used for the @@ -160,19 +159,19 @@ Data migration -------------- -The following functions for data migration are available in the `repository` scripts: +The following functions for data migration are available in `repository` scripts: * `rql(rql, kwargs=None, cachekey=None, ask_confirm=True)`, executes an arbitrary RQL query, either to interrogate or update. A result set object is returned. * `add_entity(etype, *args, **kwargs)`, adds a nes entity type of the given - type. The attributes and relations values are specified using the nammed and + type. The attribute and relation values are specified using the named and positionned parameters. Workflow creation ----------------- -The following functions for workflow creation are available in the `repository` +The following functions for workflow creation are available in `repository` scripts: * `add_state(name, stateof, initial=False, commit=False, **kwargs)`, adds a new state @@ -186,10 +185,10 @@ Configuration migration ----------------------- -The following functions for configuration migration are available in all the +The following functions for configuration migration are available in all scripts: -* `option_renamed(oldname, newname)`, indicates that an option has been renammed +* `option_renamed(oldname, newname)`, indicates that an option has been renamed * `option_group_change(option, oldgroup, newgroup)`, indicates that an option does not belong anymore to the same group. @@ -203,7 +202,7 @@ -------------------------- Those functions are only used for low level operations that could not be accomplished otherwise or to repair damaged databases during interactive -session. They are available in the `repository` scripts: +session. They are available in `repository` scripts: * `sqlexec(sql, args=None, ask_confirm=True)`, executes an arbitrary SQL query * `add_entity_type_table(etype, commit=True)` diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/B1020-define-views.en.txt --- a/doc/book/en/B1020-define-views.en.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/B1020-define-views.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -1,6 +1,6 @@ .. -*- coding: utf-8 -*- -.. _DefinitionVues: +.. _ViewDefinition: Views definition ================ @@ -13,6 +13,8 @@ understanding of the classes and methods available, then detail the view selection principle which makes `CubicWeb` web interface very flexible. +A `View` is an object applied to another object such as an entity. + Basic class for views --------------------- @@ -61,19 +63,18 @@ * `page_title()`, returns the title to use in the HTML header `title` -* `creator(eid)`, returns the eid and the login of the entity creator of the entity - having the eid given in the parameter -Other basic views classes -````````````````````````` +Other basic view classes +```````````````````````` Here are some of the subclasses of `View` defined in `cubicweb.common.view` -that are more concrete as they relates to data rendering within the application: +that are more concrete as they relate to data rendering within the application: * `EntityView`, view applying to lines or cell containing an entity (e.g. an eid) * `StartupView`, start view that does not require a result set to apply to * `AnyRsetView`, view applied to any result set * `EmptyRsetView`, view applied to an empty result set + The selection view principle ---------------------------- @@ -83,14 +84,14 @@ and this identifier will be used as a key). This is defined in the class attribute ``id``. -- a filter to select the resulsets it can be applied to. This is defined in +- a filter to select the result sets it can be applied to. This is defined in the class attribute ``__selectors__``, which expects a tuple of selectors as its value. For a given identifier, multiple views can be defined. `CubicWeb` uses -a selector which computes scores so that it can identify and select the -best view to apply in context. The selectors library is in +a selector which computes scores to identify and select the +best view to apply in the given context. The selectors library is in ``cubicweb.common.selector`` and a library of the methods used to compute scores is in ``cubicweb.vregistry.vreq``. @@ -98,6 +99,9 @@ Registerer `````````` +[Registerers are deprecated: they will soon disappear for explicite +registration...] + A view is also customizable through its attribute ``__registerer__``. This is used at the time the application is launched to manage how objects (views, graphic components, actions, etc.) @@ -107,14 +111,11 @@ object that is equivalent to an already registered object, which could happen when we define two `primary` views for an entity type. -The purpose of a `registerer` is to control objects registry -at the application startup whereas `selectors` controls objects +The purpose of a `registerer` is to control object registry +at the application startup whereas `selectors` control objects when they are selected for display. -`CubicWeb` provides a lot of standard views for the default class -`EntityType`. You can find them in ``cubicweb/web/views/``. - .. include:: B1022-views-stdlib.en.txt @@ -163,7 +164,7 @@ If you want to change the way a ``BlogEntry`` is displayed, just override the method ``cell_call()`` of the view ``primary`` in ``BlogDemo/views.py`` :: - 01. from ginco.web.views import baseviews + 01. from cubicweb.web.views import baseviews 02. 03. class BlogEntryPrimaryView(baseviews.PrimaryView): 04. @@ -179,15 +180,15 @@ The above source code defines a new primary view (`line 03`) for ``BlogEntry`` (`line 05`). -Since views are applied to resultsets and resulsets can be tables of -data, it is needed to recover the entity from its (row,col) -coordinates (`line 08`). We will get to this in more detail later. +Since views are applied to result sets which can be tables of +data, we have to recover the entity from its (row,col)-coordinates (`line 08`). +We will get to this in more detail later. -The view has a ``self.w()`` method that is used to output data. Here `lines +The view method ``self.w()`` is used to output data. Here `lines 09-12` output HTML tags and values of the entity's attributes. -When displaying same blog entry as before, you will notice that the -page is now looking much nicer. +When displaying the same blog entry as before, you will notice that the +page is now looking much nicer. [FIXME: it is not clear to what this refers.] .. image:: images/lax-book.09-new-view-blogentry.en.png :alt: blog entries now look much nicer @@ -206,22 +207,22 @@ 10. self.wview('primary', rset) In the above source code, `lines 01-08` are similar to the previous -view we defined. +view we defined. [FIXME: defined where ?] -At `line 09`, a simple request in made to build a resultset with all +At `line 09`, a simple request is made to build a result set with all the entities linked to the current ``Blog`` entity by the relationship ``entry_of``. The part of the framework handling the request knows about the schema and infer that such entities have to be of the ``BlogEntry`` kind and retrieves them. -The request returns a selection of data called a resultset. At -`line 10` the view 'primary' is applied to this resultset to output +The request returns a selection of data called a result set. At +`line 10` the view 'primary' is applied to this result set to output HTML. **This is to be compared to interfaces and protocols in object-oriented -languages. Applying a given view to all the entities of a resultset only -requires the availability, for each entity of this resultset, of a -view with that name that can accepts the entity.** +languages. Applying a given view called 'a_view' to all the entities +of a result set only requires to have for each entity of this result set, +an available view called 'a_view' which accepts the entity.** Assuming we added entries to the blog titled `MyLife`, displaying it now allows to read its description and all its entries. @@ -232,7 +233,7 @@ **Before we move forward, remember that the selection/view principle is at the core of `CubicWeb`. Everywhere in the engine, data is requested using the RQL language, then HTML/XML/text/PNG is output by applying a -view to the resultset returned by the query. That is where most of the +view to the result set returned by the query. That is where most of the flexibility comes from.** [WRITE ME] @@ -242,7 +243,7 @@ We will implement the `cubicweb.interfaces.ICalendarable` interfaces on entities.BlogEntry and apply the OneMonthCalendar and iCalendar views -to resultsets like "Any E WHERE E is BlogEntry" +to result sets like "Any E WHERE E is BlogEntry" * create view "blogentry table" with title, publish_date, category @@ -262,7 +263,7 @@ Templates --------- -*Templates* are specific view that does not depend on a result set. The basic +*Templates* are specific views that do not depend on a result set. The basic class `Template` (`cubicweb.common.view`) is derived from the class `View`. To build a HTML page, a *main template* is used. In general, the template of @@ -280,16 +281,16 @@ XML views, binaries... ---------------------- -For the views generating other formats that HTML (an image generated dynamically -for example), and which can not usually be included in the HTML page generated +For views generating other formats than HTML (an image generated dynamically +for example), and which can not simply be included in the HTML page generated by the main template (see above), you have to: -* set the atribute `templatable` of the class to `False` +* set the attribute `templatable` of the class to `False` * set, through the attribute `content_type` of the class, the MIME type generated by the view to `application/octet-stream` -For the views dedicated to binary content creation (an image dynamically generated -for example), we have to set the attribute `binary` of the class to `True` (which +For views dedicated to binary content creation (like dynamically generated +images), we have to set the attribute `binary` of the class to `True` (which implies that `templatable == False`, so that the attribute `w` of the view could be replaced by a binary flow instead of unicode). diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/B1021-views-selectors.en.txt --- a/doc/book/en/B1021-views-selectors.en.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/B1021-views-selectors.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -5,7 +5,7 @@ Selectors are scoring functions that are called by the view dispatcher to tell whenever a view can be applied to a given result -set and request. Selector sets are the glue that tie views to the data +set of a request. Selector sets are the glue that tie views to the data model. Using them appropriately is an essential part of the construction of well behaved cubes. diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/B1022-views-stdlib.en.txt --- a/doc/book/en/B1022-views-stdlib.en.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/B1022-views-stdlib.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -2,6 +2,10 @@ Predefined views in the library ``````````````````````````````` + +`CubicWeb` provides a lot of standard views. You can find them in +``cubicweb/web/views/``. + A certain number of views are used to build the web interface, which apply to one or more entities. Their identifier is what distinguish them from each others and the main ones are: @@ -56,7 +60,8 @@ This view displays usually a side box of some related entities in a primary view. -Start view: + +Start view (e.g. views that don't apply to a result set): *index* This view defines the home page of your application. It does not require diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/B1030-form-management.en.txt --- a/doc/book/en/B1030-form-management.en.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/B1030-form-management.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -13,7 +13,7 @@ The form generated by default does not fit your needs? You are not required to re-do all by hands! :) -* rtags primary, secondary, generated, generic, +* rtags primary, secondary, generated, generic, `Entity.relation_category(rtype, x='subject')` * inline_view (now a rtag?) * widget specification @@ -36,8 +36,8 @@ starting by `eid:` and also having a parameter `__type` associated (also *qualified* by eid) -2. For all the attributes and the relations of an entity to edit: - +2. For all the attributes and the relations of an entity to edit: + 1. search for a parameter `edits-` or `edito-` qualified in the case of a relation where the entity is object 2. if found, the value returned is considered as the initial value @@ -50,24 +50,24 @@ 1. if a qualified parameter `__linkto` is specified, its value has to be a string (or a list of string) such as: :: - + :: - + where is either `subject` or `object` and each eid could be separated from the others by a `_`. Target specifies if the *edited entity* is subject or object of the relation and each relation specified will be inserted. 2. if a qualified parameter `__clone_eid` is specified for an entity, the - relations of the specified entity passed as value of this parameter are + relations of the specified entity passed as value of this parameter are copied on the edited entity. 3. if a qualified parameter `__delete` is specified, its value must be a string or a list of string such as follows: :: - + :: - where each eid subject or object can be seperated from the other + where each eid subject or object can be seperated from the other by `_`. Each relation specified will be deleted. 4. if a qualified parameter `__insert` is specified, its value should @@ -84,14 +84,14 @@ .. note:: - + * If the parameter `__action_delete` is found, all the entities specified as to be edited will be deleted. - + * If the parameter`__action_cancel` is found, no action is completed. - * If the parameter `__action_apply` is found, the editing is applied - normally but the redirection is done on the form + * If the parameter `__action_apply` is found, the editing is applied + normally but the redirection is done on the form (see :ref:`RedirectionControl`). * The parameter `__method` is also supported as for the main template @@ -120,7 +120,7 @@ * `__redirectparams`: forms parameters to add to the path -* `__redirectrql`: redirection RQL request +* `__redirectrql`: redirection RQL request * `__redirectvid`: redirection view identifier @@ -132,6 +132,6 @@ * `__form_id`: initial view form identifier, used if `__action_apply` is found -In general we use either `__redirectpath` and `__redirectparams` or +In general we use either `__redirectpath` and `__redirectparams` or `__redirectrql` and `__redirectvid`. diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/B1060-templates.en.txt --- a/doc/book/en/B1060-templates.en.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/B1060-templates.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -84,7 +84,7 @@ :: - from ginco.web.views.basetemplates import HTMLPageHeader + from cubicweb.web.views.basetemplates import HTMLPageHeader class MyHTMLPageHeader(HTMLPageHeader): def main_header(self, view): """build the top menu with authentification info and the rql box""" @@ -143,7 +143,7 @@ for HTMLPageFooter and override it in your views file as in : :: - form ginco.web.views.basetemplates import HTMLPageFooter + form cubicweb.web.views.basetemplates import HTMLPageFooter class MyHTMLPageFooter(HTMLPageFooter): def call(self, **kwargs): self.w(u'
') @@ -181,7 +181,7 @@ whatever the number of entities to display * `__method`, if the result set to render contains only one entity and this parameter is set, it refers to a method to call on the entity by passing it - the dictionnary of the forms parameters, before going the classic way (through + the dictionary of the forms parameters, before going the classic way (through step 1 and 2 described juste above) The MainTemplate is a bit complex as it tries to accomodate many @@ -196,11 +196,9 @@ the case we want to create new CSS style, the best is to define it a in a new CSS located under ``myapp/data/``. -If you want to modify an existing CSS styling property, you will have to use -``!important`` declaration to override the existing property. The application -apply a higher priority on the default CSS and you can not change that. -Customized CSS will not be read first. +.. [TRANSLATE ME FROM FRENCH] +.. 03-XX-external_resources.fr.txt [TODO] Add login menu in left column @@ -213,5 +211,5 @@ [TODO] Rajouter une section pour definir la terminologie utilisee. -Dans ginco-doc rajouter une section pour cubciweb-ctl shell ou +Dans cubicweb-doc rajouter une section pour cubciweb-ctl shell ou on liste les commandes dispos. diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/B1090-internationalization.en.txt --- a/doc/book/en/B1090-internationalization.en.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/B1090-internationalization.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -96,5 +96,5 @@ 1. `cubicweb-ctl i18nupdate ` 2. Edit the /xxx.po files and add missing translations (empty `msgstr`) 3. `hg ci -m "updated i18n catalogs"` -4. `cubicweb-ctl i18n compile ` +4. `cubicweb-ctl i18ncompile ` diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/B2052-install.en.txt --- a/doc/book/en/B2052-install.en.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/B2052-install.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -107,10 +107,10 @@ $ python myapp/bin/laxctl i18ncompile Ignore the errors that print "No translation file found for domain -'erudi'". They disappear after the first run of i18ncompile. +'cubicweb'". They disappear after the first run of i18ncompile. .. note:: The command myapp/bin/laxctl i18nupdate needs to be executed - only if your application is using cubes from ginco-apps. + only if your application is using cubes from cubicweb-apps. Otherwise, please skip it. You will never need to add new entries in the translation catalog. Instead we would diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/C000-administration.en.txt --- a/doc/book/en/C000-administration.en.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/C000-administration.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -1,5 +1,6 @@ .. -*- coding: utf-8 -*- +.. _Part3: ========================== Part III - Administration @@ -15,4 +16,4 @@ C020-site-config.en.txt C030-instance-config.en.txt C040-rql.en.txt - C041-rql-tutorial.en.txt + diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/C010-setup.en.txt --- a/doc/book/en/C010-setup.en.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/C010-setup.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -1,6 +1,6 @@ .. -*- coding: utf-8 -*- -.. _MiseEnPlaceEnv: +.. _SetUpEnv: =================================================== Installation and set-up of a `CubicWeb` environment diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/C011-installation.en.txt --- a/doc/book/en/C011-installation.en.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/C011-installation.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -29,19 +29,25 @@ deb http://ftp.logilab.org/dists/ hardy/ -You can now install the required packages with the following command: :: +You can now install the required packages with the following command:: apt-get update apt-get install cubicweb apt-get install cubicweb-dev +`cubicweb` installs the framework itself, allowing you to create +new applications. -This is it! +`cubicweb-dev` installs the development environment allowing you to +develop new cubes. + +There is also a wide variety of cubes listed on http://www.cubicweb.org/Project available as debian packages and tarball. + Install from source ``````````````````` -You can download the archive containing the sources from our `ftp site`_ at: :: +You can download the archive containing the sources from our `ftp site`_ at:: http://ftp.logilab.org/pub/cubicweb/ @@ -67,9 +73,9 @@ Then you can install: -* `pyro` if you wish the repository is accessible through Pyro +* `pyro` if you wish the repository to be accessible through Pyro or if the client and the server are not running on the same machine - (in suche case the packages will have to be isntalled on both + (in which case the packages will have to be installed on both machines) * `python-ldap` if you plan to use a LDAP source on the server @@ -80,8 +86,8 @@ ------------------------- If you installed `CubicWeb` by cloning the Mercurial forest, then you -will need to update the environment variable PYTHONPATH to add to it -the path to the forest ``cubicweb``. +will need to update the environment variable PYTHONPATH by adding +the path to the forest ``cubicweb``: Add the following lines to either `.bashrc` or `.bash_profile` to configure your development environment :: @@ -92,18 +98,35 @@ Your new cubes will be placed in `/usr/share/cubicweb/cubes` and your applications will be placed in `/etc/cubicweb.d`. +To use others directories then you will have to configure the +following environment variables as follows:: + + export CW_CUBES_PATH=~/lib/cubes + export CW_REGISTRY=~/etc/cubicweb.d/ + export CW_INSTANCE_DATA=$CW_REGISTRY + export CW_RUNTIME=/tmp + +.. note:: + The values given above are our suggestions but of course + can be different. + .. _ConfigurationPostgres: Postgres configuration ---------------------- +.. note:: + If you already have an existing cluster and postgres server + running, you do not require to execute the initilization step + of your Postgres database. + * First you have to initialize the database Postgres with the command ``initdb``. :: $ initdb -D /path/to/pgsql Once initialized, you can launch the database server Postgres - with the command: :: + with the command:: $ postgres -D /path/to/psql @@ -113,26 +136,48 @@ $ chown username /path/to/pgsql -* Create a superuser for `CubicWeb` instance (**root**) :: - - createuser -s username - - Initialize the password of the superuser you juste created with - ``su - postgres`` and ``psql``. +* The database authentication can be either set to `ident sameuser` + or `md5`. + If set to `md5`, make sure to use an existing user + of your database. + If set to `ident sameuser`, make sure that your + client's operating system user name has a matching user in + the database. If not, please do as follow to create a user:: + + $ su + $ su - postgres + $ createuser -s username - This password will be asked to you later on where you will create an - instance with `cubicweb-ctl create` + If created with the options -P (for password prompt, + ``createuser -s -P username``), the password will be encrypted with + the method set in the configuration file ``pg_hba.conf``. + If you do not use this option, then the default value will be null + and this require to set the password in the database itself. + To do so: :: + + $ su + $ su - postgres + $ psql -[XXX] -Est-ce que ces etapes sont vraiment necessaires? -sand : lors de l'installation de ma bdd cela n'a pas ete fait -et il semble que tout aille bien. Doit etre verifie avec les experts. + And then execute de following query:: + + ALTER USER username WITH PASSWORD `password` + + This login/password will be requested when you will create an + instance with `cubicweb-ctl create` to initialize the database of + your application. -* installation of plain-text index extension :: +.. note:: + The authentication method can be configured in ``pg_hba.conf``. + + +.. FIXME Are these steps really necessary? It seemed to work without. + +* Installation of plain-text index extension :: cat /usr/share/postgresql/8.3/contrib/tsearch2.sql | psql -U username template1 -* installation of plpythonu language by default :: +* Installation of plpythonu language by default :: createlang -U pgadmin plpythonu template1 @@ -140,7 +185,7 @@ Pyro configuration ------------------ -If you use Pyro, it is required to have a name server Pyro runing on your +If you use Pyro, it is required to have a name server Pyro running on your network (by default it is identified by a broadcast request). To do so, you need to : @@ -151,6 +196,6 @@ `pyro-nsd start` * edit the file ``/etc/default/pyro-nsd`` so that the name server pyro - will be launched automatically when the macine fire up + will be launched automatically when the machine fire up diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/C012-create-instance.en.txt --- a/doc/book/en/C012-create-instance.en.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/C012-create-instance.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -24,11 +24,11 @@ A cube defines entities, their views, their schemas and workflows in an independant directory located in ``/path/to/forest/cubicweb/cubes/`` -for a Mercurila installation or in ``/usr/share/cubicweb/cubes`` for -a debian packages installation. +for a Mercurial installation or in ``/usr/share/cubicweb/cubes`` for +a debian package installation. When an instance is created, you list one or more cubes that your instance -will use. Use a cube means having the entities defined in your cube's schema +will use. Using a cube means having the entities defined in your cube's schema available in your instance as well as their views and workflows. .. note:: @@ -62,6 +62,13 @@ at the time the base is created (import_erschema('MyCube') will not properly work otherwise). +.. note:: + Please note that if you do not wish to use default directory + for your cubes library, then you want to use the option + --directory to specify where you would like to place + the source code of your cube: + ``cubicweb-ctl newcube --directory=/path/to/cubes/library cube_name`` + Instance creation ----------------- @@ -91,7 +98,7 @@ possible, later on, to create others users for your final web application. When this command is completed, the definition of your instance is -located in *~/etc/cubicweb.d/moninstance/*. To launch it, you just type :: +located in *~/etc/cubicweb.d/myinstance/*. To launch it, you just type :: cubicweb-ctl start -D myinstance diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/C040-rql.en.txt --- a/doc/book/en/C040-rql.en.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/C040-rql.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -9,13 +9,13 @@ Introduction ============ -Goals RQL ---------- +Goals of RQL +------------ The goal is to have a language emphasizing the way of browsing relations. As such, attributes will be regarded as cases of -special relations (in terms of implementation, the user -language not to see virtually no difference between an attribute and a +special relations (in terms of implementation, the language +user should see virtually no difference between an attribute and a relation). RQL is inspired by SQL but is the highest level. A knowledge of the @@ -34,7 +34,7 @@ Versa ````` -Should I look in more detail, but here is already some ideas for +We should look in more detail, but here are already some ideas for the moment ... Versa_ is the language most similar to what we wanted to do, but the model underlying data being RDF, there is some number of things such as namespaces or handling of the RDF types which @@ -54,19 +54,18 @@ ------------------------------ Search (`Any`) - This type of query can extract entities and attributes of entities. + Extract entities and attributes of entities. -Inserting entities (`INSERT`) - This type of query is used to insert new entities in the database. It - will also create direct relationships entities newly created. +Insert entities (`INSERT`) + Insert new entities or relations in the database. + It can also directly create relationships for the newly created entities. -Update entities, relations creation (`SET`) - This type of query updates existing entities in the database, +Update entities, create relations (`SET`) + Update existing entities in the database, or create relations between existing entities. -Deletion of entities or relationship (`DELETE`) - This type of query allows for the removal of entities and relations existing - in the database. +Delete entities or relationship (`DELETE`) + Remove entities or relations existing in the database. Search Query ------------ @@ -80,7 +79,7 @@ Type of selected variables. The special type `Any` is equivalent to not specify a type. :restriction: - list of relations to go through whic follow the pattern + list of conditions to test successively `V1 relation V2 | ` :orderterms: Definition of the selection order: variable or column number followed by @@ -92,13 +91,13 @@ - *Search for the object of identifier 53* - :: + :: Any WHERE X X eid 53 - *Search material such as comics, owned by syt and available* - :: + :: WHERE X Document X occurence_of F, F class C, C name 'Comics' @@ -106,57 +105,65 @@ X available true - *Looking for people working for eurocopter interested in training* - :: + :: Any P WHERE - P is Person, P work_for P, S name 'Eurocopter' + P is Person, P work_for S, S name 'Eurocopter' P interested_by T, T name 'training' - *Search note less than 10 days old written by jphc or ocy* - :: + :: Any N WHERE N is Note, N written_on D, D day> (today -10), N written_by P, P name 'jphc' or P name 'ocy' - *Looking for people interested in training or living in Paris* - :: + :: Any P WHERE P is Person, (P interested_by T, T name 'training') OR (P city 'Paris') - *The name and surname of all people* - :: + :: Any N, P WHERE X is Person, X name N, X first_name P - Note that the selection of several entities generally force - the use of "Any" because the type specification applies otherwise - to all the selected variables. We could write here - :: + Note that the selection of several entities generally force + the use of "Any" because the type specification applies otherwise + to all the selected variables. We could write here + :: String N, P WHERE X is Person, X name N, X first_name P + Note: You can not specify several types with * ... where X is FirstType or X is SecondType*. + To specify several types explicitely, you have to do + + :: + + Any X where X is in (FirstType, SecondType) + + Insertion query --------------- `INSERT` V1 (, V2) \ * `:` [ `WHERE` ] -: assignments: +:assignments: list of relations to assign in the form `V1 relationship V2 | ` The restriction can define variables used in assignments. Caution, if a restriction is specified, the insertion is done for -*each line results returned by the restriction*. +*each line result returned by the restriction*. - *Insert a new person named 'foo'* - :: + :: INSERT Person X: X name 'foo' @@ -178,12 +185,12 @@ [ `WHERE` ] Caution, if a restriction is specified, the update is done *for -each line results returned by the restriction*. +each result line returned by the restriction*. - *Renaming of the person named 'foo' to 'bar' with the first name changed* :: - SET X name 'bar', X first_name 'original' where X is Person X name 'foo' + SET X name 'bar', X first_name 'original' WHERE X is Person, X name 'foo' - *Insert a relation of type 'know' between objects linked by the relation of type 'friend'* @@ -198,7 +205,7 @@ [ `WHERE` ] Caution, if a restriction is specified, the deletion is made *for -each line results returned by the restriction*. +each line result returned by the restriction*. - *Deletion of the person named 'foo'* :: @@ -211,8 +218,8 @@ DELETE X friend Y WHERE X is Person, X name 'foo' -Undocumented (yet) type of queries ----------------------------------- +(yet) Undocumented types of queries +----------------------------------- **Limit / offset** :: @@ -302,14 +309,14 @@ `````````````` The base types supported are string (between double or single quotes), -integers or floats (the separator is the'.'), dates and +integers or floats (the separator is '.'), dates and boolean. We expect to receive a schema in which types String, Int, Float, Date and Boolean are defined. * `String` (literal: between double or single quotes). * `Int`, `Float` (separator being'.'). * `Date`, `Datetime`, `Time` (literal: string YYYY/MM/DD [hh:mm] or keywords - `TODAY` and `NOW`). + `TODAY` and `NOW`). * `Boolean` (keywords `TRUE` and `FALSE`). * `Keyword` NULL. @@ -318,10 +325,10 @@ --------- Logical Operators -``````````````````` +````````````````` :: - AND, OR, ',' + AND, OR, NOT, ',' ',' is equivalent to 'AND' but with the smallest among the priority of logical operators (see :ref:`PriorityOperators`). @@ -336,7 +343,7 @@ ```````````````````` :: - =, <, <=, >=, > = ~, IN, LIKE + =, <, <=, >=, >, ~=, IN, LIKE * The operator `=` is the default operator. @@ -345,7 +352,7 @@ must start or finish by a prefix/suffix: :: - Any X WHERE X name =~ 'Th%' + Any X WHERE X name ~= 'Th%' Any X WHERE X name LIKE '%lt' * The operator `IN` provides a list of possible values: @@ -354,30 +361,32 @@ Any X WHERE X name IN ( 'chauvat', 'fayolle', 'di mascio', 'thenault') -XXX nico: A trick <> 'bar' would not it be more convenient than NOT A -trick 'bar'? +XXX nico: "A trick <> 'bar'" wouldn't it be more convenient than +"NOT A trick 'bar'" ? .. _PriorityOperators: -Operators priority -`````````````````` +Operator priority +````````````````` 1. '*', '/' 2. '+', '-' -3. 'and' +3. 'not' + +4 'and' -4. 'or' +5 'or' -5. ',' +6 ',' Advanced Features ----------------- -Functions aggregates -```````````````````` +Aggregate Functions +``````````````````` :: COUNT, MIN, MAX, AVG, SUM @@ -468,11 +477,11 @@ constant ::= KEYWORD | STRING | FLOAT | INT # tokens - LOGIC_OP ::= ',' | 'GOLD' | 'AND' + LOGIC_OP ::= ',' | 'OR' | 'AND' MATH_OP ::= '+' | '-' | '/' | '*' COMP_OP ::= '>' | '>=' | '=' | '<=' | '<' | '~=' | 'LIKE' - FUNCTION ::= 'MIN' | 'MAX' | 'SUM' | 'AVG' | 'COUNT' | 'upper' | 'LOWER' + FUNCTION ::= 'MIN' | 'MAX' | 'SUM' | 'AVG' | 'COUNT' | 'UPPER' | 'LOWER' VARIABLE ::= '[A-Z][A-Z0-9]*' E_TYPE ::= '[A-Z]\w*' @@ -541,13 +550,13 @@ :: - Select ((Relationship | And | Gold)?, Group?, Sort?) - Insert (Relations | And | Gold)? - Delete (Relationship | And | Gold)? - Update (Relations | And | Gold)? + Select ((Relationship | And | Or)?, Group?, Sort?) + Insert (Relations | And | Or)? + Delete (Relationship | And | Or)? + Update (Relations | And | Or)? - And ((Relationship | And | Gold), (Relationship | And | Gold)) - Or ((Relationship | And | Gold), (Relationship | And | Gold)) + And ((Relationship | And | Or), (Relationship | And | Or)) + Or ((Relationship | And | Or), (Relationship | And | Or)) Relationship ((VariableRef, Comparison)) @@ -578,20 +587,20 @@ Point P where P abs X, P ord Y, P value X+Y - is valid, but:: + is valid, but:: Point P where P abs X, P value X+Y, P ord Y - is not. + is not. RQL logs -------- -You can configure the `CubicWeb` application so that you keep a log -of the queries executed against your database. To do so, you want to +You can configure the `CubicWeb` application to keep a log +of the queries executed against your database. To do so, edit the configuration file of your application ``.../etc/cubicweb.d/myapp/all-in-one.conf`` and uncomment the -variable ``query-log-file``: :: +variable ``query-log-file``:: # web application query log file query-log-file=/tmp/rql-myapp.log diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/D000-annex.en.txt --- a/doc/book/en/D000-annex.en.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/D000-annex.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -1,9 +1,10 @@ .. -*- coding: utf-8 -*- +.. _Part4: -================= -Part IV - Annexes -================= +==================== +Part IV - Appendixes +==================== The following chapters are reference material. diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/D010-faq.en.txt --- a/doc/book/en/D010-faq.en.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/D010-faq.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -99,9 +99,9 @@ the application `Error while publishing ...` for Rest text and plain text. The server returns a traceback like as follows :: - 2008-10-06 15:05:08 - (erudi.rest) ERROR: error while publishing ReST text + 2008-10-06 15:05:08 - (cubicweb.rest) ERROR: error while publishing ReST text Traceback (most recent call last): - File "/home/sandrine/src/blogdemo/ginco/common/rest.py", line 217, in rest_publish + File "/home/user/src/blogdemo/cubicweb/common/rest.py", line 217, in rest_publish File "/usr/lib/python2.5/codecs.py", line 817, in open file = __builtin__.open(filename, mode, buffering) TypeError: __init__() takes at most 3 arguments (4 given) @@ -145,9 +145,15 @@ It depends on what has been modified in the schema. - * Update of a non final relation. + * Update of an attribute permissions and properties: + ``synchronize_eschema('MyEntity')``. - * Update of a final relation. + * Update of a relation permissions and properties: + ``synchronize_rschema('MyRelation')``. + + * Add an attribute: ``add_attribute('MyEntityType', 'myattr')``. + + * Add a relation: ``add_relation_definition('SubjRelation', 'MyRelation', 'ObjRelation')``. * How to create an anonymous user? @@ -156,17 +162,24 @@ ``all-in-one.conf`` file of your instance, define the anonymous user as follows :: - # login of the Erudi user account to use for anonymous user (if you want to + # login of the CubicWeb user account to use for anonymous user (if you want to # allow anonymous) anonymous-user=anon - # password of the Erudi user account matching login + # password of the CubicWeb user account matching login anonymous-password=anon You also must ensure that this `anon` user is a registered user of - the DB backend. This could be the admin account (for development + the DB backend. If not, you can create through the administation + interface of your instance by adding a user with the role `guests`. + This could be the admin account (for development purposes, of course). +.. note:: + While creating a new instance, you can decide to allow access + to anonymous user, which will automatically executes what is + decribed above. + * How to change the application logo? @@ -206,7 +219,7 @@ user-login-attr=uid # name of a group in which ldap users will be by default user-default-group=users - # map from ldap user attributes to erudi attributes + # map from ldap user attributes to cubicweb attributes user-attrs-map=gecos:email,uid:login Any change applied to configuration file requires to restart your @@ -225,3 +238,13 @@ This will yield additional WARNINGs, like this: :: 2009-01-09 16:43:52 - (cubicweb.selectors) WARNING: selector one_line_rset returned 0 for + +* How to format an entity date attribute? + + If your schema has an attribute of type Date or Datetime, you might + want to format it. First, you should define your preferred format using + the site configuration panel ``http://appurl/view?vid=systemepropertiesform`` + and then set ``ui.date`` and/or ``ui.datetime``. + Then in the view code, use:: + + self.format_date(entity.date_attribute) diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/D030-architecture.en.txt --- a/doc/book/en/D030-architecture.en.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/D030-architecture.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -1,8 +1,8 @@ .. -*- coding: utf-8 -*- -Architecture du serveur ------------------------ +Server Architecture +------------------- .. image:: images/server-class-diagram.png diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/D070-cookbook.en.txt --- a/doc/book/en/D070-cookbook.en.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/D070-cookbook.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -10,7 +10,7 @@ * How to import LDAP users in `CubicWeb`? Here is a very usefull script which enables you to import LDAP users - into your `CubicWeb` application by runing the following: :: + into your `CubicWeb` application by running the following: :: import os diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/Z010-beginners.en.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/book/en/Z010-beginners.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -0,0 +1,12 @@ +.. -*- coding: utf-8 -*- + +.. _QuickInstall: + +=========================================== +Quick Installation of a `CubicWeb` instance +=========================================== + +.. include:: C011-installation.en.txt +.. include:: Z012-create-instance.en.txt + + diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/Z012-create-instance.en.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/book/en/Z012-create-instance.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -0,0 +1,79 @@ +.. -*- coding: utf-8 -*- + +Creation of your first instance +=============================== + +What is an instance? +-------------------- + +A `CubicWeb` instance is a container that +refers to cubes and configuration parameters for your web application. +Each instance is stored as a directory in ``~/etc/cubicweb.d`` which enables +us to run your application. + +What is a cube? +--------------- + +Cubes represent data and basic building bricks of your web applications : +blogs, person, date, addressbook and a lot more. + +.. XXX They related to each other by a 'Schema' which is also the PostGres representation. + +Each cube defines entities, their views, their schemas and workflows +in an independant directory located in ``/path/to/forest/cubicweb/cubes/`` +for a Mercurial installation or in ``/usr/share/cubicweb/cubes`` for +a debian package installation. For example, the 'blog' cube defines the entities +blogs and blogentries. + +When an `CubicWeb` instance is created, you list the cubes that you want to use. +Using a cube means having the entities defined in your cube's schema +available in your instance as well as their views and workflows. + + +Creating a basic `CubicWeb` Instance +------------------------------------ + +We can create an instance to view our +application in a web browser. :: + + cubicweb-ctl create blog myblog + +.. XXX or :: + +.. XXX cubicweb-ctl create forge myforge + + +.. note:: + The commands used below are more detailled in the section dedicated to + :ref:`cubicweb-ctl`. + +A series of questions will be prompted to you, the default answer is usually +sufficient. You can allways modify the parameters later by editing +configuration files. When a user/psswd is requested to access the database +please use the login you create at the time you configured the database +(:ref:`ConfigurationPostgres`). + +It is important to distinguish here the user used to access the database and +the user used to login to the cubicweb application. When a `CubicWeb` application +starts, it uses the login/psswd for the database to get the schema and handle +low level transaction. But, when ``cubicweb-ctl create`` asks for +a manager login/psswd of `CubicWeb`, it refers to an application user +to administrate your web application. +The configuration files are stored in *~/etc/cubicweb.d/myblog/*. + +To launch the web application, you just type :: + + cubicweb-ctl start myblog + +You can see how it looks by +visiting the URL `http://localhost:8080`. +To login, please use the cubicweb administrator login/psswd you +defined when you created the instance. + +To shutdown the instance :: + + cubicweb-ctl stop myinstance + +.. XXX something like `cubicweb-ctl live-server intra` would be nice + + diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/Z013-blog-less-ten-minutes.en.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/book/en/Z013-blog-less-ten-minutes.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -0,0 +1,86 @@ +.. -*- coding: utf-8 -*- + +.. BlogTenMinutes: + +Have a blog ready in less than ten minutes! +------------------------------------------- + +Installation +~~~~~~~~~~~~ + +You need to install the following packages:: + + cubicweb, cubicweb-blog + +The package `cubicweb` is installing the command `cubicweb-ctl` that +will allow you to create new application. + +The package `cubicweb-blog` is installing the blogging support for the +`CubicWeb` framework. + +Application creation +~~~~~~~~~~~~~~~~~~~~ + +Creation and initialization of your application by running:: + + cubicweb-ctl create blog myblog + +*myblog* is the name of the application you are creating. + +*blog* is the name of the component on which your application +is based. + +Application launch +~~~~~~~~~~~~~~~~~~ + +Your application is now ready to go:: + + cubicweb-ctl start -D myblog + +This is it. Your blog is ready to you. Go to http://localhost:8080 and enjoy!! + + +A little code snapshot from behind the scene +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The component `blog`, referred as a `cube` in the book +(see :ref:`TermsVocabulary` for a complete definition), defines +a data model in ``/usr/share/cubicweb/cubes/blog/schema.py``. +Here is the corresponding Python code:: + + from cubicweb.schema import format_constraint + + class Blog(EntityType): + title = String(maxsize=50, required=True) + description_format = String(meta=True, internationalizable=True, maxsize=50, + default='text/rest', constraints=[format_constraint]) + description = String() + rss_url = String(maxsize=128, description=_('blog\'s rss url (useful for when using external site such as feedburner)')) + + + class BlogEntry(EntityType): + title = String(required=True, fulltextindexed=True, maxsize=256) + content_format = String(meta=True, internationalizable=True, maxsize=50, + default='text/rest', constraints=[format_constraint]) + content = String(required=True, fulltextindexed=True) + entry_of = SubjectRelation('Blog', cardinality='?*') + +Two types of entities are defined here: Blog and BlogEntry. + +A Blog is defined by a title, a description and its format and a +RSS URL to provide RSS feed. + +A BlogEntry is defined by a title, a content and its format and +a relation to a Blog, meaning a BlogEntry belongs to a Blog. + + +Next step +~~~~~~~~~ + +This was a brief demonstration of the re-usability of cubes and a way +to show how you can use `CubicWeb` straigth out of the box. + +As a developper, you'll want to know more about how to develop new +cubes and cutomize the views and this is what we talk about now. + + diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/index.txt --- a/doc/book/en/index.txt Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/index.txt Wed Apr 15 17:36:09 2009 +0200 @@ -29,15 +29,16 @@ The hacker will join development at the forge_. -The impatient will move right away to :ref:`MiseEnPlaceEnv`. +The impatient will go strait away to :ref:`QuickInstall`. + +The impatient developper will move right away to :ref:`SetUpEnv`. .. _Logilab: http://www.logilab.fr/ .. _forge: http://www.cubicweb.org/project/ .. _Python: http://www.python.org/ -Table of contents -================= - +The book +======== .. toctree:: :maxdepth: 2 @@ -45,7 +46,13 @@ A000-introduction.en.txt B000-development.en.txt C000-administration.en.txt - D000-annex.en.txt + D000-annex.en.txt + + +Table of Contents +----------------- + +Complete :ref:`TOC`. Indices and tables ================== diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/makefile --- a/doc/book/en/makefile Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/en/makefile Wed Apr 15 17:36:09 2009 +0200 @@ -43,7 +43,7 @@ #apydoc: # epydoc --html -o epydoc/ -n ../server/*.py ../core/*.py ../common/*.py ../server/*/*.py ../modpython/*/*.py ../common/*/*.py apidoc: - epydoc --html -o apidoc -n "cubicweb" --exclude=setup --exclude=__pkginfo__ ../ + epydoc --html -o apidoc -n "cubicweb" --exclude=setup --exclude=__pkginfo__ ../../../ # run sphinx ### html: diff -r a81d3babb582 -r 9d61b146f505 doc/book/en/toc.en.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/book/en/toc.en.txt Wed Apr 15 17:36:09 2009 +0200 @@ -0,0 +1,15 @@ +.. -*- coding: utf-8 -*- + +.. _TOC: + +Table of contents +================= + + +.. toctree:: + + A000-introduction.en.txt + B000-development.en.txt + C000-administration.en.txt + D000-annex.en.txt + diff -r a81d3babb582 -r 9d61b146f505 doc/book/fr/03-XX-external_resources.fr.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/book/fr/03-XX-external_resources.fr.txt Wed Apr 15 17:36:09 2009 +0200 @@ -0,0 +1,135 @@ +.. -*- coding: utf-8 -*- + + +Les ressources externes +======================= + +Les ressources externes à une application regroupent l'ensemble des fichiers qui seront chargés dans l'entête des pages XHTML générées. +Elles sont donc constituées principalement des feuilles de styles, des scripts javascripts et de certaines ressources graphiques comme l'icône favicon par exemple. + + +Liste des feuilles de styles utilisées par défaut +------------------------------------------------- + +Les fichiers par défaut se trouve dans les sources du framework. En voici le tableau récapitulatif: + ++--------------------------------------+----------------------------------------------------+-----------------------------------+ +| Fichiers | Utilisation | Vues ou widget concernés | ++======================================+====================================================+===================================+ +| web/data/cubicweb.acl.css | formulaires pour le contrôle aux accès | editgroups, security | +| web/data/cubicweb.calendar.css | calendriers | onemonthcal, oneweekcal | +| web/data/cubicweb.calendar_popup.css | popup calendriers | DateWidget | +| web/data/cubicweb.css | gabarit principal de l'application | | +| web/data/cubicweb.facets.css | surcharge du `MIT Simile Exhibit Web Widgets`_ | filter_box | +| web/data/cubicweb.form.css | formulaires | creation, inline-creation, copya, | +| | | inline-edition, edition, muledit | +| web/data/cubicweb.html_tree.css | style pour les widgets d'arborescence | | +| web/data/cubicweb.ie.css | dédié aux comportements de Internet Explorer | | +| web/data/cubicweb.iprogress.css | style pour les widgets d'avancement | | +| web/data/cubicweb.login.css | page et popup d'authentification | logform | +| web/data/cubicweb.mailform.css | style utilisé dans les formulaires d'envoi de mail | | +| web/data/cubicweb.preferences.css | style pour la page des préférences utilisateurs | systemepropertiesform | +| web/data/cubicweb.print.css | style dédié à l'impression | | +| web/data/cubicweb.schema.css | style dédié au schéma de l'application | | +| web/data/cubicweb.suggest.css | surcharge utilisée pour les suggestions | | +| web/data/cubicweb.tablesorter.css | surcharge pour le tri dans les tableau | | +| web/data/cubicweb.tableview.css | surcharge pour le tri sélectif | | +| web/data/cubicweb.timetable.css | style pour le widget Timetable | timetable | +| web/data/jquery.autocomplete.css | surcharge pour le widget `jQuery autocompleter`_ | | +| web/data/jquery.treeview.css | surcharge pour le widget `jQuery treeview`_ | | +| web/data/pygments.css | style pour la coloration des blocs de code | | +| web/data/timeline-bundle.css | surcharge du `MIT Simile Timeline Web Widgets`_ | TimelineWidget | +| web/data/ui.tabs.css | surcharge pour le widget Tabs de `jQuery UI`_ | | ++--------------------------------------+----------------------------------------------------+-----------------------------------+ + +.. _MIT Simile Exhibit Web Widgets: http://code.google.com/p/simile-widgets/wiki/Exhibit +.. _MIT Simile Timeline Web Widgets: http://code.google.com/p/simile-widgets/wiki/Timeline +.. _jQuery autocompleter: http://www.dyve.net/jquery/?autocomplete +.. _jQuery treeview: http://plugins.jquery.com/project/treeview +.. _jQuery UI: http://docs.jquery.com/UI + +D'une manière générale, si vous réutiliser un nom de fichier existant, vous écrasez le contenu du fichier d'origine. + + +Changer les feuilles de styles +------------------------------ + +Configuration statique +~~~~~~~~~~~~~~~~~~~~~~ +Dans les sources de votre nouveau cube, vous devez éditer le fichier *data/external_resources* et définir la variable de configuration: + + # CSS stylesheets to include in HTML headers + # uncomment the line below to use template specific stylesheet + STYLESHEETS = DATADIR/cubicweb.css + +Les styles sont définis dans le fichier external_resources par 3 variables: + +- la variable STYLESHEETS est défine pour tous les types de médias +- la variable STYLESHEETS_PRINT sont les styles applicables pour l'impression +- la variable IE_STYLESHEETS s'appliquent uniquement aux versions d'Internet Explorer + +En copiant le fichier d'origine **cubicweb.css**, il est alors possible de modifier le gabarit de base du framework CubicWeb. +Il est également possible de réutiliser le fichier d'origine. + +En créant un nouveau fichier **cubes.(le_nom_du_cube).css** dans le répertoire **data/** et en ajoutant une directive css @import, il est possible de réutiliser les styles définis par défaut: + + @import url("cubicweb.css"); + + +Chargement dynamique de feuilles de style dans vos vues +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Il est possible de charger des css spécifiques pour une vue par l'utilisation de la méthode add_css(): + + self.req.add_css('mon_cube.css') + + +Les ressources graphiques de base +--------------------------------- + +Vous pouvez changer certaines ressources graphiques comme: + +- le logo du site: + + # path to the logo (relative to the application main script, seen as a + # directory, hence .. when you are not using an absolute path) + LOGO = DATADIR/logo.png + +- la 'favicon' du site: + + FAVICON = DATADIR/favicon.ico + +- le logo des flux RSS: + + RSS_LOGO = DATADIR/rss.png + +- l'icône permettant l'appel au widget 'calendrier': + + CALENDAR_ICON = DATADIR/calendar.png + +- l'icône utilisée pour la validation d'une recherche: + + SEARCH_GO = DATADIR/go.png + +- l'icône d'aide en ligne: + + HELP = DATADIR/help.png + + +Ajouter vos scripts javascripts +------------------------------- + +Configuration statique +~~~~~~~~~~~~~~~~~~~~~~ +Vous devez surcharger la variable JAVASCRIPTS dans le fichier *data/external_resources* de votre cube. + +Chargement dynamique de script javascript dans vos vues +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Il est possible de charger vos scripts par la méthode add_js(): + + self.req.add_js('mon_script.js') + + +Problèmes connus +---------------- + +Il est important de noter que la méthode de chargement dynamique ne marche pas avec les widgets Ajax. Vos fichiers devront déjà être au préalable avoir été chargés. diff -r a81d3babb582 -r 9d61b146f505 doc/book/fr/makefile --- a/doc/book/fr/makefile Thu Jan 15 10:13:25 2009 +0100 +++ b/doc/book/fr/makefile Wed Apr 15 17:36:09 2009 +0200 @@ -43,7 +43,7 @@ #apydoc: # epydoc --html -o epydoc/ -n ../server/*.py ../core/*.py ../common/*.py ../server/*/*.py ../modpython/*/*.py ../common/*/*.py apidoc: - epydoc --html -o apidoc -n "cubicweb" --exclude=setup --exclude=__pkginfo__ ../ + epydoc --html -o apidoc -n "cubicweb" --exclude=setup --exclude=__pkginfo__ ../../../ # run sphinx ### html: diff -r a81d3babb582 -r 9d61b146f505 entities/__init__.py --- a/entities/__init__.py Thu Jan 15 10:13:25 2009 +0100 +++ b/entities/__init__.py Wed Apr 15 17:36:09 2009 +0200 @@ -1,7 +1,7 @@ """base application's entities class implementation: `AnyEntity` :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" diff -r a81d3babb582 -r 9d61b146f505 entities/authobjs.py --- a/entities/authobjs.py Thu Jan 15 10:13:25 2009 +0100 +++ b/entities/authobjs.py Wed Apr 15 17:36:09 2009 +0200 @@ -1,3 +1,10 @@ +"""entity classes user and group entities + +:organization: Logilab +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr +""" +__docformat__ = "restructuredtext en" from logilab.common.decorators import cached from cubicweb import Unauthorized @@ -26,6 +33,7 @@ 'in_group' : 'primary', ('owned_by', '*', 'object') : ('generated', 'link'), ('created_by','*','object') : ('generated', 'link'), + ('bookmarked_by', '*', 'object'): ('generated', 'create'), } # used by repository to check if the user can log in or not @@ -85,6 +93,13 @@ """ return self.matching_groups(group) == 1 + def is_anonymous(self): + """ checks if user is an anonymous user""" + #FIXME on the web-side anonymous user is detected according + # to config['anonymous-user'], we don't have this info on + # the server side. + return self.groups == frozenset(('guests', )) + def owns(self, eid): if hasattr(self.req, 'unsafe_execute'): # use unsafe_execute on the repository side, in case diff -r a81d3babb582 -r 9d61b146f505 entities/lib.py --- a/entities/lib.py Thu Jan 15 10:13:25 2009 +0100 +++ b/entities/lib.py Wed Apr 15 17:36:09 2009 +0200 @@ -1,7 +1,7 @@ """entity classes for optional library entities :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" diff -r a81d3babb582 -r 9d61b146f505 etwist/server.py --- a/etwist/server.py Thu Jan 15 10:13:25 2009 +0100 +++ b/etwist/server.py Wed Apr 15 17:36:09 2009 +0200 @@ -86,7 +86,7 @@ if config.repo_method == 'inmemory': reactor.addSystemEventTrigger('before', 'shutdown', self.shutdown_event) - # monkey path start_looping_task to get proper reactor integration + # monkey patch start_looping_task to get proper reactor integration self.appli.repo.__class__.start_looping_tasks = start_looping_tasks if config.pyro_enabled(): # if pyro is enabled, we have to register to the pyro name @@ -182,7 +182,7 @@ # don't allow anonymous on https connection return self.request_auth(req) if self.url_rewriter is not None: - # XXX should occurs before authentication? + # XXX should occur before authentication? try: path = self.url_rewriter.rewrite(host, origpath) except Redirect, ex: diff -r a81d3babb582 -r 9d61b146f505 goa/__init__.py --- a/goa/__init__.py Thu Jan 15 10:13:25 2009 +0100 +++ b/goa/__init__.py Wed Apr 15 17:36:09 2009 +0200 @@ -28,7 +28,7 @@ regular python datetime object """ if yamstype is None: - yamstype = guess_yamstype_from_date(datetimeobj) + yamstype = guess_yamstype_for_date(datetimeobj) assert yamstype is not None if yamstype == 'Datetime': # don't use date, db model doesn't actually support it, only datetime diff -r a81d3babb582 -r 9d61b146f505 goa/appobjects/components.py --- a/goa/appobjects/components.py Thu Jan 15 10:13:25 2009 +0100 +++ b/goa/appobjects/components.py Wed Apr 15 17:36:09 2009 +0200 @@ -15,7 +15,7 @@ from cubicweb.schema import display_name from cubicweb.common.view import StartupView, EntityView from cubicweb.common.selectors import (one_line_rset, match_search_state, - accept_selector) + accept) from cubicweb.web import Redirect from cubicweb.web.views import vid_from_rset from cubicweb.goa.db import rset_from_objs @@ -31,7 +31,7 @@ """ id = 'search-associate' - __selectors__ = (one_line_rset, match_search_state, accept_selector) + __selectors__ = (one_line_rset, match_search_state, accept) accepts = ('Any',) search_states = ('linksearch',) diff -r a81d3babb582 -r 9d61b146f505 goa/db.py --- a/goa/db.py Thu Jan 15 10:13:25 2009 +0100 +++ b/goa/db.py Wed Apr 15 17:36:09 2009 +0200 @@ -391,7 +391,7 @@ @classmethod def kind(cls): - return self.id + return cls.id @classmethod def properties(cls): diff -r a81d3babb582 -r 9d61b146f505 goa/dbmyams.py --- a/goa/dbmyams.py Thu Jan 15 10:13:25 2009 +0100 +++ b/goa/dbmyams.py Wed Apr 15 17:36:09 2009 +0200 @@ -109,6 +109,7 @@ super(GaeSchemaLoader, self).__init__(*args, **kwargs) self.defined = {} self.created = [] + self.loaded_files = [] self._instantiate_handlers() def finalize(self, register_base_types=False): diff -r a81d3babb582 -r 9d61b146f505 goa/goactl.py --- a/goa/goactl.py Thu Jan 15 10:13:25 2009 +0100 +++ b/goa/goactl.py Wed Apr 15 17:36:09 2009 +0200 @@ -211,12 +211,12 @@ # link every supported components packagesdir = join(appldir, 'cubes') create_init_file(join(appldir, 'cubes'), 'cubes') - cubesdir = CubicWebConfiguration.cubes_dir() - for include in ('addressbook','basket', 'blog','classfolders', - 'classtags', 'comment', 'file', 'link', + for include in ('addressbook','basket', 'blog','folder', + 'tag', 'comment', 'file', 'link', 'mailinglist', 'person', 'task', 'zone', ): - create_symlink(join(cubesdir, include), join(packagesdir, include)) + create_symlink(CubicWebConfiguration.cube_dir(include), + join(packagesdir, include)) # generate sample config from cubicweb.goa.goaconfig import GAEConfiguration from cubicweb.common.migration import MigrationHelper diff -r a81d3babb582 -r 9d61b146f505 goa/overrides/rqlannotation.py --- a/goa/overrides/rqlannotation.py Thu Jan 15 10:13:25 2009 +0100 +++ b/goa/overrides/rqlannotation.py Wed Apr 15 17:36:09 2009 +0200 @@ -1,4 +1,4 @@ -def set_qdata(union, noinvariant): +def set_qdata(getrschema, union, noinvariant): pass class SQLGenAnnotator(object): diff -r a81d3babb582 -r 9d61b146f505 goa/test/data/bootstrap_cubes diff -r a81d3babb582 -r 9d61b146f505 goa/test/data/bootstrap_packages diff -r a81d3babb582 -r 9d61b146f505 goa/test/unittest_editcontroller.py --- a/goa/test/unittest_editcontroller.py Thu Jan 15 10:13:25 2009 +0100 +++ b/goa/test/unittest_editcontroller.py Wed Apr 15 17:36:09 2009 +0200 @@ -17,7 +17,7 @@ config.global_set_option('use-google-auth', False) config.global_set_option('schema-type', 'yams') config.global_set_option('included-cubes', ()) - config.global_set_option('included-yams-cubes', ('eblog',)) + config.global_set_option('included-yams-cubes', ('blog',)) MODEL_CLASSES = () from cubicweb.web.views import editcontroller diff -r a81d3babb582 -r 9d61b146f505 goa/testlib.py --- a/goa/testlib.py Thu Jan 15 10:13:25 2009 +0100 +++ b/goa/testlib.py Wed Apr 15 17:36:09 2009 +0200 @@ -7,7 +7,7 @@ # additional monkey patches necessary in regular cubicweb environment from cubicweb.server import rqlannotation from cubicweb.goa.overrides import rqlannotation as goarqlannotation -rqlannotation.sqlgen_annotate = goarqlannotation.sqlgen_annotate +rqlannotation.SQLGenAnnotator = goarqlannotation.SQLGenAnnotator rqlannotation.set_qdata = goarqlannotation.set_qdata try: @@ -58,7 +58,7 @@ _DS_TEMPL_FILE = 'tmpdb-template' def load_schema_hook(self, loader): - loader.import_yams_template_schema('data') + loader.import_yams_cube_schema('data') @property def DS_FILE(self): diff -r a81d3babb582 -r 9d61b146f505 goa/tools/i18n.py --- a/goa/tools/i18n.py Thu Jan 15 10:13:25 2009 +0100 +++ b/goa/tools/i18n.py Wed Apr 15 17:36:09 2009 +0200 @@ -221,7 +221,7 @@ os.chdir(appdirectory) potfiles = [] if osp.exists(osp.join('i18n', 'entities.pot')): - potfiles = potfiles.append( osp.join('i18n', scfile) ) + potfiles = potfiles.append( osp.join('i18n', 'entities.pot') ) print '******** extract schema messages' schemapot = osp.join(tempdir, 'schema.pot') potfiles.append(schemapot) diff -r a81d3babb582 -r 9d61b146f505 i18n/en.po --- a/i18n/en.po Thu Jan 15 10:13:25 2009 +0100 +++ b/i18n/en.po Wed Apr 15 17:36:09 2009 +0200 @@ -47,10 +47,26 @@ msgstr "" #, python-format +msgid "%d days" +msgstr "" + +#, python-format +msgid "%d hours" +msgstr "" + +#, python-format +msgid "%d minutes" +msgstr "" + +#, python-format msgid "%d months" msgstr "" #, python-format +msgid "%d seconds" +msgstr "" + +#, python-format msgid "%d weeks" msgstr "" @@ -59,7 +75,31 @@ msgstr "" #, python-format -msgid "%s days" +msgid "%d days" +msgstr "" + +#, python-format +msgid "%d hours" +msgstr "" + +#, python-format +msgid "%d minutes" +msgstr "" + +#, python-format +msgid "%d months" +msgstr "" + +#, python-format +msgid "%d seconds" +msgstr "" + +#, python-format +msgid "%d weeks" +msgstr "" + +#, python-format +msgid "%d years" msgstr "" #, python-format @@ -67,14 +107,6 @@ msgstr "" #, python-format -msgid "%s hours" -msgstr "" - -#, python-format -msgid "%s minutes" -msgstr "" - -#, python-format msgid "%s not estimated" msgstr "" @@ -83,10 +115,6 @@ msgstr "" #, python-format -msgid "%s seconds" -msgstr "" - -#, python-format msgid "%s software version of the database" msgstr "" @@ -618,6 +646,12 @@ msgid "actions_delete_description" msgstr "" +msgid "actions_download_as_owl" +msgstr "" + +msgid "actions_download_as_owl_description" +msgstr "" + msgid "actions_edit" msgstr "modify" @@ -717,6 +751,9 @@ msgid "add" msgstr "" +msgid "add Bookmark bookmarked_by EUser object" +msgstr "bookmark" + msgid "add EEType add_permission RQLExpression subject" msgstr "rql expression for the add permission" @@ -1311,6 +1348,9 @@ msgid "created_by_object" msgstr "has created" +msgid "creating Bookmark (Bookmark bookmarked_by EUser %(linkto)s)" +msgstr "creating bookmark for %(linkto)s" + msgid "creating EConstraint (EFRDef %(linkto)s constrained_by EConstraint)" msgstr "creating constraint for attribute %(linkto)s" @@ -1400,6 +1440,10 @@ msgid "csv export" msgstr "" +#, python-format +msgid "currently attached file: %s" +msgstr "" + msgid "data directory url" msgstr "" @@ -1512,7 +1556,8 @@ msgid "destination_state_object" msgstr "destination of" -msgid "detach attached file" +#, python-format +msgid "detach attached file %s" msgstr "" msgid "detailed schema view" @@ -1547,6 +1592,9 @@ msgid "download icon" msgstr "" +msgid "download schema as owl" +msgstr "" + msgid "edit bookmarks" msgstr "" @@ -1668,12 +1716,18 @@ msgid "february" msgstr "" +msgid "file tree view" +msgstr "" + msgid "final" msgstr "" msgid "firstname" msgstr "" +msgid "foaf" +msgstr "" + msgid "follow" msgstr "" @@ -1991,12 +2045,20 @@ msgid "link a transition to one or more entity type" msgstr "" +msgid "" +"link a transition to one or more rql expression allowing to go through this " +"transition" +msgstr "" + msgid "link to each item in" msgstr "" msgid "list" msgstr "" +msgid "loading" +msgstr "" + msgid "log in" msgstr "" @@ -2025,6 +2087,9 @@ msgid "manage bookmarks" msgstr "" +msgid "manage permissions" +msgstr "" + msgid "manage security" msgstr "" @@ -2137,6 +2202,9 @@ msgid "not authorized" msgstr "" +msgid "not selected" +msgstr "" + msgid "not specified" msgstr "" @@ -2173,6 +2241,12 @@ msgid "ordernum" msgstr "order" +msgid "owl" +msgstr "" + +msgid "owlabox" +msgstr "" + msgid "owned_by" msgstr "owned by" @@ -2216,6 +2290,9 @@ msgid "pkey" msgstr "key" +msgid "planned_delivery" +msgstr "planned delivery" + msgid "please correct errors below" msgstr "" @@ -2416,6 +2493,9 @@ msgid "select this entity" msgstr "" +msgid "selected" +msgstr "" + msgid "semantic description of this attribute" msgstr "" @@ -2617,6 +2697,9 @@ msgid "transition_of_object" msgstr "use transitions" +msgid "tree view" +msgstr "" + msgid "tuesday" msgstr "" diff -r a81d3babb582 -r 9d61b146f505 i18n/es.po --- a/i18n/es.po Thu Jan 15 10:13:25 2009 +0100 +++ b/i18n/es.po Wed Apr 15 17:36:09 2009 +0200 @@ -52,10 +52,26 @@ msgstr "%(subject)s %(etype)s #%(eid)s (%(login)s)" #, python-format +msgid "%d days" +msgstr "%d días" + +#, python-format +msgid "%d hours" +msgstr "%d horas" + +#, python-format +msgid "%d minutes" +msgstr "%d minutos" + +#, python-format msgid "%d months" msgstr "%d meses" #, python-format +msgid "%d seconds" +msgstr "%d segundos" + +#, python-format msgid "%d weeks" msgstr "%d semanas" @@ -64,22 +80,38 @@ msgstr "%d años" #, python-format -msgid "%s days" -msgstr "%d días" +msgid "%d days" +msgstr "%d días" + +#, python-format +msgid "%d hours" +msgstr "%d horas" + +#, python-format +msgid "%d minutes" +msgstr "%d minutos" + +#, python-format +msgid "%d months" +msgstr "%d meses" + +#, python-format +msgid "%d seconds" +msgstr "%d segundos" + +#, python-format +msgid "%d weeks" +msgstr "%d semanas" + +#, python-format +msgid "%d years" +msgstr "" #, python-format msgid "%s error report" msgstr "%s reporte de errores" #, python-format -msgid "%s hours" -msgstr "%s horas" - -#, python-format -msgid "%s minutes" -msgstr "%s minutos" - -#, python-format msgid "%s not estimated" msgstr "%s no estimado(s)" @@ -88,10 +120,6 @@ msgstr "%s resultados de la demanda" #, python-format -msgid "%s seconds" -msgstr "%s segundos" - -#, python-format msgid "%s software version of the database" msgstr "version sistema de la base para %s" @@ -639,6 +667,12 @@ msgid "actions_delete_description" msgstr "" +msgid "actions_download_as_owl" +msgstr "" + +msgid "actions_download_as_owl_description" +msgstr "" + msgid "actions_edit" msgstr "modificar" @@ -738,6 +772,9 @@ msgid "add" msgstr "agregar" +msgid "add Bookmark bookmarked_by EUser object" +msgstr "" + msgid "add EEType add_permission RQLExpression subject" msgstr "Definir una expresión RQL de agregación" @@ -1359,6 +1396,9 @@ msgid "created_by_object" msgstr "ha creado" +msgid "creating Bookmark (Bookmark bookmarked_by EUser %(linkto)s)" +msgstr "" + msgid "creating EConstraint (EFRDef %(linkto)s constrained_by EConstraint)" msgstr "creación condicionada por el atributo %(linkto)s" @@ -1457,6 +1497,10 @@ msgid "csv export" msgstr "exportar CSV" +#, python-format +msgid "currently attached file: %s" +msgstr "" + msgid "data directory url" msgstr "url del repertorio de datos" @@ -1582,8 +1626,9 @@ msgid "destination_state_object" msgstr "destino de" -msgid "detach attached file" -msgstr "soltar el archivo existente" +#, python-format +msgid "detach attached file %s" +msgstr "" msgid "detailed schema view" msgstr "vista detallada del esquema" @@ -1619,6 +1664,9 @@ msgid "download icon" msgstr "ícono de descarga" +msgid "download schema as owl" +msgstr "" + msgid "edit bookmarks" msgstr "editar los atajos" @@ -1745,12 +1793,18 @@ msgid "february" msgstr "febrero" +msgid "file tree view" +msgstr "" + msgid "final" msgstr "final" msgid "firstname" msgstr "nombre" +msgid "foaf" +msgstr "" + msgid "follow" msgstr "seguir la liga" @@ -2084,12 +2138,20 @@ msgid "link a transition to one or more entity type" msgstr "lie une transition ‡ un ou plusieurs types d'entitÈs" +msgid "" +"link a transition to one or more rql expression allowing to go through this " +"transition" +msgstr "" + msgid "link to each item in" msgstr "lier vers chaque ÈlÈment dans" msgid "list" msgstr "liste" +msgid "loading" +msgstr "" + msgid "log in" msgstr "s'identifier" @@ -2118,6 +2180,9 @@ msgid "manage bookmarks" msgstr "gÈrer les signets" +msgid "manage permissions" +msgstr "" + msgid "manage security" msgstr "gestion de la sÈcuritÈ" @@ -2232,6 +2297,9 @@ msgid "not authorized" msgstr "non autorisÈ" +msgid "not selected" +msgstr "" + msgid "not specified" msgstr "non spÈcifiÈ" @@ -2268,6 +2336,12 @@ msgid "ordernum" msgstr "ordre" +msgid "owl" +msgstr "" + +msgid "owlabox" +msgstr "" + msgid "owned_by" msgstr "appartient ‡" @@ -2312,6 +2386,9 @@ msgid "pkey" msgstr "clÈ" +msgid "planned_delivery" +msgstr "" + msgid "please correct errors below" msgstr "veuillez corriger les erreurs ci-dessous" @@ -2521,6 +2598,9 @@ msgid "select this entity" msgstr "sÈlectionner cette entitÈ" +msgid "selected" +msgstr "" + msgid "semantic description of this attribute" msgstr "description sÈmantique de cet attribut" @@ -2726,6 +2806,9 @@ msgid "transition_of_object" msgstr "a pour transition" +msgid "tree view" +msgstr "" + msgid "tuesday" msgstr "mardi" @@ -2940,6 +3023,9 @@ #~ "langue par dÈfaut (regarder le rÈpertoire i18n de l'application pour voir " #~ "les langues disponibles)" +#~ msgid "detach attached file" +#~ msgstr "soltar el archivo existente" + #~ msgid "filter" #~ msgstr "filtrer" diff -r a81d3babb582 -r 9d61b146f505 i18n/fr.po --- a/i18n/fr.po Thu Jan 15 10:13:25 2009 +0100 +++ b/i18n/fr.po Wed Apr 15 17:36:09 2009 +0200 @@ -52,10 +52,26 @@ msgstr "%(subject)s %(etype)s #%(eid)s (%(login)s)" #, python-format +msgid "%d days" +msgstr "%d jours" + +#, python-format +msgid "%d hours" +msgstr "%d heures" + +#, python-format +msgid "%d minutes" +msgstr "%d minutes" + +#, python-format msgid "%d months" msgstr "%d mois" #, python-format +msgid "%d seconds" +msgstr "%d secondes" + +#, python-format msgid "%d weeks" msgstr "%d semaines" @@ -64,22 +80,38 @@ msgstr "%d années" #, python-format -msgid "%s days" -msgstr "%d jours" +msgid "%d days" +msgstr "%d jours" + +#, python-format +msgid "%d hours" +msgstr "%d heures" + +#, python-format +msgid "%d minutes" +msgstr "%d minutes" + +#, python-format +msgid "%d months" +msgstr "%d mois" + +#, python-format +msgid "%d seconds" +msgstr "%d secondes" + +#, python-format +msgid "%d weeks" +msgstr "%d semaines" + +#, python-format +msgid "%d years" +msgstr "%d années" #, python-format msgid "%s error report" msgstr "%s rapport d'erreur" #, python-format -msgid "%s hours" -msgstr "%s heures" - -#, python-format -msgid "%s minutes" -msgstr "%s minutes" - -#, python-format msgid "%s not estimated" msgstr "%s non estimé(s)" @@ -88,10 +120,6 @@ msgstr "%s résultats pour la requête" #, python-format -msgid "%s seconds" -msgstr "%s secondes" - -#, python-format msgid "%s software version of the database" msgstr "version logicielle de la base pour %s" @@ -641,6 +669,12 @@ msgid "actions_delete_description" msgstr "" +msgid "actions_download_as_owl" +msgstr "" + +msgid "actions_download_as_owl_description" +msgstr "" + msgid "actions_edit" msgstr "modifier" @@ -740,6 +774,9 @@ msgid "add" msgstr "ajouter" +msgid "add Bookmark bookmarked_by EUser object" +msgstr "signet" + msgid "add EEType add_permission RQLExpression subject" msgstr "définir une expression RQL d'ajout" @@ -887,7 +924,7 @@ "s #%(toeid)s" msgid "address" -msgstr "adresse" +msgstr "adresse électronique" msgid "alias" msgstr "alias" @@ -1197,7 +1234,7 @@ msgstr "la barre de requête rql, dans l'en-tête de page" msgid "components_rss_feed_url" -msgstr "" +msgstr "syndication rss" msgid "components_rss_feed_url_description" msgstr "" @@ -1361,14 +1398,17 @@ msgid "created_by_object" msgstr "a créé" +msgid "creating Bookmark (Bookmark bookmarked_by EUser %(linkto)s)" +msgstr "création d'un signet pour %(linkto)s" + msgid "creating EConstraint (EFRDef %(linkto)s constrained_by EConstraint)" -msgstr "création contrainte pour l'attribut %(linkto)s" +msgstr "création d'une contrainte pour l'attribut %(linkto)s" msgid "creating EConstraint (ENFRDef %(linkto)s constrained_by EConstraint)" -msgstr "création contrainte pour la relation %(linkto)s" +msgstr "création d'une contrainte pour la relation %(linkto)s" msgid "creating EFRDef (EFRDef relation_type ERType %(linkto)s)" -msgstr "création attribut %(linkto)s" +msgstr "création d'un attribut %(linkto)s" msgid "creating ENFRDef (ENFRDef relation_type ERType %(linkto)s)" msgstr "création relation %(linkto)s" @@ -1458,6 +1498,10 @@ msgid "csv export" msgstr "export CSV" +#, python-format +msgid "currently attached file: %s" +msgstr "fichie actuellement attaché %s" + msgid "data directory url" msgstr "url du répertoire de données" @@ -1582,8 +1626,9 @@ msgid "destination_state_object" msgstr "destination de" -msgid "detach attached file" -msgstr "détacher le fichier existant" +#, python-format +msgid "detach attached file %s" +msgstr "détacher le fichier existant %s" msgid "detailed schema view" msgstr "vue détaillée du schéma" @@ -1619,6 +1664,9 @@ msgid "download icon" msgstr "icône de téléchargement" +msgid "download schema as owl" +msgstr "" + msgid "edit bookmarks" msgstr "éditer les signets" @@ -1744,12 +1792,18 @@ msgid "february" msgstr "février" +msgid "file tree view" +msgstr "arborescence (fichiers)" + msgid "final" msgstr "final" msgid "firstname" msgstr "prénom" +msgid "foaf" +msgstr "foaf" + msgid "follow" msgstr "suivre le lien" @@ -2085,12 +2139,20 @@ msgid "link a transition to one or more entity type" msgstr "lie une transition à un ou plusieurs types d'entités" +msgid "" +"link a transition to one or more rql expression allowing to go through this " +"transition" +msgstr "" + msgid "link to each item in" msgstr "lier vers chaque élément dans" msgid "list" msgstr "liste" +msgid "loading" +msgstr "chargement" + msgid "log in" msgstr "s'identifier" @@ -2119,6 +2181,9 @@ msgid "manage bookmarks" msgstr "gérer les signets" +msgid "manage permissions" +msgstr "gestion des permissions" + msgid "manage security" msgstr "gestion de la sécurité" @@ -2233,6 +2298,9 @@ msgid "not authorized" msgstr "non autorisé" +msgid "not selected" +msgstr "non sélectionné" + msgid "not specified" msgstr "non spécifié" @@ -2269,6 +2337,12 @@ msgid "ordernum" msgstr "ordre" +msgid "owl" +msgstr "" + +msgid "owlabox" +msgstr "" + msgid "owned_by" msgstr "appartient à" @@ -2313,6 +2387,9 @@ msgid "pkey" msgstr "clé" +msgid "planned_delivery" +msgstr "livraison prévue" + msgid "please correct errors below" msgstr "veuillez corriger les erreurs ci-dessous" @@ -2522,6 +2599,9 @@ msgid "select this entity" msgstr "sélectionner cette entité" +msgid "selected" +msgstr "sélectionné" + msgid "semantic description of this attribute" msgstr "description sémantique de cet attribut" @@ -2727,6 +2807,9 @@ msgid "transition_of_object" msgstr "a pour transition" +msgid "tree view" +msgstr "arborescence" + msgid "tuesday" msgstr "mardi" @@ -2941,6 +3024,9 @@ #~ "langue par défaut (regarder le répertoire i18n de l'application pour voir " #~ "les langues disponibles)" +#~ msgid "detach attached file" +#~ msgstr "détacher le fichier existant" + #~ msgid "filter" #~ msgstr "filtrer" diff -r a81d3babb582 -r 9d61b146f505 interfaces.py --- a/interfaces.py Thu Jan 15 10:13:25 2009 +0100 +++ b/interfaces.py Wed Apr 15 17:36:09 2009 +0200 @@ -238,3 +238,34 @@ def rss_feed_url(self): """return an url which layout sub-entities item """ +class ISiocItem(Interface): + """interface for entities (which are item + in sioc specification) with sioc views""" + + def isioc_content(self): + """return content entity""" + + def isioc_container(self): + """return container entity""" + + def isioc_type(self): + """return container type (post, BlogPost, MailMessage)""" + + def isioc_replies(self): + """return replies items""" + + def isioc_topics(self): + """return topics items""" + +class ISiocContainer(Interface): + """interface for entities (which are container + in sioc specification) with sioc views""" + + def isioc_type(self): + """return container type (forum, Weblog, MailingList)""" + + def isioc_items(self): + """return contained items""" + + + diff -r a81d3babb582 -r 9d61b146f505 misc/migration/3.1.5_Any.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/misc/migration/3.1.5_Any.py Wed Apr 15 17:36:09 2009 +0200 @@ -0,0 +1,1 @@ +synchronize_permissions('condition') diff -r a81d3babb582 -r 9d61b146f505 rset.py --- a/rset.py Thu Jan 15 10:13:25 2009 +0100 +++ b/rset.py Wed Apr 15 17:36:09 2009 +0200 @@ -1,7 +1,7 @@ """The `ResultSet` class which is returned as result of a rql query :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -60,11 +60,15 @@ def __repr__(self): if not self.rows: return '' % self.rql + rows = self.rows + if len(rows) > 10: + rows = rows[:10] + ['...'] if not self.description: - return '' % (self.rql, '\n'.join(str(r) for r in self.rows)) - return '' % (self.rql, - '\n'.join('%s (%s)' % (r, d) - for r, d in zip(self.rows, self.description))) + return '' % (self.rql, len(self.rows), + '\n'.join(str(r) for r in rows)) + return '' % (self.rql, len(self.rows), + '\n'.join('%s (%s)' % (r, d) + for r, d in zip(rows, self.description))) @cached def possible_actions(self): @@ -464,7 +468,8 @@ rqlst = self.syntax_tree() etype = self.description[row][col] if self.vreg.schema.eschema(etype).is_final(): - # final type, find a better (ambiguous) one + # final type, find a better one to locate the correct subquery + # (ambiguous if possible) for i in xrange(len(rqlst.children[0].selection)): if i == col: continue @@ -476,18 +481,17 @@ locate_query_col = i if len(self.column_types(i)) > 1: break - # UNION query, find the subquery from which this entity has been - # found + # UNION query, find the subquery from which this entity has been found select = rqlst.locate_subquery(locate_query_col, etype, self.args) try: myvar = select.selection[col].variable except AttributeError: - # no .selection attribute is available + # not a variable return None, None rel = myvar.main_relation() if rel is not None: index = rel.children[0].variable.selected_index() - if index is not None: + if index is not None and self.rows[row][index]: return self.get_entity(row, index), rel.r_type return None, None diff -r a81d3babb582 -r 9d61b146f505 schema.py --- a/schema.py Thu Jan 15 10:13:25 2009 +0100 +++ b/schema.py Wed Apr 15 17:36:09 2009 +0200 @@ -1,7 +1,7 @@ """classes to define schemas for CubicWeb :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" diff -r a81d3babb582 -r 9d61b146f505 schemas/base.py --- a/schemas/base.py Thu Jan 15 10:13:25 2009 +0100 +++ b/schemas/base.py Wed Apr 15 17:36:09 2009 +0200 @@ -212,6 +212,10 @@ """link a state to one or more entity type""" class transition_of(MetaRelationType): """link a transition to one or more entity type""" +class condition(MetaRelationType): + """link a transition to one or more rql expression allowing to go through + this transition + """ class initial_state(MetaRelationType): """indicate which state should be used by default when an entity using diff -r a81d3babb582 -r 9d61b146f505 server/__init__.py --- a/server/__init__.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/__init__.py Wed Apr 15 17:36:09 2009 +0200 @@ -113,6 +113,8 @@ for eid, etype in needisfix: handler.session.unsafe_execute('SET X is E WHERE X eid %(x)s, E name %(name)s', {'x': eid, 'name': etype}, 'x') + handler.session.unsafe_execute('SET X is_instance_of E WHERE X eid %(x)s, E name %(name)s', + {'x': eid, 'name': etype}, 'x') # insert versions handler.cmd_add_entity('EProperty', pkey=u'system.version.cubicweb', value=unicode(config.cubicweb_version())) diff -r a81d3babb582 -r 9d61b146f505 server/checkintegrity.py --- a/server/checkintegrity.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/checkintegrity.py Wed Apr 15 17:36:09 2009 +0200 @@ -2,7 +2,7 @@ is checked. :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -12,6 +12,8 @@ from mx.DateTime import now from logilab.common.shellutils import ProgressBar +from cubicweb.server.sqlutils import SQL_PREFIX + def has_eid(sqlcursor, eid, eids): """return true if the eid is a valid eid""" if eids.has_key(eid): @@ -26,7 +28,8 @@ # XXX what to do... eids[eid] = True return True - sqlcursor.execute('SELECT * FROM %s WHERE eid=%s' % (etype, eid)) + sqlcursor.execute('SELECT * FROM %s%s WHERE %seid=%s' % (SQL_PREFIX, etype, + SQL_PREFIX, eid)) result = sqlcursor.fetchall() if len(result) == 0: eids[eid] = False @@ -71,6 +74,7 @@ 'before_update_entity', '') repo.hm.unregister_hook(uniquecstrcheck_before_modification, 'before_update_entity', '') + repo.do_fti = True # ensure full-text indexation is activated etypes = set() for eschema in schema.entities(): if eschema.is_final(): @@ -153,7 +157,9 @@ for eschema in schema.entities(): if eschema.is_final(): continue - cursor = session.system_sql('SELECT eid FROM %s;' % eschema.type) + table = SQL_PREFIX + eschema.type + column = SQL_PREFIX + 'eid' + cursor = session.system_sql('SELECT %s FROM %s;' % (column, table)) for row in cursor.fetchall(): eid = row[0] # eids is full since we have fetched everyting from the entities table, @@ -162,7 +168,7 @@ msg = ' Entity with eid %s exists in the %s table but not in the system table' print >> sys.stderr, msg % (eid, eschema.type), if fix: - session.system_sql('DELETE FROM %s WHERE eid=%s;' % (eschema.type, eid)) + session.system_sql('DELETE FROM %s WHERE %s=%s;' % (table, column, eid)) print >> sys.stderr, ' [FIXED]' else: print >> sys.stderr @@ -183,40 +189,41 @@ for rschema in schema.relations(): if rschema.is_final(): continue - rtype = rschema.type - if rtype == 'identity': + if rschema == 'identity': continue if rschema.inlined: for subjtype in rschema.subjects(): + table = SQL_PREFIX + str(subjtype) + column = SQL_PREFIX + str(rschema) sql = 'SELECT %s FROM %s WHERE %s IS NOT NULL;' % ( - rtype, subjtype, rtype) + column, table, column) cursor = session.system_sql(sql) for row in cursor.fetchall(): eid = row[0] if not has_eid(cursor, eid, eids): - bad_related_msg(rtype, 'object', eid, fix) + bad_related_msg(rschema, 'object', eid, fix) if fix: - sql = 'UPDATE %s SET %s = NULL WHERE eid=%s;' % ( - subjtype, rtype, eid) + sql = 'UPDATE %s SET %s = NULL WHERE %seid=%s;' % ( + table, column, SQL_PREFIX, eid) session.system_sql(sql) continue - cursor = session.system_sql('SELECT eid_from FROM %s_relation;' % rtype) + cursor = session.system_sql('SELECT eid_from FROM %s_relation;' % rschema) for row in cursor.fetchall(): eid = row[0] if not has_eid(cursor, eid, eids): - bad_related_msg(rtype, 'subject', eid, fix) + bad_related_msg(rschema, 'subject', eid, fix) if fix: sql = 'DELETE FROM %s_relation WHERE eid_from=%s;' % ( - rtype, eid) + rschema, eid) session.system_sql(sql) - cursor = session.system_sql('SELECT eid_to FROM %s_relation;' % rtype) + cursor = session.system_sql('SELECT eid_to FROM %s_relation;' % rschema) for row in cursor.fetchall(): eid = row[0] if not has_eid(cursor, eid, eids): - bad_related_msg(rtype, 'object', eid, fix) + bad_related_msg(rschema, 'object', eid, fix) if fix: sql = 'DELETE FROM %s_relation WHERE eid_to=%s;' % ( - rtype, eid) + rschema, eid) session.system_sql(sql) @@ -227,21 +234,26 @@ """ print 'Checking metadata' cursor = session.system_sql("SELECT DISTINCT type FROM entities;") + eidcolumn = SQL_PREFIX + 'eid' for etype, in cursor.fetchall(): + table = SQL_PREFIX + etype for rel, default in ( ('creation_date', now()), ('modification_date', now()), ): - cursor = session.system_sql("SELECT eid FROM %s " - "WHERE %s is NULL" % (etype, rel)) + column = SQL_PREFIX + rel + cursor = session.system_sql("SELECT %s FROM %s WHERE %s is NULL" + % (eidcolumn, table, column)) for eid, in cursor.fetchall(): msg = ' %s with eid %s has no %s' print >> sys.stderr, msg % (etype, eid, rel), if fix: - session.system_sql("UPDATE %s SET %s=%(default)s WHERE eid=%s ;" - % (etype, rel, eid), {'default': default}) + session.system_sql("UPDATE %s SET %s=%%(v)s WHERE %s=%s ;" + % (table, column, eidcolumn, eid), + {'v': default}) print >> sys.stderr, ' [FIXED]' else: print >> sys.stderr - cursor = session.system_sql('SELECT MIN(eid) FROM euser;') + cursor = session.system_sql('SELECT MIN(%s) FROM %sEUser;' % (eidcolumn, + SQL_PREFIX)) default_user_eid = cursor.fetchone()[0] assert default_user_eid is not None, 'no user defined !' for rel, default in ( ('owned_by', default_user_eid), ): diff -r a81d3babb582 -r 9d61b146f505 server/hooks.py --- a/server/hooks.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/hooks.py Wed Apr 15 17:36:09 2009 +0200 @@ -2,7 +2,7 @@ entities... :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -62,6 +62,8 @@ def setis_after_add_entity(session, entity): """create a new entity -> set is relation""" + if hasattr(entity, '_cw_recreating'): + return session.unsafe_execute('SET X is E WHERE X eid %(x)s, E name %(name)s', {'x': entity.eid, 'name': entity.id}, 'x') # XXX < 2.50 bw compat diff -r a81d3babb582 -r 9d61b146f505 server/migractions.py --- a/server/migractions.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/migractions.py Wed Apr 15 17:36:09 2009 +0200 @@ -11,7 +11,7 @@ :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -34,10 +34,46 @@ try: from cubicweb.server import schemaserial as ss from cubicweb.server.utils import manager_userpasswd - from cubicweb.server.sqlutils import sqlexec + from cubicweb.server.sqlutils import sqlexec, SQL_PREFIX except ImportError: # LAX pass +def set_sql_prefix(prefix): + """3.1.5 migration function: allow to unset/reset SQL_PREFIX""" + for module in ('checkintegrity', 'migractions', 'schemahooks', + 'sources.rql2sql', 'sources.native'): + try: + sys.modules['cubicweb.server.%s' % module].SQL_PREFIX = prefix + print 'changed SQL_PREFIX for %s' % module + except KeyError: + pass + +def update_database(repo): + """3.1.3 migration function: update database schema by adding SQL_PREFIX to + entity type tables and columns + """ + pool = repo._get_pool() + source = repo.system_source + sqlcu = pool['system'] + for etype in repo.schema.entities(): + if etype.is_final(): + continue + try: + sqlcu.execute('ALTER TABLE %s RENAME TO cw_%s' % (etype, etype)) + print 'renamed %s table' % etype + except: + pass + for rschema in etype.subject_relations(): + if rschema == 'has_text': + continue + if rschema.is_final() or rschema.inlined: + sqlcu.execute('ALTER TABLE cw_%s RENAME %s TO cw_%s' + % (etype, rschema, rschema)) + print 'renamed %s.%s column' % (etype, rschema) + pool.commit() + repo._free_pool(pool) + + class ServerMigrationHelper(MigrationHelper): """specific migration helper for server side migration scripts, providind actions related to schema/data migration @@ -57,12 +93,22 @@ self.repo_connect() if not schema: schema = config.load_schema(expand_cubes=True) - self.new_schema = schema + self.fs_schema = schema self._synchronized = set() @cached def repo_connect(self): - self.repo = get_repository(method='inmemory', config=self.config) + try: + self.repo = get_repository(method='inmemory', config=self.config) + except: + import traceback + traceback.print_exc() + print '3.1.5 migration' + # XXX 3.1.5 migration + set_sql_prefix('') + self.repo = get_repository(method='inmemory', config=self.config) + update_database(self.repo) + set_sql_prefix('cw_') return self.repo def shutdown(self): @@ -106,7 +152,9 @@ if answer == 1: # 1: continue, 2: retry break else: + from cubicweb.toolsutils import restrict_perms_to_user print 'database backup:', backupfile + restrict_perms_to_user(backupfile, self.info) break def restore_database(self, backupfile, drop=True): @@ -194,7 +242,10 @@ @cached def rqlcursor(self): """lazy rql cursor""" - return self.cnx.cursor(self.session) + # should not give session as cnx.cursor(), else we may try to execute + # some query while no pool is set on the session (eg on entity attribute + # access for instance) + return self.cnx.cursor() def commit(self): if hasattr(self, '_cnx'): @@ -217,7 +268,9 @@ 'rql': self.rqlexec, 'rqliter': self.rqliter, 'schema': self.repo.schema, - 'newschema': self.new_schema, + # XXX deprecate + 'newschema': self.fs_schema, + 'fsschema': self.fs_schema, 'cnx': self.cnx, 'session' : self.session, 'repo' : self.repo, @@ -264,13 +317,15 @@ self.commit() def cmd_add_cube(self, cube, update_database=True): + self.cmd_add_cubes( (cube,), update_database) + + def cmd_add_cubes(self, cubes, update_database=True): """update_database is telling if the database schema should be updated or if only the relevant eproperty should be inserted (for the case where a cube has been extracted from an existing application, so the cube schema is already in there) """ - newcubes = super(ServerMigrationHelper, self).cmd_add_cube( - cube) + newcubes = super(ServerMigrationHelper, self).cmd_add_cubes(cubes) if not newcubes: return for pack in newcubes: @@ -279,22 +334,22 @@ if not update_database: self.commit() return - self.new_schema = self.config.load_schema() + newcubes_schema = self.config.load_schema() new = set() # execute pre-create files for pack in reversed(newcubes): self.exec_event_script('precreate', self.config.cube_dir(pack)) # add new entity and relation types - for rschema in self.new_schema.relations(): + for rschema in newcubes_schema.relations(): if not rschema in self.repo.schema: self.cmd_add_relation_type(rschema.type) new.add(rschema.type) - for eschema in self.new_schema.entities(): + for eschema in newcubes_schema.entities(): if not eschema in self.repo.schema: self.cmd_add_entity_type(eschema.type) new.add(eschema.type) # check if attributes has been added to existing entities - for rschema in self.new_schema.relations(): + for rschema in newcubes_schema.relations(): existingschema = self.repo.schema.rschema(rschema.type) for (fromtype, totype) in rschema.iter_rdefs(): if existingschema.has_rdef(fromtype, totype): @@ -313,25 +368,25 @@ removedcubes = super(ServerMigrationHelper, self).cmd_remove_cube(cube) if not removedcubes: return - oldschema = self.new_schema - self.new_schema = newschema = self.config.load_schema() + fsschema = self.fs_schema + removedcubes_schema = self.config.load_schema() reposchema = self.repo.schema # execute pre-remove files for pack in reversed(removedcubes): self.exec_event_script('preremove', self.config.cube_dir(pack)) # remove cubes'entity and relation types - for rschema in oldschema.relations(): - if not rschema in newschema and rschema in reposchema: + for rschema in fsschema.relations(): + if not rschema in removedcubes_schema and rschema in reposchema: self.cmd_drop_relation_type(rschema.type) - for eschema in oldschema.entities(): - if not eschema in newschema and eschema in reposchema: + for eschema in fsschema.entities(): + if not eschema in removedcubes_schema and eschema in reposchema: self.cmd_drop_entity_type(eschema.type) - for rschema in oldschema.relations(): - if rschema in newschema and rschema in reposchema: + for rschema in fsschema.relations(): + if rschema in removedcubes_schema and rschema in reposchema: # check if attributes/relations has been added to entities from # other cubes for fromtype, totype in rschema.iter_rdefs(): - if not newschema[rschema.type].has_rdef(fromtype, totype) and \ + if not removedcubes_schema[rschema.type].has_rdef(fromtype, totype) and \ reposchema[rschema.type].has_rdef(fromtype, totype): self.cmd_drop_relation_definition( str(fromtype), rschema.type, str(totype)) @@ -347,7 +402,7 @@ def cmd_add_attribute(self, etype, attrname, attrtype=None, commit=True): """add a new attribute on the given entity type""" if attrtype is None: - rschema = self.new_schema.rschema(attrname) + rschema = self.fs_schema.rschema(attrname) attrtype = rschema.objects(etype)[0] self.cmd_add_relation_definition(etype, attrname, attrtype, commit=commit) @@ -366,7 +421,7 @@ `oldname` is a string giving the name of the existing attribute `newname` is a string giving the name of the renamed attribute """ - eschema = self.new_schema.eschema(etype) + eschema = self.fs_schema.eschema(etype) attrtype = eschema.destination(newname) # have to commit this first step anyway to get the definition # actually in the schema @@ -391,7 +446,7 @@ if eschema.is_final(): applschema.del_entity_type(etype) else: - eschema = self.new_schema.eschema(etype) + eschema = self.fs_schema.eschema(etype) confirm = self.verbosity >= 2 # register the entity into EEType self.rqlexecall(ss.eschema2rql(eschema), ask_confirm=confirm) @@ -497,7 +552,7 @@ committing depends on the `commit` argument value). """ - rschema = self.new_schema.rschema(rtype) + rschema = self.fs_schema.rschema(rtype) # register the relation into ERType and insert necessary relation # definitions self.rqlexecall(ss.rschema2rql(rschema, addrdef=False), @@ -535,7 +590,7 @@ """register a new relation definition, from its definition found in the schema definition file """ - rschema = self.new_schema.rschema(rtype) + rschema = self.fs_schema.rschema(rtype) if not rtype in self.repo.schema: self.cmd_add_relation_type(rtype, addrdef=False, commit=True) self.rqlexecall(ss.rdef2rql(rschema, subjtype, objtype), @@ -562,7 +617,7 @@ """permission synchronization for an entity or relation type""" if ertype in ('eid', 'has_text', 'identity'): return - newrschema = self.new_schema[ertype] + newrschema = self.fs_schema[ertype] teid = self.repo.schema[ertype].eid if 'update' in newrschema.ACTIONS or newrschema.is_final(): # entity type @@ -642,7 +697,7 @@ if rtype in self._synchronized: return self._synchronized.add(rtype) - rschema = self.new_schema.rschema(rtype) + rschema = self.fs_schema.rschema(rtype) self.rqlexecall(ss.updaterschema2rql(rschema), ask_confirm=self.verbosity>=2) reporschema = self.repo.schema.rschema(rtype) @@ -672,18 +727,18 @@ self._synchronized.add(etype) repoeschema = self.repo.schema.eschema(etype) try: - eschema = self.new_schema.eschema(etype) + eschema = self.fs_schema.eschema(etype) except KeyError: return repospschema = repoeschema.specializes() espschema = eschema.specializes() if repospschema and not espschema: self.rqlexec('DELETE X specializes Y WHERE X is EEType, X name %(x)s', - {'x': str(repoechema)}) + {'x': str(repoeschema)}) elif not repospschema and espschema: self.rqlexec('SET X specializes Y WHERE X is EEType, X name %(x)s, ' 'Y is EEType, Y name %(y)s', - {'x': str(repoechema), 'y': str(epschema)}) + {'x': str(repoeschema), 'y': str(espschema)}) self.rqlexecall(ss.updateeschema2rql(eschema), ask_confirm=self.verbosity >= 2) for rschema, targettypes, x in eschema.relation_definitions(True): @@ -717,7 +772,7 @@ * constraints """ subjtype, objtype = str(subjtype), str(objtype) - rschema = self.new_schema.rschema(rtype) + rschema = self.fs_schema.rschema(rtype) reporschema = self.repo.schema.rschema(rschema) if (subjtype, rschema, objtype) in self._synchronized: return @@ -901,6 +956,13 @@ if commit: self.commit() + def cmd_set_state(self, eid, statename, commit=False): + self.session.set_pool() # ensure pool is set + entity = self.session.eid_rset(eid).get_entity(0, 0) + entity.change_state(entity.wf_state(statename).eid) + if commit: + self.commit() + # EProperty handling ###################################################### def cmd_property_value(self, pkey): @@ -1018,7 +1080,8 @@ and a sql database """ dbhelper = self.repo.system_source.dbhelper - tablesql = eschema2sql(dbhelper, self.repo.schema.eschema(etype)) + tablesql = eschema2sql(dbhelper, self.repo.schema.eschema(etype), + prefix=SQL_PREFIX) for sql in tablesql.split(';'): if sql.strip(): self.sqlexec(sql) diff -r a81d3babb582 -r 9d61b146f505 server/msplanner.py --- a/server/msplanner.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/msplanner.py Wed Apr 15 17:36:09 2009 +0200 @@ -1,32 +1,54 @@ """plan execution of rql queries on multiple sources -the best way to understand what are we trying to acheive here is to read -the unit-tests in unittest_querier_planner.py +the best way to understand what are we trying to acheive here is to read the +unit-tests in unittest_msplanner.py +What you need to know +~~~~~~~~~~~~~~~~~~~~~ +1. The system source is expected to support every entity and relation types -Split and execution specifications -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +2. Given "X relation Y": + + * if relation, X and Y types are supported by the external source, we suppose + by default that X and Y should both come from the same source as the + relation. You can specify otherwise by adding relation into the + "cross_relations" set in the source's mapping file and it that case, we'll + consider that we can also find in the system source some relation between + X and Y coming from different sources. + + * if "relation" isn't supported by the external source but X or Y + types (or both) are, we suppose by default that can find in the system + source some relation where X and/or Y come from the external source. You + can specify otherwise by adding relation into the "dont_cross_relations" + set in the source's mapping file and it that case, we'll consider that we + can only find in the system source some relation between X and Y coming + the system source. + + +Implementation +~~~~~~~~~~~~~~ +XXX explain algorithm + + +Exemples of multi-sources query execution +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ For a system source and a ldap user source (only EUser and its attributes is supported, no group or such): - :EUser X: 1. fetch EUser X from both sources and return concatenation of results - :EUser X WHERE X in_group G, G name 'users': * catch 1 - 1. fetch EUser X from both sources, store concatenation of results - into a temporary table - 2. return the result of TMP X WHERE X in_group G, G name 'users' from - the system source - + 1. fetch EUser X from both sources, store concatenation of results into a + temporary table + 2. return the result of TMP X WHERE X in_group G, G name 'users' from the + system source * catch 2 - 1. return the result of EUser X WHERE X in_group G, G name 'users' - from system source, that's enough (optimization of the sql querier - will avoid join on EUser, so we will directly get local eids) - + 1. return the result of EUser X WHERE X in_group G, G name 'users' from system + source, that's enough (optimization of the sql querier will avoid join on + EUser, so we will directly get local eids) :EUser X,L WHERE X in_group G, X login L, G name 'users': 1. fetch Any X,L WHERE X is EUser, X login L from both sources, store @@ -37,19 +59,18 @@ :Any X WHERE X owned_by Y: * catch 1 - 1. fetch EUser X from both sources, store concatenation of results - into a temporary table - 2. return the result of Any X WHERE X owned_by Y, Y is TMP from - the system source - + 1. fetch EUser X from both sources, store concatenation of results into a + temporary table + 2. return the result of Any X WHERE X owned_by Y, Y is TMP from the system + source * catch 2 - 1. return the result of Any X WHERE X owned_by Y - from system source, that's enough (optimization of the sql querier - will avoid join on EUser, so we will directly get local eids) + 1. return the result of Any X WHERE X owned_by Y from system source, that's + enough (optimization of the sql querier will avoid join on EUser, so we + will directly get local eids) :organization: Logilab -:copyright: 2003-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2003-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -66,7 +87,8 @@ from cubicweb import server from cubicweb.common.utils import make_uid from cubicweb.server.utils import cleanup_solutions -from cubicweb.server.ssplanner import SSPlanner, OneFetchStep, add_types_restriction +from cubicweb.server.ssplanner import (SSPlanner, OneFetchStep, + add_types_restriction) from cubicweb.server.mssteps import * from cubicweb.server.sources import AbstractSource @@ -77,14 +99,6 @@ AbstractSource.dont_cross_relations = () AbstractSource.cross_relations = () - -def allequals(solutions): - """return true if all solutions are identical""" - sol = solutions.next() - for sol_ in solutions: - if sol_ != sol: - return False - return True def need_aggr_step(select, sources, stepdefs=None): """return True if a temporary table is necessary to store some partial @@ -114,24 +128,6 @@ fstepsolindices.update(stepdef[2]) return False -def copy_node(newroot, node, subparts=()): - newnode = node.__class__(*node.initargs(newroot)) - for part in subparts: - newnode.append(part) - return newnode - -def same_scope(var): - """return true if the variable is always used in the same scope""" - try: - return var.stinfo['samescope'] - except KeyError: - for rel in var.stinfo['relations']: - if not rel.scope is var.scope: - var.stinfo['samescope'] = False - return False - var.stinfo['samescope'] = True - return True - def select_group_sort(select): # XXX something similar done in rql2sql # add variables used in groups and sort terms to the selection # if necessary @@ -149,66 +145,139 @@ select.append_selected(vref.copy(select)) if select.groupby and not vref in select.groupby: select.add_group_var(vref.copy(select)) - + +def allequals(solutions): + """return true if all solutions are identical""" + sol = solutions.next() + noconstsol = None + for sol_ in solutions: + if sol_ != sol: + return False + return True + +# XXX move functions below to rql ############################################## + +def is_ancestor(n1, n2): + p = n1.parent + while p is not None: + if p is n2: + return True + p = p.parent + return False + +def copy_node(newroot, node, subparts=()): + newnode = node.__class__(*node.initargs(newroot)) + for part in subparts: + newnode.append(part) + return newnode + +def same_scope(var): + """return true if the variable is always used in the same scope""" + try: + return var.stinfo['samescope'] + except KeyError: + for rel in var.stinfo['relations']: + if not rel.scope is var.scope: + var.stinfo['samescope'] = False + return False + var.stinfo['samescope'] = True + return True + +################################################################################ class PartPlanInformation(object): """regroups necessary information to execute some part of a "global" rql query ("global" means as received by the querier, which may result in - several internal queries, e.g. parts, due to security insertions) + several internal queries, e.g. parts, due to security insertions). Actually + a PPI is created for each subquery and for each query in a union. - it exposes as well some methods helping in executing this part on a + It exposes as well some methods helping in executing this part on a multi-sources repository, modifying its internal structure during the - process + process. - :attr solutions: a list of mappings (varname -> vartype) - :attr sourcesvars: - a dictionnary telling for each source which variable/solution are - supported, of the form {source : {varname: [solution index, ]}} + :attr plan: + the execution plan + :attr rqlst: + the original rql syntax tree handled by this part + + :attr needsplit: + bool telling if the query has to be split into multiple steps for + execution or if it can be executed at once + + :attr temptable: + a SQL temporary table name or None, if necessary to handle aggregate / + sorting for this part of the query + + :attr finaltable: + a SQL table name or None, if results for this part of the query should be + written into a temporary table (usually shared by multiple PPI) + + :attr sourcesterms: + a dictionary {source : {term: set([solution index, ])}} telling for each + source which terms are supported for which solutions. A "term" may be + either a rql Variable, Constant or Relation node. """ def __init__(self, plan, rqlst, rqlhelper=None): + self.plan = plan + self.rqlst = rqlst self.needsplit = False self.temptable = None self.finaltable = None - self.plan = plan - self.rqlst = rqlst + # shortcuts + self._schema = plan.schema self._session = plan.session + self._repo = self._session.repo self._solutions = rqlst.solutions self._solindices = range(len(self._solutions)) - # source : {var: [solution index, ]} - self.sourcesvars = self._sourcesvars = {} + self.system_source = self._repo.system_source + # source : {term: [solution index, ]} + self.sourcesterms = self._sourcesterms = {} # source : {relation: set(child variable and constant)} self._crossrelations = {} - # dictionnary of variables which are linked to each other using a non - # final relation which is supported by multiple sources - self._linkedvars = {} - self._crosslinkedvars = {} + # dictionary of variables and constants which are linked to each other + # using a non final relation supported by multiple sources (crossed or + # not). + self._linkedterms = {} # processing - self._compute_sourcesvars() - self._remove_invalid_sources() + termssources = self._compute_sourcesterms() + self._remove_invalid_sources(termssources) self._compute_needsplit() - self.sourcesvars = {} - for k, v in self._sourcesvars.iteritems(): - self.sourcesvars[k] = {} + # after initialisation, .sourcesterms contains the same thing as + # ._sourcesterms though during plan construction, ._sourcesterms will + # be modified while .sourcesterms will be kept unmodified + self.sourcesterms = {} + for k, v in self._sourcesterms.iteritems(): + self.sourcesterms[k] = {} for k2, v2 in v.iteritems(): - self.sourcesvars[k][k2] = v2.copy() + self.sourcesterms[k][k2] = v2.copy() + # cleanup linked var + for var, linkedrelsinfo in self._linkedterms.iteritems(): + self._linkedterms[var] = frozenset(x[0] for x in linkedrelsinfo) + # map output of a step to input of a following step self._inputmaps = {} + # record input map conflicts to resolve them on final step generation + self._conflicts = [] if rqlhelper is not None: # else test self._insert_identity_variable = rqlhelper._annotator.rewrite_shared_optional - + if server.DEBUG: + print 'sourcesterms:' + for source, terms in self.sourcesterms.items(): + print source, terms + def copy_solutions(self, solindices): return [self._solutions[solidx].copy() for solidx in solindices] @property @cached def part_sources(self): - if self._sourcesvars: - return tuple(sorted(self._sourcesvars)) - return (self._session.repo.system_source,) + if self._sourcesterms: + return tuple(sorted(self._sourcesterms)) + return (self.system_source,) @property @cached def _sys_source_set(self): - return frozenset((self._session.repo.system_source, solindex) + return frozenset((self.system_source, solindex) for solindex in self._solindices) @cached @@ -216,20 +285,18 @@ """return a set of (source, solindex) where source doesn't support the relation """ - return frozenset((source, solidx) for source in self._session.repo.sources + return frozenset((source, solidx) for source in self._repo.sources for solidx in self._solindices - if not ((source.support_relation(relation.r_type) and - not self.crossed_relation(source, relation)) + if not ((source.support_relation(relation.r_type)) or relation.r_type in source.dont_cross_relations)) - - def _compute_sourcesvars(self): - """compute for each variable/solution in the rqlst which sources support - them + def _compute_sourcesterms(self): + """compute for each term (variable, rewritten constant, relation) and + for each solution in the rqlst which sources support them """ - repo = self._session.repo - eschema = repo.schema.eschema - sourcesvars = self._sourcesvars + repo = self._repo + eschema = self._schema.eschema + sourcesterms = self._sourcesterms # find for each source which variable/solution are supported for varname, varobj in self.rqlst.defined_vars.items(): # if variable has an eid specified, we can get its source directly @@ -237,22 +304,22 @@ if varobj.stinfo['uidrels']: vrels = varobj.stinfo['relations'] - varobj.stinfo['uidrels'] for rel in varobj.stinfo['uidrels']: - if rel.neged(strict=True) or rel.operator() != '=': + if rel.neged(strict=True) or rel.operator() != '=': continue for const in rel.children[1].get_nodes(Constant): eid = const.eval(self.plan.args) source = self._session.source_from_eid(eid) if vrels and not any(source.support_relation(r.r_type) for r in vrels): - self._set_source_for_var(repo.system_source, varobj) + self._set_source_for_term(self.system_source, varobj) else: - self._set_source_for_var(source, varobj) + self._set_source_for_term(source, varobj) continue rels = varobj.stinfo['relations'] if not rels and not varobj.stinfo['typerels']: # (rare) case where the variable has no type specified nor # relation accessed ex. "Any MAX(X)" - self._set_source_for_var(repo.system_source, varobj) + self._set_source_for_term(self.system_source, varobj) continue for i, sol in enumerate(self._solutions): vartype = sol[varname] @@ -268,60 +335,35 @@ if not varobj._q_invariant or \ any(imap(source.support_relation, (r.r_type for r in rels if r.r_type != 'eid'))): - sourcesvars.setdefault(source, {}).setdefault(varobj, set()).add(i) + sourcesterms.setdefault(source, {}).setdefault(varobj, set()).add(i) # if variable is not invariant and is used by a relation # not supported by this source, we'll have to split the # query if not varobj._q_invariant and any(ifilterfalse( source.support_relation, (r.r_type for r in rels))): self.needsplit = True - - def _handle_cross_relation(self, rel, relsources, vsources): - crossvars = None - for source in relsources: - if rel.r_type in source.cross_relations: - crossvars = set(x.variable for x in rel.get_nodes(VariableRef)) - crossvars.update(frozenset(x for x in rel.get_nodes(Constant))) - assert len(crossvars) == 2 - ssource = self._session.repo.system_source - needsplit = True - flag = 0 - for v in crossvars: - if isinstance(v, Constant): - self._sourcesvars[ssource][v] = set(self._solindices) - if len(vsources[v]) == 1: - if iter(vsources[v]).next()[0].uri == 'system': - flag = 1 - for ov in crossvars: - if ov is not v and ov._q_invariant: - ssset = frozenset((ssource,)) - self._remove_sources(ov, vsources[ov] - ssset) - else: - for ov in crossvars: - if ov is not v and ov._q_invariant: - needsplit = False - break - else: - continue - if not rel.neged(strict=True): - break - else: - self._crossrelations.setdefault(source, {})[rel] = crossvars - if not flag: - self._sourcesvars.setdefault(source, {})[rel] = set(self._solindices) - self._sourcesvars.setdefault(ssource, {})[rel] = set(self._solindices) - if needsplit: - self.needsplit = True - return crossvars is None - - def _remove_invalid_sources(self): - """removes invalid sources from `sourcesvars` member according to - traversed relations and their properties (which sources support them, - can they cross sources, etc...) - """ - repo = self._session.repo - rschema = repo.schema.rschema - vsources = {} + # add source for rewritten constants to sourcesterms + for vconsts in self.rqlst.stinfo['rewritten'].itervalues(): + const = vconsts[0] + source = self._session.source_from_eid(const.eval(self.plan.args)) + if source is self.system_source: + for const in vconsts: + self._set_source_for_term(source, const) + elif source in self._sourcesterms: + source_scopes = frozenset(t.scope for t in self._sourcesterms[source]) + for const in vconsts: + if const.scope in source_scopes: + self._set_source_for_term(source, const) + # if system source is used, add every rewritten constant + # to its supported terms even when associated entity + # doesn't actually comes from it so we get a changes + # that allequals will return True as expected when + # computing needsplit + if self.system_source in sourcesterms: + self._set_source_for_term(self.system_source, const) + # add source for relations + rschema = self._schema.rschema + termssources = {} for rel in self.rqlst.iget_nodes(Relation): # process non final relations only # note: don't try to get schema for 'is' relation (not available @@ -334,7 +376,6 @@ # XXX code below don't deal if some source allow relation # crossing but not another one relsources = repo.rel_type_sources(rel.r_type) - crossvars = None if len(relsources) < 2: # filter out sources being there because they have this # relation in their dont_cross_relations attribute @@ -343,25 +384,54 @@ 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 - self._sourcesvars.setdefault(relsources[0], {})[rel] = set(self._solindices) + # case we put the relation in sourcesterms + self._sourcesterms.setdefault(relsources[0], {})[rel] = set(self._solindices) continue lhs, rhs = rel.get_variable_parts() lhsv, rhsv = getattr(lhs, 'variable', lhs), getattr(rhs, 'variable', rhs) - # update dictionnary of sources supporting lhs and rhs vars - if not lhsv in vsources: - vsources[lhsv] = self._term_sources(lhs) - if not rhsv in vsources: - vsources[rhsv] = self._term_sources(rhs) - if self._handle_cross_relation(rel, relsources, vsources): - self._linkedvars.setdefault(lhsv, set()).add((rhsv, rel)) - self._linkedvars.setdefault(rhsv, set()).add((lhsv, rel)) + # update dictionary of sources supporting lhs and rhs vars + if not lhsv in termssources: + termssources[lhsv] = self._term_sources(lhs) + if not rhsv in termssources: + termssources[rhsv] = self._term_sources(rhs) + self._handle_cross_relation(rel, relsources, termssources) + self._linkedterms.setdefault(lhsv, set()).add((rhsv, rel)) + self._linkedterms.setdefault(rhsv, set()).add((lhsv, rel)) + return termssources + + def _handle_cross_relation(self, rel, relsources, termssources): + for source in relsources: + if rel.r_type in source.cross_relations: + ssource = self.system_source + crossvars = set(x.variable for x in rel.get_nodes(VariableRef)) + for const in rel.get_nodes(Constant): + if source.uri != 'system' and not const in self._sourcesterms.get(source, ()): + continue + crossvars.add(const) + self._crossrelations.setdefault(source, {})[rel] = crossvars + if len(crossvars) < 2: + # this means there is a constant in the relation which is + # not supported by the source, so we can stop here + continue + self._sourcesterms.setdefault(ssource, {})[rel] = set(self._solindices) + for term in crossvars: + if len(termssources[term]) == 1 and iter(termssources[term]).next()[0].uri == 'system': + for ov in crossvars: + if ov is not term and (isinstance(ov, Constant) or ov._q_invariant): + ssset = frozenset((ssource,)) + self._remove_sources(ov, termssources[ov] - ssset) + break else: - self._crosslinkedvars.setdefault(lhsv, set()).add((rhsv, rel)) - self._crosslinkedvars.setdefault(rhsv, set()).add((lhsv, rel)) - for term in self._linkedvars: - self._remove_sources_until_stable(term, vsources) - if len(self._sourcesvars) > 1 and hasattr(self.plan.rqlst, 'main_relations'): + self._sourcesterms.setdefault(source, {})[rel] = set(self._solindices) + + def _remove_invalid_sources(self, termssources): + """removes invalid sources from `sourcesterms` member according to + traversed relations and their properties (which sources support them, + can they cross sources, etc...) + """ + for term in self._linkedterms: + self._remove_sources_until_stable(term, termssources) + if len(self._sourcesterms) > 1 and hasattr(self.plan.rqlst, 'main_relations'): # the querier doesn't annotate write queries, need to do it here self.plan.annotate_rqlst() # insert/update/delete queries, we may get extra information from @@ -371,6 +441,8 @@ for etype, vref in self.plan.rqlst.main_variables) else: inserted = {} + repo = self._repo + rschema = self._schema.rschema for rel in self.plan.rqlst.main_relations: if not rschema(rel.r_type).is_final(): # nothing to do if relation is not supported by multiple sources @@ -378,88 +450,88 @@ continue lhs, rhs = rel.get_variable_parts() try: - lhsv = self._extern_term(lhs, vsources, inserted) - rhsv = self._extern_term(rhs, vsources, inserted) + lhsv = self._extern_term(lhs, termssources, inserted) + rhsv = self._extern_term(rhs, termssources, inserted) except KeyError, ex: continue - norelsup = self._norel_support_set(rel) - self._remove_var_sources(lhsv, norelsup, rhsv, vsources) - self._remove_var_sources(rhsv, norelsup, lhsv, vsources) - # cleanup linked var - for var, linkedrelsinfo in self._linkedvars.iteritems(): - self._linkedvars[var] = frozenset(x[0] for x in linkedrelsinfo) - # if there are other sources than the system source, consider simplified - # variables'source - if self._sourcesvars and self._sourcesvars.keys() != [self._session.repo.system_source]: - # add source for rewritten constants to sourcesvars - for vconsts in self.rqlst.stinfo['rewritten'].itervalues(): - const = vconsts[0] - eid = const.eval(self.plan.args) - source = self._session.source_from_eid(eid) - if source is self._session.repo.system_source: - for const in vconsts: - self._set_source_for_var(source, const) - elif source in self._sourcesvars: - source_scopes = frozenset(v.scope for v in self._sourcesvars[source]) - for const in vconsts: - if const.scope in source_scopes: - self._set_source_for_var(source, const) - - def _extern_term(self, term, vsources, inserted): + self._remove_term_sources(lhsv, rel, rhsv, termssources) + self._remove_term_sources(rhsv, rel, lhsv, termssources) + + def _extern_term(self, term, termssources, inserted): var = term.variable if var.stinfo['constnode']: termv = var.stinfo['constnode'] - vsources[termv] = self._term_sources(termv) + termssources[termv] = self._term_sources(termv) elif var in inserted: termv = var - source = self._session.repo.locate_etype_source(inserted[var]) - vsources[termv] = set((source, solindex) for solindex in self._solindices) + source = self._repo.locate_etype_source(inserted[var]) + termssources[termv] = set((source, solindex) + for solindex in self._solindices) else: termv = self.rqlst.defined_vars[var.name] - if not termv in vsources: - vsources[termv] = self._term_sources(termv) + if not termv in termssources: + termssources[termv] = self._term_sources(termv) 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): + def _remove_sources_until_stable(self, term, termssources): + sourcesterms = self._sourcesterms + for oterm, rel in self._linkedterms.get(term, ()): + if not term.scope is oterm.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 + # where terms don't belong to the same scope continue - if not (var.scope is rel.scope and ovar.scope is rel.scope) and rel.ored(): - continue - relsources = self._session.repo.rel_type_sources(rel.r_type) + need_ancestor_scope = False + if not (term.scope is rel.scope and oterm.scope is rel.scope): + if rel.ored(): + continue + if rel.ored(traverse_scope=True): + # if relation has some OR as parent, constraints should only + # propagate from parent scope to child scope, nothing else + need_ancestor_scope = True + relsources = self._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] + or not isinstance(oterm, Variable) + or oterm.valuable_references() != 1 + or any(sourcesterms[source][term] != sourcesterms[source][oterm] 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 + if term in sourcesterms.get(source, ()) + and oterm in sourcesterms.get(source, ()))): + # neged relation doesn't allow to infer term sources unless + # we're on a multisource relation for a term only used by this + # relation (eg "Any X WHERE NOT X multisource_rel Y" and over is + # Y) continue - norelsup = self._norel_support_set(rel) - # compute invalid sources for variables and remove them - self._remove_var_sources(var, norelsup, ovar, vsources) - self._remove_var_sources(ovar, norelsup, var, vsources) + # compute invalid sources for terms and remove them + if not need_ancestor_scope or is_ancestor(term.scope, oterm.scope): + self._remove_term_sources(term, rel, oterm, termssources) + if not need_ancestor_scope or is_ancestor(oterm.scope, term.scope): + self._remove_term_sources(oterm, rel, term, termssources) - def _remove_var_sources(self, var, norelsup, ovar, vsources): - """remove invalid sources for var according to ovar's sources and the - relation between those two variables. + def _remove_term_sources(self, term, rel, oterm, termssources): + """remove invalid sources for term according to oterm's sources and the + relation between those two terms. """ - varsources = vsources[var] - invalid_sources = varsources - (vsources[ovar] | norelsup) + norelsup = self._norel_support_set(rel) + termsources = termssources[term] + invalid_sources = termsources - (termssources[oterm] | norelsup) + if invalid_sources and self._repo.can_cross_relation(rel.r_type): + invalid_sources -= self._sys_source_set + if invalid_sources and isinstance(term, Variable) \ + and self._need_ext_source_access(term, rel): + # if the term is a not invariant variable, we should filter out + # source where the relation is a cross relation from invalid + # sources + invalid_sources = frozenset((s, solidx) for s, solidx in invalid_sources + if not (s in self._crossrelations and + rel in self._crossrelations[s])) if invalid_sources: - self._remove_sources(var, invalid_sources) - varsources -= invalid_sources - self._remove_sources_until_stable(var, vsources) + self._remove_sources(term, invalid_sources) + termsources -= invalid_sources + self._remove_sources_until_stable(term, termssources) def _compute_needsplit(self): - """tell according to sourcesvars if the rqlst has to be splitted for + """tell according to sourcesterms if the rqlst has to be splitted for execution among multiple sources the execution has to be split if @@ -471,20 +543,43 @@ be fetched from some source """ # NOTE: < 2 since may be 0 on queries such as Any X WHERE X eid 2 - if len(self._sourcesvars) < 2: + if len(self._sourcesterms) < 2: self.needsplit = False elif not self.needsplit: - if not allequals(self._sourcesvars.itervalues()): + if not allequals(self._sourcesterms.itervalues()): self.needsplit = True else: - sample = self._sourcesvars.itervalues().next() - if len(sample) > 1 and any(v for v in sample - if not v in self._linkedvars - and not v in self._crosslinkedvars): - self.needsplit = True - - def _set_source_for_var(self, source, var): - self._sourcesvars.setdefault(source, {})[var] = set(self._solindices) + sample = self._sourcesterms.itervalues().next() + if len(sample) > 1: + for term in sample: + # need split if unlinked variable + if isinstance(term, Variable) and not term in self._linkedterms: + self.needsplit = True + break + else: + # need split if there are some cross relation on non + # invariant variable or if the variable is used in + # multi-sources relation + if self._crossrelations: + for reldict in self._crossrelations.itervalues(): + for rel, terms in reldict.iteritems(): + for term in terms: + if isinstance(term, Variable) \ + and self._need_ext_source_access(term, rel): + self.needsplit = True + return + + @cached + def _need_ext_source_access(self, var, rel): + if not var._q_invariant: + return True + if any(r for x, r in self._linkedterms[var] + if not r is rel and self._repo.is_multi_sources_relation(r.r_type)): + return True + return False + + def _set_source_for_term(self, source, term): + self._sourcesterms.setdefault(source, {})[term] = set(self._solindices) def _term_sources(self, term): """returns possible sources for terms `term`""" @@ -493,27 +588,27 @@ return set((source, solindex) for solindex in self._solindices) else: var = getattr(term, 'variable', term) - sources = [source for source, varobjs in self.sourcesvars.iteritems() + sources = [source for source, varobjs in self.sourcesterms.iteritems() if var in varobjs] return set((source, solindex) for source in sources - for solindex in self.sourcesvars[source][var]) + for solindex in self.sourcesterms[source][var]) - def _remove_sources(self, var, sources): - """removes invalid sources (`sources`) from `sourcesvars` + def _remove_sources(self, term, sources): + """removes invalid sources (`sources`) from `sourcesterms` :param sources: the list of sources to remove - :param var: the analyzed variable + :param term: the analyzed term """ - sourcesvars = self._sourcesvars + sourcesterms = self._sourcesterms for source, solindex in sources: try: - sourcesvars[source][var].remove(solindex) + sourcesterms[source][term].remove(solindex) except KeyError: return # may occur with subquery column alias - if not sourcesvars[source][var]: - del sourcesvars[source][var] - if not sourcesvars[source]: - del sourcesvars[source] + if not sourcesterms[source][term]: + del sourcesterms[source][term] + if not sourcesterms[source]: + del sourcesterms[source] def crossed_relation(self, source, relation): return relation in self._crossrelations.get(source, ()) @@ -525,45 +620,97 @@ """ steps = [] select = self.rqlst - rschema = self.plan.schema.rschema + rschema = self._schema.rschema for source in self.part_sources: - sourcevars = self._sourcesvars[source] - while sourcevars: - # take a variable randomly, and all variables supporting the + try: + sourceterms = self._sourcesterms[source] + except KeyError: + continue # already proceed + while sourceterms: + # take a term randomly, and all terms supporting the # same solutions - var, solindices = self._choose_var(sourcevars) + term, solindices = self._choose_term(sourceterms) if source.uri == 'system': # ensure all variables are available for the latest step # (missing one will be available from temporary tables # of previous steps) scope = select - variables = scope.defined_vars.values() + scope.aliases.values() - sourcevars.clear() + terms = scope.defined_vars.values() + scope.aliases.values() + sourceterms.clear() + sources = [source] else: - scope = var.scope - variables = self._expand_vars(var, source, sourcevars, scope, solindices) - if not sourcevars: - del self._sourcesvars[source] - # find which sources support the same variables/solutions - sources = self._expand_sources(source, variables, solindices) - # suppose this is a final step until the contrary is proven - final = scope is select - # set of variables which should be additionaly selected when + scope = term.scope + # find which sources support the same term and solutions + sources = self._expand_sources(source, term, solindices) + # no try to get as much terms as possible + terms = self._expand_terms(term, sources, sourceterms, + scope, solindices) + if len(terms) == 1 and isinstance(terms[0], Constant): + # we can't generate anything interesting with a single + # constant term (will generate an empty "Any" query), + # go to the next iteration directly! + continue + if not sourceterms: + try: + del self._sourcesterms[source] + except KeyError: + # XXX already cleaned + pass + # set of terms which should be additionaly selected when # possible needsel = set() - # add attribute variables and mark variables which should be - # additionaly selected when possible - for var in select.defined_vars.itervalues(): - if not var in variables: - stinfo = var.stinfo - for ovar, rtype in stinfo['attrvars']: - if ovar in variables: + if not self._sourcesterms: + terms += scope.defined_vars.values() + scope.aliases.values() + final = True + else: + # suppose this is a final step until the contrary is proven + final = scope is select + # add attribute variables and mark variables which should be + # additionaly selected when possible + for var in select.defined_vars.itervalues(): + if not var in terms: + stinfo = var.stinfo + for ovar, rtype in stinfo['attrvars']: + if ovar in terms: + needsel.add(var.name) + terms.append(var) + break + else: needsel.add(var.name) - variables.append(var) + final = False + # check where all relations are supported by the sources + for rel in scope.iget_nodes(Relation): + if rel.is_types_restriction(): + continue + # take care not overwriting the existing "source" identifier + for _source in sources: + if not _source.support_relation(rel.r_type) or ( + self.crossed_relation(_source, rel) and not rel in terms): + for vref in rel.iget_nodes(VariableRef): + needsel.add(vref.name) + final = False break else: - needsel.add(var.name) - final = False + if not scope is select: + self._exists_relation(rel, terms, needsel) + # if relation is supported by all sources and some of + # its lhs/rhs variable isn't in "terms", and the + # other end *is* in "terms", mark it have to be + # selected + if source.uri != 'system' and not rschema(rel.r_type).is_final(): + lhs, rhs = rel.get_variable_parts() + try: + lhsvar = lhs.variable + except AttributeError: + lhsvar = lhs + try: + rhsvar = rhs.variable + except AttributeError: + rhsvar = rhs + if lhsvar in terms and not rhsvar in terms: + needsel.add(lhsvar.name) + elif rhsvar in terms and not lhsvar in terms: + needsel.add(rhsvar.name) if final and source.uri != 'system': # check rewritten constants for vconsts in select.stinfo['rewritten'].itervalues(): @@ -571,62 +718,25 @@ eid = const.eval(self.plan.args) _source = self._session.source_from_eid(eid) if len(sources) > 1 or not _source in sources: - # if there is some rewriten constant used by a - # not neged relation while there are some source - # not supporting the associated entity, this step - # can't be final (unless the relation is explicitly - # in `variables`, eg cross relations) + # if there is some rewriten constant used by a not + # neged relation while there are some source not + # supporting the associated entity, this step can't + # be final (unless the relation is explicitly in + # `terms`, eg cross relations) for c in vconsts: rel = c.relation() - if rel is None or not (rel in variables or rel.neged(strict=True)): - #if rel is not None and rel.r_type == 'identity' and not rel.neged(strict=True): + if rel is None or not (rel in terms or rel.neged(strict=True)): final = False break break - # check where all relations are supported by the sources - for rel in scope.iget_nodes(Relation): - if rel.is_types_restriction(): - continue - # take care not overwriting the existing "source" identifier - for _source in sources: - if not _source.support_relation(rel.r_type): - for vref in rel.iget_nodes(VariableRef): - needsel.add(vref.name) - final = False - break - elif self.crossed_relation(_source, rel) and not rel in variables: - final = False - break - else: - if not scope is select: - self._exists_relation(rel, variables, needsel) - # if relation is supported by all sources and some of - # its lhs/rhs variable isn't in "variables", and the - # other end *is* in "variables", mark it have to be - # selected - if source.uri != 'system' and not rschema(rel.r_type).is_final(): - lhs, rhs = rel.get_variable_parts() - try: - lhsvar = lhs.variable - except AttributeError: - lhsvar = lhs - try: - rhsvar = rhs.variable - except AttributeError: - rhsvar = rhs - if lhsvar in variables and not rhsvar in variables: - needsel.add(lhsvar.name) - elif rhsvar in variables and not lhsvar in variables: - needsel.add(rhsvar.name) if final: - self._cleanup_sourcesvars(sources, solindices) - # XXX rename: variables may contain Relation and Constant nodes... - steps.append( (sources, variables, solindices, scope, needsel, - final) ) + self._cleanup_sourcesterms(sources, solindices) + steps.append((sources, terms, solindices, scope, needsel, final) + ) return steps - def _exists_relation(self, rel, variables, needsel): - rschema = self.plan.schema.rschema(rel.r_type) + def _exists_relation(self, rel, terms, needsel): + rschema = self._schema.rschema(rel.r_type) lhs, rhs = rel.get_variable_parts() try: lhsvar, rhsvar = lhs.variable, rhs.variable @@ -638,135 +748,165 @@ # variable is refed by an outer scope and should be substituted # using an 'identity' relation (else we'll get a conflict of # temporary tables) - if rhsvar in variables and not lhsvar in variables: - self._identity_substitute(rel, lhsvar, variables, needsel) - elif lhsvar in variables and not rhsvar in variables: - self._identity_substitute(rel, rhsvar, variables, needsel) + if rhsvar in terms and not lhsvar in terms: + self._identity_substitute(rel, lhsvar, terms, needsel) + elif lhsvar in terms and not rhsvar in terms: + self._identity_substitute(rel, rhsvar, terms, needsel) - def _identity_substitute(self, relation, var, variables, needsel): + def _identity_substitute(self, relation, var, terms, needsel): newvar = self._insert_identity_variable(relation.scope, var) if newvar is not None: # ensure relation is using '=' operator, else we rely on a # sqlgenerator side effect (it won't insert an inequality operator # in this case) relation.children[1].operator = '=' - variables.append(newvar) + terms.append(newvar) needsel.add(newvar.name) - def _choose_var(self, sourcevars): + def _choose_term(self, sourceterms): + """pick one term among terms supported by a source, which will be used + as a base to generate an execution step + """ secondchoice = None - if len(self._sourcesvars) > 1: + if len(self._sourcesterms) > 1: # priority to variable from subscopes - for var in sourcevars: - if not var.scope is self.rqlst: - if isinstance(var, Variable): - return var, sourcevars.pop(var) - secondchoice = var, sourcevars.pop(var) + for term in sourceterms: + if not term.scope is self.rqlst: + if isinstance(term, Variable): + return term, sourceterms.pop(term) + secondchoice = term else: - # priority to variable outer scope - for var in sourcevars: - if var.scope is self.rqlst: - if isinstance(var, Variable): - return var, sourcevars.pop(var) - secondchoice = var + # priority to variable from outer scope + for term in sourceterms: + if term.scope is self.rqlst: + if isinstance(term, Variable): + return term, sourceterms.pop(term) + secondchoice = term if secondchoice is not None: - return secondchoice, sourcevars.pop(secondchoice) - # priority to variable - for var in sourcevars: - if isinstance(var, Variable): - return var, sourcevars.pop(var) - # whatever - var = iter(sourcevars).next() - return var, sourcevars.pop(var) - + return secondchoice, sourceterms.pop(secondchoice) + # priority to variable with the less solutions supported and with the + # most valuable refs. Add variable name for test predictability + variables = sorted([(var, sols) for (var, sols) in sourceterms.items() + if isinstance(var, Variable)], + key=lambda (v, s): (len(s), -v.valuable_references(), v.name)) + if variables: + var = variables[0][0] + return var, sourceterms.pop(var) + # priority to constant + for term in sourceterms: + if isinstance(term, Constant): + return term, sourceterms.pop(term) + # whatever (relation) + term = iter(sourceterms).next() + return term, sourceterms.pop(term) - def _expand_vars(self, var, source, sourcevars, scope, solindices): - variables = [var] + def _expand_sources(self, selected_source, term, solindices): + """return all sources supporting given term / solindices""" + sources = [selected_source] + sourcesterms = self._sourcesterms + for source in sourcesterms.keys(): + if source is selected_source: + continue + if not (term in sourcesterms[source] and + solindices.issubset(sourcesterms[source][term])): + continue + sources.append(source) + if source.uri != 'system' or not (isinstance(term, Variable) and not term in self._linkedterms): + termsolindices = sourcesterms[source][term] + termsolindices -= solindices + if not termsolindices: + del sourcesterms[source][term] + if not sourcesterms[source]: + del sourcesterms[source] + return sources + + def _expand_terms(self, term, sources, sourceterms, scope, solindices): + terms = [term] + sources = sorted(sources) + sourcesterms = self._sourcesterms nbunlinked = 1 - linkedvars = self._linkedvars - # variable has to belong to the same scope if there is more + linkedterms = self._linkedterms + # term has to belong to the same scope if there is more # than the system source remaining - if len(self._sourcesvars) > 1 and not scope is self.rqlst: - candidates = (v for v in sourcevars.keys() if scope is v.scope) + if len(sourcesterms) > 1 and not scope is self.rqlst: + candidates = (t for t in sourceterms.keys() if scope is t.scope) else: - candidates = sourcevars #.iterkeys() - # we only want one unlinked variable in each generated query - candidates = [v for v in candidates - if isinstance(v, Constant) or - (solindices.issubset(sourcevars[v]) and v in linkedvars)] - accept_var = lambda x: (isinstance(x, Constant) or any(v for v in variables if v in linkedvars.get(x, ()))) - source_cross_rels = self._crossrelations.get(source, ()) - if isinstance(var, Relation) and var in source_cross_rels: - cross_vars = source_cross_rels.pop(var) - base_accept_var = accept_var - accept_var = lambda x: (base_accept_var(x) or x in cross_vars) - for refed in cross_vars: + candidates = sourceterms #.iterkeys() + # we only want one unlinked term in each generated query + candidates = [t for t in candidates + if isinstance(t, (Constant, Relation)) or + (solindices.issubset(sourceterms[t]) and t in linkedterms)] + cross_rels = {} + for source in sources: + cross_rels.update(self._crossrelations.get(source, {})) + exclude = {} + for rel, crossvars in cross_rels.iteritems(): + vars = [t for t in crossvars if isinstance(t, Variable)] + try: + exclude[vars[0]] = vars[1] + exclude[vars[1]] = vars[0] + except IndexError: + pass + accept_term = lambda x: (not any(s for s in sources if not x in sourcesterms.get(s, ())) + and any(t for t in terms if t in linkedterms.get(x, ())) + and not exclude.get(x) in terms) + if isinstance(term, Relation) and term in cross_rels: + cross_terms = cross_rels.pop(term) + base_accept_term = accept_term + accept_term = lambda x: (base_accept_term(x) or x in cross_terms) + for refed in cross_terms: if not refed in candidates: - candidates.append(refed) - else: - cross_vars = () - # repeat until no variable can't be added, since addition of a new - # variable may permit to another one to be added + terms.append(refed) + # repeat until no term can't be added, since addition of a new + # term may permit to another one to be added modified = True while modified and candidates: modified = False - for var in candidates[:]: - if accept_var(var): - variables.append(var) - try: - # constant nodes should be systematically deleted - if isinstance(var, Constant): - del sourcevars[var] - else: - # variable nodes should be deleted once all possible - # solutions indices have been consumed - sourcevars[var] -= solindices - if not sourcevars[var]: - del sourcevars[var] - except KeyError: - assert var in cross_vars - candidates.remove(var) + for term in candidates[:]: + if isinstance(term, Constant): + relation = term.relation() + if sorted(set(x[0] for x in self._term_sources(term))) != sources: + continue + terms.append(term) + candidates.remove(term) modified = True - return variables + del sourceterms[term] + elif accept_term(term): + terms.append(term) + candidates.remove(term) + modified = True + self._cleanup_sourcesterms(sources, solindices, term) + return terms - def _expand_sources(self, selected_source, vars, solindices): - sources = [selected_source] - sourcesvars = self._sourcesvars - for source in sourcesvars: - if source is selected_source: - continue - for var in vars: - if not (var in sourcesvars[source] and - solindices.issubset(sourcesvars[source][var])): - break - else: - sources.append(source) - if source.uri != 'system': - for var in vars: - varsolindices = sourcesvars[source][var] - varsolindices -= solindices - if not varsolindices: - del sourcesvars[source][var] - return sources - - def _cleanup_sourcesvars(self, sources, solindices): - """on final parts, remove solutions so we know they are already processed""" + def _cleanup_sourcesterms(self, sources, solindices, term=None): + """remove solutions so we know they are already processed""" for source in sources: try: - sourcevars = self._sourcesvars[source] + sourceterms = self._sourcesterms[source] except KeyError: continue - for var, varsolindices in sourcevars.items(): - if isinstance(var, Relation) and self.crossed_relation(source, var): - continue - varsolindices -= solindices - if not varsolindices: - del sourcevars[var] - + if term is None: + for term, termsolindices in sourceterms.items(): + if isinstance(term, Relation) and self.crossed_relation(source, term): + continue + termsolindices -= solindices + if not termsolindices: + del sourceterms[term] + else: + try: + sourceterms[term] -= solindices + if not sourceterms[term]: + del sourceterms[term] + except KeyError: + pass + #assert term in cross_terms + if not sourceterms: + del self._sourcesterms[source] + def merge_input_maps(self, allsolindices): - """inputmaps is a dictionary with tuple of solution indices as key with an - associateed input map as value. This function compute for each solution - its necessary input map and return them grouped + """inputmaps is a dictionary with tuple of solution indices as key with + an associated input map as value. This function compute for each + solution its necessary input map and return them grouped ex: inputmaps = {(0, 1, 2): {'A': 't1.login1', 'U': 't1.C0', 'U.login': 't1.login1'}, @@ -802,26 +942,38 @@ def build_final_part(self, select, solindices, inputmap, sources, insertedvars): - plan = self.plan - rqlst = plan.finalize(select, [self._solutions[i] for i in solindices], - insertedvars) + solutions = [self._solutions[i] for i in solindices] + if self._conflicts: + for varname, mappedto in self._conflicts: + var = select.defined_vars[varname] + newvar = select.make_variable() + # XXX should use var.scope but scope hasn't been computed yet + select.add_relation(var, 'identity', newvar) + for sol in solutions: + sol[newvar.name] = sol[varname] + inputmap[newvar.name] = mappedto + rqlst = self.plan.finalize(select, solutions, insertedvars) if self.temptable is None and self.finaltable is None: - return OneFetchStep(plan, rqlst, sources, inputmap=inputmap) + return OneFetchStep(self.plan, rqlst, sources, inputmap=inputmap) table = self.temptable or self.finaltable - return FetchStep(plan, rqlst, sources, table, True, inputmap) + return FetchStep(self.plan, rqlst, sources, table, True, inputmap) def build_non_final_part(self, select, solindices, sources, insertedvars, table): """non final step, will have to store results in a temporary table""" - plan = self.plan - rqlst = plan.finalize(select, [self._solutions[i] for i in solindices], - insertedvars) - step = FetchStep(plan, rqlst, sources, table, False) + solutions = [self._solutions[i] for i in solindices] + rqlst = self.plan.finalize(select, solutions, insertedvars) + step = FetchStep(self.plan, rqlst, sources, table, False) # update input map for following steps, according to processed solutions inputmapkey = tuple(sorted(solindices)) inputmap = self._inputmaps.setdefault(inputmapkey, {}) + for varname, mapping in step.outputmap.iteritems(): + if varname in inputmap and \ + not (mapping == inputmap[varname] or + self._schema.eschema(solutions[0][varname]).is_final()): + self._conflicts.append((varname, inputmap[varname])) inputmap.update(step.outputmap) - plan.add_step(step) + self.plan.add_step(step) class MSPlanner(SSPlanner): @@ -895,7 +1047,7 @@ byinputmap = {} for ppi in cppis: select = ppi.rqlst - if sources != (plan.session.repo.system_source,): + if sources != (ppi.system_source,): add_types_restriction(self.schema, select) # part plan info for subqueries inputmap = self._ppi_subqueries(ppi) @@ -952,10 +1104,10 @@ atemptable = None selection = select.selection ppi.temptable = atemptable - vfilter = VariablesFiltererVisitor(self.schema, ppi) + vfilter = TermsFiltererVisitor(self.schema, ppi) steps = [] - for sources, variables, solindices, scope, needsel, final in stepdefs: - # extract an executable query using only the specified variables + for sources, terms, solindices, scope, needsel, final in stepdefs: + # extract an executable query using only the specified terms if sources[0].uri == 'system': # in this case we have to merge input maps before call to # filter so already processed restriction are correctly @@ -963,7 +1115,7 @@ solsinputmaps = ppi.merge_input_maps(solindices) for solindices, inputmap in solsinputmaps: minrqlst, insertedvars = vfilter.filter( - sources, variables, scope, set(solindices), needsel, final) + sources, terms, scope, set(solindices), needsel, final) if inputmap is None: inputmap = subinputmap else: @@ -972,10 +1124,10 @@ sources, insertedvars)) else: # this is a final part (i.e. retreiving results for the - # original query part) if all variable / sources have been + # original query part) if all term / sources have been # treated or if this is the last shot for used solutions minrqlst, insertedvars = vfilter.filter( - sources, variables, scope, solindices, needsel, final) + sources, terms, scope, solindices, needsel, final) if final: solsinputmaps = ppi.merge_input_maps(solindices) for solindices, inputmap in solsinputmaps: @@ -983,10 +1135,17 @@ inputmap = subinputmap else: inputmap.update(subinputmap) - steps.append(ppi.build_final_part(minrqlst, solindices, inputmap, - sources, insertedvars)) + if inputmap and len(sources) > 1: + sources.remove(ppi.system_source) + steps.append(ppi.build_final_part(minrqlst, solindices, None, + sources, insertedvars)) + steps.append(ppi.build_final_part(minrqlst, solindices, inputmap, + [ppi.system_source], insertedvars)) + else: + steps.append(ppi.build_final_part(minrqlst, solindices, inputmap, + sources, insertedvars)) else: - table = '_T%s%s' % (''.join(sorted(v._ms_table_key() for v in variables)), + table = '_T%s%s' % (''.join(sorted(v._ms_table_key() for v in terms)), ''.join(sorted(str(i) for i in solindices))) ppi.build_non_final_part(minrqlst, solindices, sources, insertedvars, table) @@ -995,7 +1154,9 @@ step = AggrStep(plan, selection, select, atemptable, temptable) step.children = steps elif len(steps) > 1: - if select.need_intersect: + if select.need_intersect or any(select.need_intersect + for step in steps + for select in step.union.children): if temptable: step = IntersectFetchStep(plan) else: @@ -1017,7 +1178,7 @@ pass -class VariablesFiltererVisitor(object): +class TermsFiltererVisitor(object): def __init__(self, schema, ppi): self.schema = schema self.ppi = ppi @@ -1026,9 +1187,9 @@ self.extneedsel = frozenset(vref.name for sortterm in ppi.rqlst.orderby for vref in sortterm.iget_nodes(VariableRef)) - def _rqlst_accept(self, rqlst, node, newroot, variables, setfunc=None): + def _rqlst_accept(self, rqlst, node, newroot, terms, setfunc=None): try: - newrestr, node_ = node.accept(self, newroot, variables[:]) + newrestr, node_ = node.accept(self, newroot, terms[:]) except UnsupportedBranch: return rqlst if setfunc is not None and newrestr is not None: @@ -1037,18 +1198,18 @@ rqlst = node.parent return rqlst - def filter(self, sources, variables, rqlst, solindices, needsel, final): + def filter(self, sources, terms, rqlst, solindices, needsel, final): if server.DEBUG: - print 'filter', final and 'final' or '', sources, variables, rqlst, solindices, needsel + print 'filter', final and 'final' or '', sources, terms, rqlst, solindices, needsel newroot = Select() self.sources = sorted(sources) - self.variables = variables + self.terms = terms self.solindices = solindices self.final = final - # variables which appear in unsupported branches + # terms which appear in unsupported branches needsel |= self.extneedsel self.needsel = needsel - # variables which appear in supported branches + # terms which appear in supported branches self.mayneedsel = set() # new inserted variables self.insertedvars = [] @@ -1057,36 +1218,36 @@ self.use_only_defined = False self.scopes = {rqlst: newroot} if rqlst.where: - rqlst = self._rqlst_accept(rqlst, rqlst.where, newroot, variables, + rqlst = self._rqlst_accept(rqlst, rqlst.where, newroot, terms, newroot.set_where) if isinstance(rqlst, Select): self.use_only_defined = True if rqlst.groupby: groupby = [] for node in rqlst.groupby: - rqlst = self._rqlst_accept(rqlst, node, newroot, variables, + rqlst = self._rqlst_accept(rqlst, node, newroot, terms, groupby.append) if groupby: newroot.set_groupby(groupby) if rqlst.having: having = [] for node in rqlst.having: - rqlst = self._rqlst_accept(rqlst, node, newroot, variables, + rqlst = self._rqlst_accept(rqlst, node, newroot, terms, having.append) if having: newroot.set_having(having) if final and rqlst.orderby and not self.hasaggrstep: orderby = [] for node in rqlst.orderby: - rqlst = self._rqlst_accept(rqlst, node, newroot, variables, + rqlst = self._rqlst_accept(rqlst, node, newroot, terms, orderby.append) if orderby: newroot.set_orderby(orderby) - self.process_selection(newroot, variables, rqlst) + self.process_selection(newroot, terms, rqlst) elif not newroot.where: - # no restrictions have been copied, just select variables and add + # no restrictions have been copied, just select terms and add # type restriction (done later by add_types_restriction) - for v in variables: + for v in terms: if not isinstance(v, Variable): continue newroot.append_selected(VariableRef(newroot.get_variable(v.name))) @@ -1134,12 +1295,12 @@ print '--->', newroot return newroot, self.insertedvars - def visit_and(self, node, newroot, variables): + def visit_and(self, node, newroot, terms): subparts = [] for i in xrange(len(node.children)): child = node.children[i] try: - newchild, child_ = child.accept(self, newroot, variables) + newchild, child_ = child.accept(self, newroot, terms) if not child_ is child: node = child_.parent if newchild is None: @@ -1158,10 +1319,10 @@ def _relation_supported(self, relation): rtype = relation.r_type for source in self.sources: - if not source.support_relation(rtype) \ - or (rtype in source.cross_relations and not relation in self.variables):#self.ppi.crossed_relation(source, relation): + if not source.support_relation(rtype) or ( + rtype in source.cross_relations and not relation in self.terms): return False - if not self.final: + if not self.final and not relation in self.terms: rschema = self.schema.rschema(relation.r_type) if not rschema.is_final(): for term in relation.get_nodes((VariableRef, Constant)): @@ -1171,7 +1332,7 @@ return False return True - def visit_relation(self, node, newroot, variables): + def visit_relation(self, node, newroot, terms): if not node.is_types_restriction(): if node in self.skip and self.solindices.issubset(self.skip[node]): if not self.schema.rschema(node.r_type).is_final(): @@ -1192,12 +1353,15 @@ # copy a type restriction while the variable is not actually used) elif not any(self._relation_supported(rel) for rel in node.children[0].variable.stinfo['relations']): - rel, node = self.visit_default(node, newroot, variables) + rel, node = self.visit_default(node, newroot, terms) return rel, node else: raise UnsupportedBranch() rschema = self.schema.rschema(node.r_type) - res = self.visit_default(node, newroot, variables)[0] + try: + res = self.visit_default(node, newroot, terms)[0] + except Exception, ex: + raise ored = node.ored() if rschema.is_final() or rschema.inlined: vrefs = node.children[1].get_nodes(VariableRef) @@ -1211,13 +1375,13 @@ vref = vrefs[0] # XXX check operator ? self.hasvar[(node.children[0].name, rschema)] = vref - if self._may_skip_attr_rel(rschema, node, vref, ored, variables, res): + if self._may_skip_attr_rel(rschema, node, vref, ored, terms, res): self.skip.setdefault(node, set()).update(self.solindices) elif not ored: self.skip.setdefault(node, set()).update(self.solindices) return res, node - def _may_skip_attr_rel(self, rschema, rel, vref, ored, variables, res): + def _may_skip_attr_rel(self, rschema, rel, vref, ored, terms, res): var = vref.variable if ored: return False @@ -1225,35 +1389,35 @@ return False if not same_scope(var): return False - if any(v for v,_ in var.stinfo['attrvars'] if not v.name in variables): + if any(v for v,_ in var.stinfo['attrvars'] if not v.name in terms): return False return True - def visit_exists(self, node, newroot, variables): + def visit_exists(self, node, newroot, terms): newexists = node.__class__() self.scopes = {node: newexists} - subparts, node = self._visit_children(node, newroot, variables) + subparts, node = self._visit_children(node, newroot, terms) if not subparts: return None, node newexists.set_where(subparts[0]) return newexists, node - def visit_not(self, node, newroot, variables): - subparts, node = self._visit_children(node, newroot, variables) + def visit_not(self, node, newroot, terms): + subparts, node = self._visit_children(node, newroot, terms) if not subparts: return None, node return copy_node(newroot, node, subparts), node - def visit_group(self, node, newroot, variables): + def visit_group(self, node, newroot, terms): if not self.final: return None, node - return self.visit_default(node, newroot, variables) + return self.visit_default(node, newroot, terms) - def visit_variableref(self, node, newroot, variables): + def visit_variableref(self, node, newroot, terms): if self.use_only_defined: if not node.variable.name in newroot.defined_vars: raise UnsupportedBranch(node.name) - elif not node.variable in variables: + elif not node.variable in terms: raise UnsupportedBranch(node.name) self.mayneedsel.add(node.name) # set scope so we can insert types restriction properly @@ -1261,28 +1425,28 @@ newvar.stinfo['scope'] = self.scopes.get(node.variable.scope, newroot) return VariableRef(newvar), node - def visit_constant(self, node, newroot, variables): + def visit_constant(self, node, newroot, terms): return copy_node(newroot, node), node - def visit_default(self, node, newroot, variables): - subparts, node = self._visit_children(node, newroot, variables) + def visit_default(self, node, newroot, terms): + subparts, node = self._visit_children(node, newroot, terms) return copy_node(newroot, node, subparts), node visit_comparison = visit_mathexpression = visit_constant = visit_function = visit_default visit_sort = visit_sortterm = visit_default - def _visit_children(self, node, newroot, variables): + def _visit_children(self, node, newroot, terms): subparts = [] for i in xrange(len(node.children)): child = node.children[i] - newchild, child_ = child.accept(self, newroot, variables) + newchild, child_ = child.accept(self, newroot, terms) if not child is child_: node = child_.parent if newchild is not None: subparts.append(newchild) return subparts, node - def process_selection(self, newroot, variables, rqlst): + def process_selection(self, newroot, terms, rqlst): if self.final: for term in rqlst.selection: newroot.append_selected(term.copy(newroot)) @@ -1295,7 +1459,7 @@ supportedvars = [] for vref in vrefs: var = vref.variable - if var in variables: + if var in terms: supportedvars.append(vref) continue else: @@ -1309,9 +1473,9 @@ if not vref in newroot.get_selected_variables(): newroot.append_selected(VariableRef(newroot.get_variable(vref.name))) - def add_necessary_selection(self, newroot, variables): + def add_necessary_selection(self, newroot, terms): selected = tuple(newroot.get_selected_variables()) - for varname in variables: + for varname in terms: var = newroot.defined_vars[varname] for vref in var.references(): rel = vref.relation() diff -r a81d3babb582 -r 9d61b146f505 server/mssteps.py --- a/server/mssteps.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/mssteps.py Wed Apr 15 17:36:09 2009 +0200 @@ -6,7 +6,7 @@ for now) :organization: Logilab -:copyright: 2003-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2003-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -274,9 +274,9 @@ result &= frozenset(step.execute()) result = list(result) if self.offset: - result = result[offset:] + result = result[self.offset:] if self.limit: - result = result[:limit] + result = result[:self.limit] return result diff -r a81d3babb582 -r 9d61b146f505 server/querier.py --- a/server/querier.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/querier.py Wed Apr 15 17:36:09 2009 +0200 @@ -196,7 +196,7 @@ self._insert_security(union, noinvariant) self.rqlhelper.simplify(union) self.sqlannotate(union) - set_qdata(union, noinvariant) + set_qdata(self.schema.rschema, union, noinvariant) if union.has_text_query: self.cache_key = None diff -r a81d3babb582 -r 9d61b146f505 server/repository.py --- a/server/repository.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/repository.py Wed Apr 15 17:36:09 2009 +0200 @@ -11,7 +11,7 @@ :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -144,6 +144,8 @@ self.schema = CubicWebSchema(config.appid) # querier helper, need to be created after sources initialization self.querier = QuerierHelper(self, self.schema) + # should we reindex in changes? + self.do_fti = not config['delay-full-text-indexation'] # sources self.sources = [] self.sources_by_uri = {} @@ -211,7 +213,7 @@ self._get_pool().close(True) for i in xrange(config['connections-pool-size']): self._available_pools.put_nowait(ConnectionsPool(self.sources)) - + # internals ############################################################### def get_source(self, uri, source_config): @@ -490,7 +492,7 @@ session = self.internal_session() try: if session.execute('EUser X WHERE X login %(login)s', {'login': login}): - return + return False # we have to create the user user = self.vreg.etype_class('EUser')(session, None) if isinstance(password, unicode): @@ -505,6 +507,7 @@ session.commit() finally: session.close() + return True def connect(self, login, password, cnxprops=None): """open a connection for a given user @@ -767,7 +770,8 @@ raise UnknownEid(eid) return extid - def extid2eid(self, source, lid, etype, session=None, insert=True): + def extid2eid(self, source, lid, etype, session=None, insert=True, + recreate=False): """get eid from a local id. An eid is attributed if no record is found""" cachekey = (str(lid), source.uri) try: @@ -782,6 +786,15 @@ if eid is not None: self._extid_cache[cachekey] = eid self._type_source_cache[eid] = (etype, source.uri, lid) + if recreate: + entity = source.before_entity_insertion(session, lid, etype, eid) + entity._cw_recreating = True + if source.should_call_hooks: + self.hm.call_hooks('before_add_entity', etype, session, entity) + # XXX add fti op ? + source.after_entity_insertion(session, lid, entity) + if source.should_call_hooks: + self.hm.call_hooks('after_add_entity', etype, session, entity) if reset_pool: session.reset_pool() return eid @@ -791,7 +804,7 @@ # since the current session user may not have required permissions to # do necessary stuff and we don't want to commit user session. # - # More other, even if session is already an internal session but is + # Moreover, even if session is already an internal session but is # processing a commit, we have to use another one if not session.is_internal_session: session = self.internal_session() @@ -803,6 +816,7 @@ entity = source.before_entity_insertion(session, lid, etype, eid) if source.should_call_hooks: self.hm.call_hooks('before_add_entity', etype, session, entity) + # XXX call add_info with complete=False ? self.add_info(session, entity, source, lid) source.after_entity_insertion(session, lid, entity) if source.should_call_hooks: @@ -827,7 +841,8 @@ entity.complete(entity.e_schema.indexable_attributes()) session.add_query_data('neweids', entity.eid) # now we can update the full text index - FTIndexEntityOp(session, entity=entity) + if self.do_fti: + FTIndexEntityOp(session, entity=entity) CleanupEidTypeCacheOp(session) def delete_info(self, session, eid): @@ -896,11 +911,6 @@ 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): @@ -993,7 +1003,7 @@ entity) source.update_entity(session, entity) if not only_inline_rels: - if need_fti_update: + if need_fti_update and self.do_fti: # reindex the entity only if this query is updating at least # one indexable attribute FTIndexEntityOp(session, entity=entity) @@ -1094,6 +1104,26 @@ pass return nameserver + # multi-sources planner helpers ########################################### + + @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] + + @cached + def can_cross_relation(self, rtype): + return [source for source in self.sources + if source.support_relation(rtype) + and rtype in source.cross_relations] + + @cached + def is_multi_sources_relation(self, rtype): + return any(source for source in self.sources + if not source is self.system_source + and source.support_relation(rtype)) + def pyro_unregister(config): """unregister the repository from the pyro name server""" diff -r a81d3babb582 -r 9d61b146f505 server/rqlannotation.py --- a/server/rqlannotation.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/rqlannotation.py Wed Apr 15 17:36:09 2009 +0200 @@ -20,7 +20,7 @@ #if server.DEBUG: # print '-------- sql annotate', repr(rqlst) getrschema = annotator.schema.rschema - has_text_query = need_intersect = False + has_text_query = False need_distinct = rqlst.distinct for rel in rqlst.iget_nodes(Relation): if rel.neged(strict=True): @@ -29,13 +29,6 @@ else: rschema = getrschema(rel.r_type) 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 @@ -147,23 +140,23 @@ except CantSelectPrincipal: stinfo['invariant'] = False rqlst.need_distinct = need_distinct - rqlst.need_intersect = need_intersect return has_text_query class CantSelectPrincipal(Exception): pass -def _select_principal(sqlscope, relations): +def _select_principal(sqlscope, relations, _sort=lambda x:x): """given a list of rqlst relations, select one which will be used to represent an invariant variable (e.g. using on extremity of the relation instead of the variable's type table """ + # _sort argument is there for test diffscope_rels = {} has_same_scope_rel = False ored_rels = set() diffscope_rels = set() - for rel in relations: + for rel in _sort(relations): # note: only eid and has_text among all final relations may be there if rel.r_type in ('eid', 'identity'): has_same_scope_rel = rel.sqlscope is sqlscope @@ -183,18 +176,17 @@ if isinstance(common_parent(rel1, rel2), Or): ored_rels.discard(rel1) ored_rels.discard(rel2) - for rel in ored_rels: + for rel in _sort(ored_rels): if rel.sqlscope is sqlscope: return rel diffscope_rels.add(rel) # if DISTINCT query, can use variable from a different scope as principal # since introduced duplicates will be removed if sqlscope.stmt.distinct and diffscope_rels: - return iter(diffscope_rels).next() + return iter(_sort(diffscope_rels)).next() # XXX could use a relation for a different scope if it can't generate # duplicates, so we would have to check cardinality - raise CantSelectPrincipal() - + raise CantSelectPrincipal() def _select_main_var(relations): """given a list of rqlst relations, select one which will be used as main @@ -207,12 +199,12 @@ return principal -def set_qdata(union, noinvariant): +def set_qdata(getrschema, union, noinvariant): """recursive function to set querier data on variables in the syntax tree """ for select in union.children: for subquery in select.with_: - set_qdata(subquery.query, noinvariant) + set_qdata(getrschema, subquery.query, noinvariant) for var in select.defined_vars.itervalues(): if var.stinfo['invariant']: if var in noinvariant and not var.stinfo['principal'].r_type == 'has_text': @@ -221,6 +213,23 @@ var._q_invariant = True else: var._q_invariant = False + for rel in select.iget_nodes(Relation): + if rel.neged(strict=True) and not rel.is_types_restriction(): + rschema = getrschema(rel.r_type) + if not rschema.is_final(): + # if one of the relation's variable is ambiguous but not + # invariant, an intersection will be necessary + for vref in rel.get_nodes(VariableRef): + var = vref.variable + if (not var._q_invariant and var.valuable_references() == 1 + and len(var.stinfo['possibletypes']) > 1): + select.need_intersect = True + break + else: + continue + break + else: + select.need_intersect = False class SQLGenAnnotator(object): @@ -251,7 +260,6 @@ has_text_query = True return has_text_query - def is_ambiguous(self, var): # ignore has_text relation if len([rel for rel in var.stinfo['relations'] @@ -328,7 +336,7 @@ except KeyError: # no relation to deambiguify continue - + def _debug_print(self): print 'varsols', dict((x, sorted(str(v) for v in values)) for x, values in self.varsols.iteritems()) @@ -366,8 +374,9 @@ otheretypes = (other.uidtype,) deambiguifier = None if otheretypes is not None: - # unless types for variable are already non-ambigous, check - # if this relation has some type ambiguity + # to restrict, we must check that for all type in othertypes, + # possible types on the other end of the relation are matching + # variable's possible types rschema = self.rschema(rel.r_type) if onlhs: rtypefunc = rschema.subjects @@ -377,7 +386,8 @@ reltypes = frozenset(rtypefunc(otheretype)) if var.stinfo['possibletypes'] != reltypes: break - self.restrict(var, reltypes) + else: + self.restrict(var, var.stinfo['possibletypes']) self.deambification_map[var] = deambiguifier return True return False diff -r a81d3babb582 -r 9d61b146f505 server/schemahooks.py --- a/server/schemahooks.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/schemahooks.py Wed Apr 15 17:36:09 2009 +0200 @@ -6,7 +6,7 @@ checking for schema consistency is done in hooks.py :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -17,6 +17,7 @@ from cubicweb import ValidationError, RepositoryError from cubicweb.server import schemaserial as ss +from cubicweb.server.sqlutils import SQL_PREFIX from cubicweb.server.pool import Operation, SingleLastOperation, PreCommitOperation from cubicweb.server.hookhelper import (entity_attr, entity_name, check_internal_entity) @@ -44,19 +45,22 @@ def add_inline_relation_column(session, etype, rtype): """add necessary column and index for an inlined relation""" + table = SQL_PREFIX + etype + column = SQL_PREFIX + rtype try: session.system_sql(str('ALTER TABLE %s ADD COLUMN %s integer' - % (etype, rtype))) - session.info('added column %s to table %s', rtype, etype) + % (table, column))) + session.info('added column %s to table %s', column, table) except: # silent exception here, if this error has not been raised because the # column already exists, index creation will fail anyway - session.exception('error while adding column %s to table %s', etype, rtype) + session.exception('error while adding column %s to table %s', + table, column) # create index before alter table which may expectingly fail during test # (sqlite) while index creation should never fail (test for index existence # is done by the dbhelper) - session.pool.source('system').create_index(session, etype, rtype) - session.info('added index on %s(%s)', etype, rtype) + session.pool.source('system').create_index(session, table, column) + session.info('added index on %s(%s)', table, column) session.add_query_data('createdattrs', '%s.%s' % (etype, rtype)) @@ -148,7 +152,7 @@ name = check_internal_entity(session, eid, CORE_ETYPES) # delete every entities of this type session.unsafe_execute('DELETE %s X' % name) - DropTableOp(session, table=name) + DropTableOp(session, table=SQL_PREFIX + name) DeleteEETypeOp(session, name) def after_del_eetype(session, eid): @@ -223,7 +227,8 @@ 'R eid %%(x)s, X from_entity E, E name %%(name)s' % rdeftype, {'x': rteid, 'name': str(subjschema)}) if rset[0][0] == 0 and not subjschema.eid in pendings: - DropColumnOp(session, table=subjschema.type, column=rschema.type) + DropColumnOp(session, table=SQL_PREFIX + subjschema.type, + column=SQL_PREFIX + rschema.type) elif lastrel: DropTableOp(session, table='%s_relation' % rschema.type) # if this is the last instance, drop associated relation type @@ -270,7 +275,8 @@ eschema = schema.add_entity_type(etype) eschema.set_default_groups() # generate table sql and rql to add metadata - tablesql = eschema2sql(session.pool.source('system').dbhelper, eschema) + tablesql = eschema2sql(session.pool.source('system').dbhelper, eschema, + prefix=SQL_PREFIX) relrqls = [] for rtype in ('is', 'is_instance_of', 'creation_date', 'modification_date', 'created_by', 'owned_by'): @@ -393,22 +399,24 @@ extra_unique_index = False # added some str() wrapping query since some backend (eg psycopg) don't # allow unicode queries + table = SQL_PREFIX + subj + column = SQL_PREFIX + rtype try: session.system_sql(str('ALTER TABLE %s ADD COLUMN %s %s' - % (subj, rtype, attrtype))) - self.info('added column %s to table %s', rtype, subj) + % (table, column, attrtype))) + self.info('added column %s to table %s', table, column) except Exception, ex: # the column probably already exists. this occurs when # the entity's type has just been added or if the column # has not been previously dropped - self.error('error while altering table %s: %s', subj, ex) + self.error('error while altering table %s: %s', table, ex) if extra_unique_index or entity.indexed: try: - sysource.create_index(session, subj, rtype, + sysource.create_index(session, table, column, unique=extra_unique_index) except Exception, ex: self.error('error while creating index for %s.%s: %s', - subj, rtype, ex) + table, column, ex) # postgres doesn't implement, so do it in two times # ALTER TABLE %s ADD COLUMN %s %s SET DEFAULT %s if default is not None: @@ -416,12 +424,12 @@ default = default.encode(sysource.encoding) try: session.system_sql('ALTER TABLE %s ALTER COLUMN %s SET DEFAULT ' - '%%(default)s' % (subj, rtype), + '%%(default)s' % (table, column), {'default': default}) except Exception, ex: # not supported by sqlite for instance - self.error('error while altering table %s: %s', subj, ex) - session.system_sql('UPDATE %s SET %s=%%(default)s' % (subj, rtype), + self.error('error while altering table %s: %s', table, ex) + session.system_sql('UPDATE %s SET %s=%%(default)s' % (table, column), {'default': default}) AddErdefOp(session, rdef) @@ -534,7 +542,8 @@ def precommit_event(self): # we need sql to operate physical changes on the system database sqlexec = self.session.system_sql - sqlexec('ALTER TABLE %s RENAME TO %s' % (self.oldname, self.newname)) + sqlexec('ALTER TABLE %s%s RENAME TO %s%s' % (SQL_PREFIX, self.oldname, + SQL_PREFIX, self.newname)) self.info('renamed table %s to %s', self.oldname, self.newname) sqlexec('UPDATE entities SET type=%s WHERE type=%s', (self.newname, self.oldname)) @@ -551,7 +560,9 @@ def precommit_event(self): if 'indexed' in self.values: sysource = self.session.pool.source('system') - table, column = self.kobj[0], self.rschema.type + etype, rtype = self.kobj[0], self.rschema.type + table = SQL_PREFIX + etype + column = SQL_PREFIX + rtype if self.values['indexed']: sysource.create_index(self.session, table, column) else: @@ -561,6 +572,7 @@ # structure should be clean, not need to remove entity's relations # at this point self.rschema._rproperties[self.kobj].update(self.values) + def after_update_erdef(session, entity): desttype = entity.to_entity[0].name @@ -593,6 +605,7 @@ # inlined changed, make necessary physical changes! sqlexec = self.session.system_sql rtype = rschema.type + eidcolumn = SQL_PREFIX + 'eid' if not inlined: # need to create the relation if it has not been already done by another # event of the same transaction @@ -604,12 +617,15 @@ sqlexec(sql) session.add_query_data('createdtables', rschema.type) # copy existant data + column = SQL_PREFIX + rtype for etype in rschema.subjects(): - sqlexec('INSERT INTO %s_relation SELECT eid, %s FROM %s WHERE NOT %s IS NULL' - % (rtype, rtype, etype, rtype)) + table = SQL_PREFIX + str(etype) + sqlexec('INSERT INTO %s_relation SELECT %s, %s FROM %s WHERE NOT %s IS NULL' + % (rtype, eidcolumn, column, table, column)) # drop existant columns for etype in rschema.subjects(): - DropColumnOp(session, table=str(etype), column=rtype) + DropColumnOp(session, table=SQL_PREFIX + str(etype), + column=SQL_PREFIX + rtype) else: for etype in rschema.subjects(): try: @@ -625,13 +641,15 @@ # 'FROM %(rtype)s_relation ' # 'WHERE %(etype)s.eid=%(rtype)s_relation.eid_from' # % locals()) - cursor = sqlexec('SELECT eid_from, eid_to FROM %(etype)s, ' - '%(rtype)s_relation WHERE %(etype)s.eid=' + table = SQL_PREFIX + str(etype) + cursor = sqlexec('SELECT eid_from, eid_to FROM %(table)s, ' + '%(rtype)s_relation WHERE %(table)s.%(eidcolumn)s=' '%(rtype)s_relation.eid_from' % locals()) args = [{'val': eid_to, 'x': eid} for eid, eid_to in cursor.fetchall()] if args: - cursor.executemany('UPDATE %s SET %s=%%(val)s WHERE eid=%%(x)s' - % (etype, rtype), args) + column = SQL_PREFIX + rtype + cursor.executemany('UPDATE %s SET %s=%%(val)s WHERE %s=%%(x)s' + % (table, column, eidcolumn), args) # drop existant table DropTableOp(session, table='%s_relation' % rtype) @@ -677,20 +695,22 @@ self.cstr = rtype.constraint_by_type(subjtype, objtype, cstrtype) self._cstr = CONSTRAINTS[cstrtype].deserialize(self.entity.value) self._cstr.eid = self.entity.eid + table = SQL_PREFIX + str(subjtype) + column = SQL_PREFIX + str(rtype) # alter the physical schema on size constraint changes if self._cstr.type() == 'SizeConstraint' and ( self.cstr is None or self.cstr.max != self._cstr.max): try: session.system_sql('ALTER TABLE %s ALTER COLUMN %s TYPE VARCHAR(%s)' - % (subjtype, rtype, self._cstr.max)) + % (table, column, self._cstr.max)) self.info('altered column %s of table %s: now VARCHAR(%s)', - rtype, subjtype, self._cstr.max) + column, table, self._cstr.max) except Exception, ex: # not supported by sqlite for instance - self.error('error while altering table %s: %s', subjtype, ex) + self.error('error while altering table %s: %s', table, ex) elif cstrtype == 'UniqueConstraint': session.pool.source('system').create_index( - self.session, str(subjtype), str(rtype), unique=True) + self.session, table, column, unique=True) def commit_event(self): if self.cancelled: @@ -700,32 +720,35 @@ self.constraints.remove(self.cstr) self.constraints.append(self._cstr) + def after_add_econstraint(session, entity): ConstraintOp(session, entity=entity) def after_update_econstraint(session, entity): ConstraintOp(session, entity=entity) + class DelConstraintOp(ConstraintOp): """actually remove a constraint of a relation definition""" def precommit_event(self): self.prepare_constraints(self.rtype, self.subjtype, self.objtype) cstrtype = self.cstr.type() + table = SQL_PREFIX + str(self.subjtype) + column = SQL_PREFIX + str(self.rtype) # alter the physical schema on size/unique constraint changes if cstrtype == 'SizeConstraint': try: self.session.system_sql('ALTER TABLE %s ALTER COLUMN %s TYPE TEXT' - % (self.subjtype, self.rtype)) + % (table, column)) self.info('altered column %s of table %s: now TEXT', - self.rtype, self.subjtype) + column, table) except Exception, ex: # not supported by sqlite for instance - self.error('error while altering table %s: %s', - self.subjtype, ex) + self.error('error while altering table %s: %s', table, ex) elif cstrtype == 'UniqueConstraint': self.session.pool.source('system').drop_index( - self.session, str(self.subjtype), str(self.rtype), unique=True) + self.session, table, column, unique=True) def commit_event(self): self.constraints.remove(self.cstr) diff -r a81d3babb582 -r 9d61b146f505 server/securityhooks.py --- a/server/securityhooks.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/securityhooks.py Wed Apr 15 17:36:09 2009 +0200 @@ -2,7 +2,7 @@ the user connected to a session :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -54,6 +54,7 @@ entity.check_perm('update') check_entity_attributes(session, entity) except Unauthorized: + entity.clear_local_perm_cache('update') CheckEntityPermissionOp(session, entity=entity, action='update') def before_del_entity(session, eid): diff -r a81d3babb582 -r 9d61b146f505 server/serverconfig.py --- a/server/serverconfig.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/serverconfig.py Wed Apr 15 17:36:09 2009 +0200 @@ -73,6 +73,15 @@ 'help': 'size of the parsed rql cache size.', 'group': 'main', 'inputlevel': 1, }), + ('delay-full-text-indexation', + {'type' : 'yn', 'default': False, + 'help': 'When full text indexation of entity has a too important cost' + ' to be done when entity are added/modified by users, activate this ' + 'option and setup a job using cubicweb-ctl db-rebuild-fti on your ' + 'system (using cron for instance).', + 'group': 'main', 'inputlevel': 1, + }), + # email configuration ('default-recipients-mode', {'type' : 'choice', diff -r a81d3babb582 -r 9d61b146f505 server/serverctl.py --- a/server/serverctl.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/serverctl.py Wed Apr 15 17:36:09 2009 +0200 @@ -475,7 +475,8 @@ raise ExecutionError('Error while retrieving the dump') rmcmd = 'ssh -t %s "rm -f /tmp/%s.dump"' % (host, appid) print rmcmd - if os.system(rmcmd) and not confirm('an error occured while deleting remote dump. Continue anyway?'): + if os.system(rmcmd) and not confirm( + 'an error occured while deleting remote dump. Continue anyway?'): raise ExecutionError('Error while deleting remote dump') def _local_dump(appid, output): diff -r a81d3babb582 -r 9d61b146f505 server/session.py --- a/server/session.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/session.py Wed Apr 15 17:36:09 2009 +0200 @@ -1,7 +1,7 @@ """Repository users' and internal' sessions. :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -21,6 +21,18 @@ from cubicweb.common.utils import make_uid from cubicweb.server.rqlrewrite import RQLRewriter +_ETYPE_PYOBJ_MAP = { bool: 'Boolean', + int: 'Int', + long: 'Int', + float: 'Float', + Decimal: 'Decimal', + unicode: 'String', + NoneType: None, + Binary: 'Bytes', + DateTimeType: 'Datetime', + DateTimeDeltaType: 'Interval', + } + def etype_from_pyobj(value): """guess yams type from python value""" # note: @@ -28,17 +40,7 @@ # * use type(value) and not value.__class__ since mx instances have no # __class__ attribute # * XXX Date, Time - return {bool: 'Boolean', - int: 'Int', - long: 'Int', - float: 'Float', - Decimal: 'Decimal', - unicode: 'String', - NoneType: None, - Binary: 'Bytes', - DateTimeType: 'Datetime', - DateTimeDeltaType: 'Interval', - }[type(value)] + return _ETYPE_PYOBJ_MAP[type(value)] def is_final(rqlst, variable, args): # try to find if this is a final var or not @@ -58,35 +60,8 @@ description.append(term.get_type(solution, args)) return description -#XXX rql <= 0.18.3 bw compat from rql import stmts -if not hasattr(stmts.Union, 'get_variable_variables'): - def _union_get_variable_variables(self): - """return the set of variable names which take different type according to - the solution - """ - change = set() - values = {} - for select in self.children: - change.update(select.get_variable_variables(values)) - return change - stmts.Union.get_variable_variables = _union_get_variable_variables - - def _select_get_variable_variables(self, _values=None): - """return the set of variable names which take different type according to - the solution - """ - change = set() - if _values is None: - _values = {} - for solution in self.solutions: - for vname, etype in solution.iteritems(): - if not vname in _values: - _values[vname] = etype - elif _values[vname] != etype: - change.add(vname) - return change - stmts.Select.get_variable_variables = _select_get_variable_variables +assert hasattr(stmts.Union, 'get_variable_variables'), "You need RQL > 0.18.3" class Session(RequestSessionMixIn): """tie session id, user, connections pool and other session data all @@ -469,10 +444,14 @@ # None value inserted by an outer join, no type row_descr[index] = None continue - if isfinal: - row_descr[index] = etype_from_pyobj(value) - else: - row_descr[index] = etype_from_eid(value)[0] + try: + if isfinal: + row_descr[index] = etype_from_pyobj(value) + else: + row_descr[index] = etype_from_eid(value)[0] + except UnknownEid: + self.critical('wrong eid in repository, should check database') + row_descr[index] = row[index] = None description.append(tuple(row_descr)) return description diff -r a81d3babb582 -r 9d61b146f505 server/sources/__init__.py --- a/server/sources/__init__.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/sources/__init__.py Wed Apr 15 17:36:09 2009 +0200 @@ -1,14 +1,36 @@ """cubicweb server sources support :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" from logging import getLogger +from mx.DateTime import now, DateTimeDelta + from cubicweb import set_log_methods +from cubicweb.server.sqlutils import SQL_PREFIX + + +class TimedCache(dict): + def __init__(self, ttlm, ttls=0): + # time to live in minutes + self.ttl = DateTimeDelta(0, 0, ttlm, ttls) + + def __setitem__(self, key, value): + dict.__setitem__(self, key, (now(), value)) + + def __getitem__(self, key): + return dict.__getitem__(self, key)[1] + + def clear_expired(self): + now_ = now() + ttl = self.ttl + for key, (timestamp, value) in self.items(): + if now_ - timestamp > ttl: + del self[key] class AbstractSource(object): @@ -58,7 +80,7 @@ pass def __repr__(self): - return '<%s source>' % self.uri + return '<%s source @%#x>' % (self.uri, id(self)) def __cmp__(self, other): """simple comparison function to get predictable source order, with the @@ -117,8 +139,8 @@ def eid2extid(self, eid, session=None): return self.repo.eid2extid(self, eid, session) - def extid2eid(self, value, etype, session=None, insert=True): - return self.repo.extid2eid(self, value, etype, session, insert) + def extid2eid(self, value, etype, session=None, **kwargs): + return self.repo.extid2eid(self, value, etype, session, **kwargs) PUBLIC_KEYS = ('adapter', 'uri') def remove_sensitive_information(self, sourcedef): @@ -139,15 +161,18 @@ if not myeids: return # delete relations referencing one of those eids + eidcolum = SQL_PREFIX + 'eid' for rschema in self.schema.relations(): if rschema.is_final() or rschema.type == 'identity': continue if rschema.inlined: + column = SQL_PREFIX + rschema.type for subjtype in rschema.subjects(): + table = SQL_PREFIX + str(subjtype) for objtype in rschema.objects(subjtype): if self.support_entity(objtype): - sql = 'UPDATE %s SET %s = NULL WHERE eid IN (%s);' % ( - subjtype, rschema.type, myeids) + sql = 'UPDATE %s SET %s=NULL WHERE %s IN (%s);' % ( + table, column, eidcolum, myeids) session.system_sql(sql) break continue diff -r a81d3babb582 -r 9d61b146f505 server/sources/extlite.py --- a/server/sources/extlite.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/sources/extlite.py Wed Apr 15 17:36:09 2009 +0200 @@ -1,7 +1,7 @@ """provide an abstract class for external sources using a sqlite database helper :organization: Logilab -:copyright: 2007-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2007-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -12,7 +12,7 @@ from os.path import join, exists from cubicweb import server -from cubicweb.server.sqlutils import sqlexec, SQLAdapterMixIn +from cubicweb.server.sqlutils import SQL_PREFIX, sqlexec, SQLAdapterMixIn from cubicweb.server.sources import AbstractSource, native from cubicweb.server.sources.rql2sql import SQLGenerator @@ -122,7 +122,7 @@ for etype in self.support_entities: eschema = schema.eschema(etype) createsqls = eschema2sql(self.sqladapter.dbhelper, eschema, - skip_relations=('data',)) + skip_relations=('data',), prefix=SQL_PREFIX) sqlexec(createsqls, cu, withpb=False) for rtype in self.support_relations: rschema = schema.rschema(rtype) @@ -141,7 +141,7 @@ def set_schema(self, schema): super(SQLiteAbstractSource, self).set_schema(schema) - if self._need_sql_create and self._is_schema_complete(): + if self._need_sql_create and self._is_schema_complete() and self.dbpath: self._create_database() self.rqlsqlgen = self.sqlgen_class(schema, self.sqladapter.dbhelper) @@ -196,7 +196,7 @@ """ cu = session.pool[self.uri] attrs = self.sqladapter.preprocess_entity(entity) - sql = self.sqladapter.sqlgen.insert(str(entity.e_schema), attrs) + sql = self.sqladapter.sqlgen.insert(SQL_PREFIX + str(entity.e_schema), attrs) cu.execute(sql, attrs) def add_entity(self, session, entity): @@ -212,7 +212,7 @@ """ cu = session.pool[self.uri] attrs = self.sqladapter.preprocess_entity(entity) - sql = self.sqladapter.sqlgen.update(str(entity.e_schema), attrs, ['eid']) + sql = self.sqladapter.sqlgen.update(SQL_PREFIX + str(entity.e_schema), attrs, ['eid']) cu.execute(sql, attrs) def update_entity(self, session, entity): @@ -227,8 +227,8 @@ entity is deleted. """ sqlcursor = session.pool[self.uri] - attrs = {'eid': eid} - sql = self.sqladapter.sqlgen.delete(etype, attrs) + attrs = {SQL_PREFIX + 'eid': eid} + sql = self.sqladapter.sqlgen.delete(SQL_PREFIX + etype, attrs) sqlcursor.execute(sql, attrs) def delete_relation(self, session, subject, rtype, object): @@ -237,8 +237,9 @@ if rschema.inlined: if subject in session.query_data('pendingeids', ()): return - etype = session.describe(subject)[0] - sql = 'UPDATE %s SET %s=NULL WHERE eid=%%(eid)s' % (etype, rtype) + table = SQL_PREFIX + session.describe(subject)[0] + column = SQL_PREFIX + rtype + sql = 'UPDATE %s SET %s=NULL WHERE %seid=%%(eid)s' % (table, column, SQL_PREFIX) attrs = {'eid' : subject} else: attrs = {'eid_from': subject, 'eid_to': object} diff -r a81d3babb582 -r 9d61b146f505 server/sources/ldapuser.py --- a/server/sources/ldapuser.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/sources/ldapuser.py Wed Apr 15 17:36:09 2009 +0200 @@ -3,7 +3,7 @@ this source is for now limited to a read-only EUser source :organization: Logilab -:copyright: 2003-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2003-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr @@ -20,8 +20,6 @@ FOR A PARTICULAR PURPOSE. """ -from mx.DateTime import now, DateTimeDelta - from logilab.common.textutils import get_csv from rql.nodes import Relation, VariableRef, Constant, Function @@ -30,9 +28,10 @@ from ldap.filter import filter_format, escape_filter_chars from ldapurl import LDAPUrl -from cubicweb.common import AuthenticationError, UnknownEid, RepositoryError -from cubicweb.server.sources import AbstractSource, TrFunc, GlobTrFunc, ConnectionWrapper +from cubicweb import AuthenticationError, UnknownEid, RepositoryError from cubicweb.server.utils import cartesian_product +from cubicweb.server.sources import (AbstractSource, TrFunc, GlobTrFunc, + ConnectionWrapper, TimedCache) # search scopes BASE = ldap.SCOPE_BASE @@ -49,24 +48,6 @@ 1: (636, 'ldaps'), 2: (0, 'ldapi'), } - -class TimedCache(dict): - def __init__(self, ttlm, ttls=0): - # time to live in minutes - self.ttl = DateTimeDelta(0, 0, ttlm, ttls) - - def __setitem__(self, key, value): - dict.__setitem__(self, key, (now(), value)) - - def __getitem__(self, key): - return dict.__getitem__(self, key)[1] - - def clear_expired(self): - now_ = now() - ttl = self.ttl - for key, (timestamp, value) in self.items(): - if now_ - timestamp > ttl: - del self[key] class LDAPUserSource(AbstractSource): """LDAP read-only EUser source""" @@ -176,6 +157,10 @@ external repository """ self.info('synchronizing ldap source %s', self.uri) + try: + ldap_emailattr = self.user_rev_attrs['email'] + except KeyError: + return # no email in ldap, we're done session = self.repo.internal_session() try: cursor = session.system_sql("SELECT eid, extid FROM entities WHERE " @@ -184,7 +169,7 @@ # if no result found, _search automatically delete entity information res = self._search(session, extid, BASE) if res: - ldapemailaddr = res[0].get(self.user_rev_attrs['email']) + ldapemailaddr = res[0].get(ldap_emailattr) if ldapemailaddr: rset = session.execute('EmailAddress X,A WHERE ' 'U use_email X, U eid %(u)s', @@ -628,7 +613,10 @@ filter = '(%s%s)' % (self._ldap_attrs[relation.r_type], rhs.accept(self)) except KeyError: - assert relation.r_type == 'password' # 2.38 migration + # unsupported attribute + self.source.warning('%s source can\'t handle relation %s, no ' + 'results will be returned from this source', + self.source.uri, relation) raise UnknownEid # trick to return no result return filter diff -r a81d3babb582 -r 9d61b146f505 server/sources/native.py --- a/server/sources/native.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/sources/native.py Wed Apr 15 17:36:09 2009 +0200 @@ -1,7 +1,7 @@ """Adapters for native cubicweb sources. :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -18,7 +18,7 @@ from cubicweb import UnknownEid, AuthenticationError, Binary, server from cubicweb.server.utils import crypt_password -from cubicweb.server.sqlutils import SQLAdapterMixIn +from cubicweb.server.sqlutils import SQL_PREFIX, SQLAdapterMixIn from cubicweb.server.rqlannotation import set_qdata from cubicweb.server.sources import AbstractSource from cubicweb.server.sources.rql2sql import SQLGenerator @@ -188,7 +188,7 @@ rqlst.restricted_vars = () rqlst.children[0].solutions = self._sols self.repo.querier.sqlgen_annotate(rqlst) - set_qdata(rqlst, ()) + set_qdata(self.schema.rschema, rqlst, ()) return rqlst def set_schema(self, schema): @@ -367,19 +367,19 @@ def add_entity(self, session, entity): """add a new entity to the source""" attrs = self.preprocess_entity(entity) - sql = self.sqlgen.insert(str(entity.e_schema), attrs) + sql = self.sqlgen.insert(SQL_PREFIX + str(entity.e_schema), attrs) self.doexec(session.pool[self.uri], sql, attrs) def update_entity(self, session, entity): """replace an entity in the source""" attrs = self.preprocess_entity(entity) - sql = self.sqlgen.update(str(entity.e_schema), attrs, ['eid']) + sql = self.sqlgen.update(SQL_PREFIX + str(entity.e_schema), attrs, [SQL_PREFIX + 'eid']) self.doexec(session.pool[self.uri], sql, attrs) def delete_entity(self, session, etype, eid): """delete an entity from the source""" - attrs = {'eid': eid} - sql = self.sqlgen.delete(etype, attrs) + attrs = {SQL_PREFIX + 'eid': eid} + sql = self.sqlgen.delete(SQL_PREFIX + etype, attrs) self.doexec(session.pool[self.uri], sql, attrs) def add_relation(self, session, subject, rtype, object): @@ -392,8 +392,10 @@ """delete a relation from the source""" rschema = self.schema.rschema(rtype) if rschema.inlined: - etype = session.describe(subject)[0] - sql = 'UPDATE %s SET %s=NULL WHERE eid=%%(eid)s' % (etype, rtype) + table = SQL_PREFIX + session.describe(subject)[0] + column = SQL_PREFIX + rtype + sql = 'UPDATE %s SET %s=NULL WHERE %seid=%%(eid)s' % (table, column, + SQL_PREFIX) attrs = {'eid' : subject} else: attrs = {'eid_from': subject, 'eid_to': object} @@ -451,6 +453,7 @@ try: res = session.system_sql(sql).fetchone() except: + assert session.pool, 'session has no pool set' raise UnknownEid(eid) if res is None: raise UnknownEid(eid) diff -r a81d3babb582 -r 9d61b146f505 server/sources/pyrorql.py --- a/server/sources/pyrorql.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/sources/pyrorql.py Wed Apr 15 17:36:09 2009 +0200 @@ -1,7 +1,7 @@ """Source to query another RQL repository using pyro :organization: Logilab -:copyright: 2007-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2007-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -21,7 +21,7 @@ from cubicweb import dbapi, server from cubicweb import BadConnectionId, UnknownEid, ConnectionError from cubicweb.cwconfig import register_persistent_options -from cubicweb.server.sources import AbstractSource, ConnectionWrapper +from cubicweb.server.sources import AbstractSource, ConnectionWrapper, TimedCache class ReplaceByInOperator: def __init__(self, eids): @@ -129,6 +129,7 @@ 'group': 'sources', }),) register_persistent_options(myoptions) + self._query_cache = TimedCache(30) def last_update_time(self): pkey = u'sources.%s.latest-update-time' % self.uri @@ -153,13 +154,15 @@ """method called by the repository once ready to handle request""" interval = int(self.config.get('synchronization-interval', 5*60)) self.repo.looping_task(interval, self.synchronize) + self.repo.looping_task(self._query_cache.ttl.seconds/10, self._query_cache.clear_expired) def synchronize(self, mtime=None): """synchronize content known by this repository with content in the external repository """ self.info('synchronizing pyro source %s', self.uri) - extrepo = self.get_connection()._repo + cnx = self.get_connection() + extrepo = cnx._repo etypes = self.support_entities.keys() if mtime is None: mtime = self.last_update_time() @@ -170,11 +173,13 @@ try: for etype, extid in modified: try: - eid = self.extid2eid(extid, etype, session) - rset = session.eid_rset(eid, etype) - entity = rset.get_entity(0, 0) - entity.complete(entity.e_schema.indexable_attributes()) - repo.index_entity(session, entity) + exturi = cnx.describe(extid)[1] + if exturi == 'system' or not exturi in repo.sources_by_uri: + eid = self.extid2eid(extid, etype, session) + rset = session.eid_rset(eid, etype) + entity = rset.get_entity(0, 0) + entity.complete(entity.e_schema.indexable_attributes()) + repo.index_entity(session, entity) except: self.exception('while updating %s with external id %s of source %s', etype, extid, self.uri) @@ -237,9 +242,18 @@ # try to reconnect return self.get_connection() - def syntax_tree_search(self, session, union, args=None, cachekey=None, varmap=None): + #assert not varmap, (varmap, union) + rqlkey = union.as_string(kwargs=args) + try: + results = self._query_cache[rqlkey] + except KeyError: + results = self._syntax_tree_search(session, union, args) + self._query_cache[rqlkey] = results + return results + + def _syntax_tree_search(self, session, union, args): """return result from this source for a rql query (actually from a rql syntax tree and a solution dictionary mapping each used variable to a possible type). If cachekey is given, the query necessary to fetch the @@ -277,18 +291,28 @@ descr = rset.description if rset: needtranslation = [] + rows = rset.rows for i, etype in enumerate(descr[0]): if (etype is None or not self.schema.eschema(etype).is_final() or getattr(union.locate_subquery(i, etype, args).selection[i], 'uidtype', None)): needtranslation.append(i) if needtranslation: - for rowindex, row in enumerate(rset): + cnx = session.pool.connection(self.uri) + for rowindex in xrange(rset.rowcount - 1, -1, -1): + row = rows[rowindex] for colindex in needtranslation: if row[colindex] is not None: # optional variable etype = descr[rowindex][colindex] - eid = self.extid2eid(row[colindex], etype, session) - row[colindex] = eid - results = rset.rows + exttype, exturi, extid = cnx.describe(row[colindex]) + if exturi == 'system' or not exturi in self.repo.sources_by_uri: + eid = self.extid2eid(row[colindex], etype, session) + row[colindex] = eid + else: + # skip this row + del rows[rowindex] + del descr[rowindex] + break + results = rows else: results = [] if server.DEBUG: diff -r a81d3babb582 -r 9d61b146f505 server/sources/rql2sql.py --- a/server/sources/rql2sql.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/sources/rql2sql.py Wed Apr 15 17:36:09 2009 +0200 @@ -25,7 +25,7 @@ :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -38,6 +38,7 @@ Variable, ColumnAlias, Relation, SubQuery, Exists) from cubicweb import server +from cubicweb.server.sqlutils import SQL_PREFIX from cubicweb.server.utils import cleanup_solutions def _new_var(select, varname): @@ -488,7 +489,8 @@ sql.insert(1, 'FROM (SELECT 1) AS _T') sqls.append('\n'.join(sql)) if select.need_intersect: - if distinct: + # XXX use getattr for lgc bw compat, remove once 0.37.3 is out + if distinct or not getattr(self.dbms_helper, 'intersect_all_support', True): return '\nINTERSECT\n'.join(sqls) else: return '\nINTERSECT ALL\n'.join(sqls) @@ -764,7 +766,7 @@ if '%s.%s' % (lhs.name, attr) in self._varmap: lhssql = self._varmap['%s.%s' % (lhs.name, attr)] else: - lhssql = '%s.%s' % (self._var_table(lhs.variable), attr) + lhssql = '%s.%s%s' % (self._var_table(lhs.variable), SQL_PREFIX, attr) if not rhsvar is None: t2 = self._var_table(rhsvar) if t2 is None: @@ -801,11 +803,12 @@ else: join += ')' if not rhsconst: - rhstable = self._var_table(rhsvar) + rhstable = rhsvar._q_sqltable if rhstable: assert rhstable is not None, rhsvar join += ' %s OUTER JOIN %s ON (%s.%s=%s)' % ( - outertype, self._state.tables[rhstable][1], rid, restrattr, rhssql) + outertype, self._state.tables[rhstable][1], rid, restrattr, + rhssql) toreplace.append(rhstable) self.replace_tables_by_outer_join(join, maintable, *toreplace) return '' @@ -845,7 +848,10 @@ try: lhssql = self._varmap['%s.%s' % (lhs.name, relation.r_type)] except KeyError: - lhssql = '%s.%s' % (table, relation.r_type) + if relation.r_type == 'eid': + lhssql = lhs.variable._q_sql + else: + lhssql = '%s.%s%s' % (table, SQL_PREFIX, relation.r_type) try: if relation._q_needcast == 'TODAY': sql = 'DATE(%s)%s' % (lhssql, rhssql) @@ -966,7 +972,10 @@ """get the sql name for a subquery column alias""" if colalias.name in self._varmap: sql = self._varmap[colalias.name] - self.add_table(sql.split('.', 1)[0]) + table = sql.split('.', 1)[0] + colalias._q_sqltable = table + colalias._q_sql = sql + self.add_table(table) return sql return colalias._q_sql @@ -989,7 +998,7 @@ principal = variable.stinfo['principal'] if principal is None: vtablename = variable.name - self.add_table('entities AS %s' % variable.name, vtablename) + self.add_table('entities AS %s' % vtablename, vtablename) sql = '%s.eid' % vtablename if variable.stinfo['typerels']: # add additional restriction on entities.type column @@ -1054,8 +1063,8 @@ if self.schema.eschema(etype).is_final(): raise BadRQLQuery(var.stmt.root) table = var.name - sql = '%s.eid' % table - self.add_table('%s AS %s' % (etype, table), table, scope=scope) + sql = '%s.%seid' % (table, SQL_PREFIX) + self.add_table('%s%s AS %s' % (SQL_PREFIX, etype, table), table, scope=scope) return sql, table def _inlined_var_sql(self, var, rtype): @@ -1064,7 +1073,7 @@ scope = var.sqlscope is var.stmt and 0 or -1 self.add_table(sql.split('.', 1)[0], scope=scope) except KeyError: - sql = '%s.%s' % (self._var_table(var), rtype) + sql = '%s.%s%s' % (self._var_table(var), SQL_PREFIX, rtype) #self._state.done.add(var.name) return sql @@ -1087,7 +1096,7 @@ sql = self._varmap['%s.%s' % (linkedvar.name, rel.r_type)] except KeyError: linkedvar.accept(self) - sql = '%s.%s' % (linkedvar._q_sqltable, rel.r_type) + sql = '%s.%s%s' % (linkedvar._q_sqltable, SQL_PREFIX, rel.r_type) return sql # tables handling ######################################################### diff -r a81d3babb582 -r 9d61b146f505 server/sqlutils.py --- a/server/sqlutils.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/sqlutils.py Wed Apr 15 17:36:09 2009 +0200 @@ -1,7 +1,7 @@ """SQL utilities functions and classes. :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -18,6 +18,7 @@ from cubicweb.server import SQL_CONNECT_HOOKS from cubicweb.server.utils import crypt_password, cartesian_product +SQL_PREFIX = 'cw_' def sqlexec(sqlstmts, cursor_or_execute, withpb=True, delimiter=';'): """execute sql statements ignoring DROP/ CREATE GROUP or USER statements @@ -58,7 +59,7 @@ indexer = get_indexer(driver) w(indexer.sql_grant_user(user)) w('') - w(grant_schema(schema, user, set_owner, skip_entities=skip_entities)) + w(grant_schema(schema, user, set_owner, skip_entities=skip_entities, prefix=SQL_PREFIX)) return '\n'.join(output) @@ -79,7 +80,7 @@ w(indexer.sql_init_fti()) w('') dbhelper = get_adv_func_helper(driver) - w(schema2sql(dbhelper, schema, + w(schema2sql(dbhelper, schema, prefix=SQL_PREFIX, skip_entities=skip_entities, skip_relations=skip_relations)) if dbhelper.users_support and user: w('') @@ -101,7 +102,7 @@ indexer = get_indexer(driver) w(indexer.sql_drop_fti()) w('') - w(dropschema2sql(schema, + w(dropschema2sql(schema, prefix=SQL_PREFIX, skip_entities=skip_entities, skip_relations=skip_relations)) return '\n'.join(output) @@ -179,7 +180,7 @@ def preprocess_entity(self, entity): """return a dictionary to use as extra argument to cursor.execute - to insert/update an entity + to insert/update an entity into a SQL database """ attrs = {} eschema = entity.e_schema @@ -198,7 +199,7 @@ value = crypt_password(value) elif isinstance(value, Binary): value = self.binary(value.getvalue()) - attrs[str(attr)] = value + attrs[SQL_PREFIX+str(attr)] = value return attrs diff -r a81d3babb582 -r 9d61b146f505 server/test/data/schema/relations.rel --- a/server/test/data/schema/relations.rel Thu Jan 15 10:13:25 2009 +0100 +++ b/server/test/data/schema/relations.rel Wed Apr 15 17:36:09 2009 +0200 @@ -43,3 +43,6 @@ EPermission require_state State Note migrated_from Note + +Note attachment File +Note attachment Image diff -r a81d3babb582 -r 9d61b146f505 server/test/data/sources_multi --- a/server/test/data/sources_multi Thu Jan 15 10:13:25 2009 +0100 +++ b/server/test/data/sources_multi Wed Apr 15 17:36:09 2009 +0200 @@ -15,6 +15,13 @@ cubicweb-password = gingkow mapping-file = extern_mapping.py +[extern-multi] +adapter = pyrorql +pyro-ns-id = extern-multi +cubicweb-user = admin +cubicweb-password = gingkow +mapping-file = extern_mapping.py + [admin] login = admin password = gingkow diff -r a81d3babb582 -r 9d61b146f505 server/test/unittest_hooks.py --- a/server/test/unittest_hooks.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/test/unittest_hooks.py Wed Apr 15 17:36:09 2009 +0200 @@ -7,8 +7,9 @@ from logilab.common.testlib import TestCase, unittest_main from cubicweb.devtools.apptest import RepositoryBasedTC, get_versions -from cubicweb.common import ConnectionError, RepositoryError, ValidationError -from cubicweb.server.repository import * +from cubicweb import ConnectionError, RepositoryError, ValidationError, AuthenticationError, BadConnectionId +from cubicweb.server.sqlutils import SQL_PREFIX +from cubicweb.server.repository import Repository orig_get_versions = Repository.get_versions @@ -250,7 +251,12 @@ repo.config._cubes = None repo.fill_schema() RepositoryBasedTC.setUp(self) - + + def index_exists(self, etype, attr, unique=False): + dbhelper = self.session.pool.source('system').dbhelper + sqlcursor = self.session.pool['system'] + return dbhelper.index_exists(sqlcursor, SQL_PREFIX + etype, SQL_PREFIX + attr, unique=unique) + def test_base(self): schema = self.repo.schema dbhelper = self.session.pool.source('system').dbhelper @@ -281,11 +287,11 @@ 'WHERE RT name "comments", E name "Societe2", C name "Comment"') self.failIf('nom' in schema['Societe2'].subject_relations()) self.failIf('concerne2' in schema['Societe2'].subject_relations()) - self.failIf(dbhelper.index_exists(sqlcursor, 'Societe2', 'nom')) + self.failIf(self.index_exists('Societe2', 'nom')) self.commit() self.failUnless('nom' in schema['Societe2'].subject_relations()) self.failUnless('concerne2' in schema['Societe2'].subject_relations()) - self.failUnless(dbhelper.index_exists(sqlcursor, 'Societe2', 'nom')) + self.failUnless(self.index_exists('Societe2', 'nom')) # now we should be able to insert and query Societe2 s2eid = self.execute('INSERT Societe2 X: X nom "logilab"')[0][0] self.execute('Societe2 X WHERE X nom "logilab"') @@ -304,11 +310,11 @@ # schema should be cleaned on delete (after commit) self.execute('DELETE EEType X WHERE X name "Societe2"') self.execute('DELETE ERType X WHERE X name "concerne2"') - self.failUnless(dbhelper.index_exists(sqlcursor, 'Societe2', 'nom')) + self.failUnless(self.index_exists('Societe2', 'nom')) self.failUnless(schema.has_entity('Societe2')) self.failUnless(schema.has_relation('concerne2')) self.commit() - self.failIf(dbhelper.index_exists(sqlcursor, 'Societe2', 'nom')) + self.failIf(self.index_exists('Societe2', 'nom')) self.failIf(schema.has_entity('Societe2')) self.failIf(schema.has_entity('concerne2')) @@ -385,7 +391,7 @@ self.failUnless(self.schema['inline2'].inlined) self.commit() self.failIf(self.schema['inline2'].inlined) - self.failIf(dbhelper.index_exists(sqlcursor, 'Personne', 'inline2')) + self.failIf(self.index_exists('Personne', 'inline2')) rset = self.execute('Any X, Y WHERE X inline2 Y') self.assertEquals(len(rset), 1) self.assertEquals(rset.rows[0], [peid, aeid]) @@ -398,7 +404,7 @@ self.failIf(self.schema['inline2'].inlined) self.commit() self.failUnless(self.schema['inline2'].inlined) - self.failUnless(dbhelper.index_exists(sqlcursor, 'Personne', 'inline2')) + self.failUnless(self.index_exists('Personne', 'inline2')) rset = self.execute('Any X, Y WHERE X inline2 Y') self.assertEquals(len(rset), 1) self.assertEquals(rset.rows[0], [peid, aeid]) @@ -409,39 +415,44 @@ try: self.execute('SET X indexed TRUE WHERE X relation_type R, R name "sujet"') self.failIf(self.schema['sujet'].rproperty('Affaire', 'String', 'indexed')) - self.failIf(dbhelper.index_exists(sqlcursor, 'Affaire', 'sujet')) + self.failIf(self.index_exists('Affaire', 'sujet')) self.commit() self.failUnless(self.schema['sujet'].rproperty('Affaire', 'String', 'indexed')) - self.failUnless(dbhelper.index_exists(sqlcursor, 'Affaire', 'sujet')) + self.failUnless(self.index_exists('Affaire', 'sujet')) finally: self.execute('SET X indexed FALSE WHERE X relation_type R, R name "sujet"') self.failUnless(self.schema['sujet'].rproperty('Affaire', 'String', 'indexed')) - self.failUnless(dbhelper.index_exists(sqlcursor, 'Affaire', 'sujet')) + self.failUnless(self.index_exists('Affaire', 'sujet')) self.commit() self.failIf(self.schema['sujet'].rproperty('Affaire', 'String', 'indexed')) - self.failIf(dbhelper.index_exists(sqlcursor, 'Affaire', 'sujet')) + self.failIf(self.index_exists('Affaire', 'sujet')) def test_unique_change(self): dbhelper = self.session.pool.source('system').dbhelper sqlcursor = self.session.pool['system'] try: - self.execute('INSERT EConstraint X: X cstrtype CT, DEF constrained_by X ' - 'WHERE CT name "UniqueConstraint", DEF relation_type RT, DEF from_entity E,' - 'RT name "sujet", E name "Affaire"') - self.failIf(self.schema['Affaire'].has_unique_values('sujet')) - self.failIf(dbhelper.index_exists(sqlcursor, 'Affaire', 'sujet', unique=True)) - self.commit() - self.failUnless(self.schema['Affaire'].has_unique_values('sujet')) - self.failUnless(dbhelper.index_exists(sqlcursor, 'Affaire', 'sujet', unique=True)) + try: + self.execute('INSERT EConstraint X: X cstrtype CT, DEF constrained_by X ' + 'WHERE CT name "UniqueConstraint", DEF relation_type RT, DEF from_entity E,' + 'RT name "sujet", E name "Affaire"') + self.failIf(self.schema['Affaire'].has_unique_values('sujet')) + self.failIf(self.index_exists('Affaire', 'sujet', unique=True)) + self.commit() + self.failUnless(self.schema['Affaire'].has_unique_values('sujet')) + self.failUnless(self.index_exists('Affaire', 'sujet', unique=True)) + except: + import traceback + traceback.print_exc() + raise finally: self.execute('DELETE DEF constrained_by X WHERE X cstrtype CT, ' 'CT name "UniqueConstraint", DEF relation_type RT, DEF from_entity E,' 'RT name "sujet", E name "Affaire"') self.failUnless(self.schema['Affaire'].has_unique_values('sujet')) - self.failUnless(dbhelper.index_exists(sqlcursor, 'Affaire', 'sujet', unique=True)) + self.failUnless(self.index_exists('Affaire', 'sujet', unique=True)) self.commit() self.failIf(self.schema['Affaire'].has_unique_values('sujet')) - self.failIf(dbhelper.index_exists(sqlcursor, 'Affaire', 'sujet', unique=True)) + self.failIf(self.index_exists('Affaire', 'sujet', unique=True)) class WorkflowHooksTC(RepositoryBasedTC): diff -r a81d3babb582 -r 9d61b146f505 server/test/unittest_ldapuser.py --- a/server/test/unittest_ldapuser.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/test/unittest_ldapuser.py Wed Apr 15 17:36:09 2009 +0200 @@ -33,8 +33,8 @@ repo, cnx = init_test_database('sqlite', config=config) class LDAPUserSourceTC(RepositoryBasedTC): - repo = repo - + repo, cnx = repo, cnx + def patch_authenticate(self): self._orig_authenticate = LDAPUserSource.authenticate LDAPUserSource.authenticate = nopwd_authenticate @@ -242,7 +242,10 @@ ['users', 'cochon'], ['users', 'syt']]) - + def test_cd_restriction(self): + rset = self.execute('EUser X WHERE X creation_date > "2009-02-01"') + self.assertEquals(len(rset), 2) # admin/anon but no ldap user since it doesn't support creation_date + def test_union(self): afeids = self.execute('State X') ueids = self.execute('EUser X') @@ -276,32 +279,39 @@ rset = cu.execute('Any F WHERE X has_text "iaminguestsgrouponly", X firstname F') self.assertEquals(rset.rows, [[None]]) - def test_nonregr_1(self): + def test_nonregr1(self): self.execute('Any X,AA ORDERBY AA DESC WHERE E eid %(x)s, E owned_by X, ' 'X modification_date AA', {'x': cnx.user(self.session).eid}) - def test_nonregr_2(self): + def test_nonregr2(self): self.execute('Any X,L,AA WHERE E eid %(x)s, E owned_by X, ' 'X login L, X modification_date AA', {'x': cnx.user(self.session).eid}) - def test_nonregr_3(self): + def test_nonregr3(self): self.execute('Any X,AA ORDERBY AA DESC WHERE E eid %(x)s, ' 'X modification_date AA', {'x': cnx.user(self.session).eid}) - def test_nonregr_4(self): + def test_nonregr4(self): emaileid = self.execute('INSERT EmailAddress X: X address "toto@logilab.org"')[0][0] self.execute('Any X,AA WHERE X use_email Y, Y eid %(x)s, X modification_date AA', {'x': emaileid}) - def test_nonregr_5(self): + def test_nonregr5(self): # original jpl query: # Any X, NOW - CD, P WHERE P is Project, U interested_in P, U is EUser, U login "sthenault", X concerns P, X creation_date CD ORDERBY CD DESC LIMIT 5 rql = 'Any X, NOW - CD, P ORDERBY CD DESC LIMIT 5 WHERE P bookmarked_by U, U login "%s", P is X, X creation_date CD' % self.session.user.login self.execute(rql, )#{'x': }) + def test_nonregr6(self): + self.execute('Any B,U,UL GROUPBY B,U,UL WHERE B created_by U?, B is File ' + 'WITH U,UL BEING (Any U,UL WHERE ME eid %(x)s, (EXISTS(U identity ME) ' + 'OR (EXISTS(U in_group G, G name IN("managers", "staff")))) ' + 'OR (EXISTS(U in_group H, ME in_group H, NOT H name "users")), U login UL, U is EUser)', + {'x': self.session.user.eid}) + class GlobTrFuncTC(TestCase): diff -r a81d3babb582 -r 9d61b146f505 server/test/unittest_migractions.py --- a/server/test/unittest_migractions.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/test/unittest_migractions.py Wed Apr 15 17:36:09 2009 +0200 @@ -6,6 +6,8 @@ from logilab.common.testlib import TestCase, unittest_main from cubicweb.devtools.apptest import RepositoryBasedTC, get_versions +from cubicweb.schema import CubicWebSchemaLoader +from cubicweb.server.sqlutils import SQL_PREFIX from cubicweb.server.repository import Repository from cubicweb.server.migractions import * @@ -29,7 +31,6 @@ repo.config._cubes = None repo.fill_schema() # hack to read the schema from data/migrschema - from cubicweb.schema import CubicWebSchemaLoader CubicWebSchemaLoader.main_schema_directory = 'migrschema' global migrschema migrschema = self.repo.config.load_schema() @@ -40,6 +41,8 @@ self.mh = ServerMigrationHelper(self.repo.config, migrschema, repo=self.repo, cnx=self.cnx, interactive=False) + assert self.cnx is self.mh._cnx + assert self.session is self.mh.session, (self.session.id, self.mh.session.id) def test_add_attribute_int(self): self.failIf('whatever' in self.schema) @@ -66,9 +69,9 @@ self.assertEquals(self.schema['shortpara'].subjects(), ('Note', )) self.assertEquals(self.schema['shortpara'].objects(), ('String', )) # test created column is actually a varchar(64) - notesql = self.mh.sqlexec("SELECT sql FROM sqlite_master WHERE type='table' and name='Note'")[0][0] + notesql = self.mh.sqlexec("SELECT sql FROM sqlite_master WHERE type='table' and name='%sNote'" % SQL_PREFIX)[0][0] fields = dict(x.strip().split()[:2] for x in notesql.split('(', 1)[1].rsplit(')', 1)[0].split(',')) - self.assertEquals(fields['shortpara'], 'varchar(64)') + self.assertEquals(fields['%sshortpara' % SQL_PREFIX], 'varchar(64)') self.mh.rollback() def test_add_datetime_with_default_value_attribute(self): @@ -134,7 +137,7 @@ self.assertEquals([str(rs) for rs in self.schema['Folder2'].object_relations()], ['filed_under2', 'identity']) self.assertEquals(sorted(str(e) for e in self.schema['filed_under2'].subjects()), - ['Affaire', 'Card', 'Division', 'ECache', 'Email', 'EmailThread', 'File', + ['Affaire', 'Card', 'Division', 'Email', 'EmailThread', 'File', 'Folder2', 'Image', 'Note', 'Personne', 'Societe', 'SubDivision']) self.assertEquals(self.schema['filed_under2'].objects(), ('Folder2',)) eschema = self.schema.eschema('Folder2') @@ -161,7 +164,7 @@ self.mh.cmd_add_relation_type('filed_under2') self.failUnless('filed_under2' in self.schema) self.assertEquals(sorted(str(e) for e in self.schema['filed_under2'].subjects()), - ['Affaire', 'Card', 'Division', 'ECache', 'Email', 'EmailThread', 'File', + ['Affaire', 'Card', 'Division', 'Email', 'EmailThread', 'File', 'Folder2', 'Image', 'Note', 'Personne', 'Societe', 'SubDivision']) self.assertEquals(self.schema['filed_under2'].objects(), ('Folder2',)) @@ -364,23 +367,36 @@ def test_add_remove_cube(self): cubes = set(self.config.cubes()) schema = self.repo.schema + self.assertEquals(sorted(schema['see_also']._rproperties.keys()), + sorted([('EmailThread', 'EmailThread'), ('Folder', 'Folder'), + ('Bookmark', 'Bookmark'), ('Bookmark', 'Note'), + ('Note', 'Note'), ('Note', 'Bookmark')])) try: - self.mh.cmd_remove_cube('email') - # file was there because it's an email dependancy, should have been removed - cubes.remove('email') - cubes.remove('file') - self.assertEquals(set(self.config.cubes()), cubes) - for ertype in ('Email', 'EmailThread', 'EmailPart', 'File', 'Image', - 'sender', 'in_thread', 'reply_to', 'data_format'): - self.failIf(ertype in schema, ertype) - self.assertEquals(sorted(schema['see_also']._rproperties.keys()), - [('Folder', 'Folder')]) - self.assertEquals(schema['see_also'].subjects(), ('Folder',)) - self.assertEquals(schema['see_also'].objects(), ('Folder',)) - self.assertEquals(self.execute('Any X WHERE X pkey "system.version.email"').rowcount, 0) - self.assertEquals(self.execute('Any X WHERE X pkey "system.version.file"').rowcount, 0) - self.failIf('email' in self.config.cubes()) - self.failIf('file' in self.config.cubes()) + try: + self.mh.cmd_remove_cube('email') + # file was there because it's an email dependancy, should have been removed + cubes.remove('email') + cubes.remove('file') + self.assertEquals(set(self.config.cubes()), cubes) + for ertype in ('Email', 'EmailThread', 'EmailPart', 'File', 'Image', + 'sender', 'in_thread', 'reply_to', 'data_format'): + self.failIf(ertype in schema, ertype) + self.assertEquals(sorted(schema['see_also']._rproperties.keys()), + sorted([('Folder', 'Folder'), + ('Bookmark', 'Bookmark'), + ('Bookmark', 'Note'), + ('Note', 'Note'), + ('Note', 'Bookmark')])) + self.assertEquals(sorted(schema['see_also'].subjects()), ['Bookmark', 'Folder', 'Note']) + self.assertEquals(sorted(schema['see_also'].objects()), ['Bookmark', 'Folder', 'Note']) + self.assertEquals(self.execute('Any X WHERE X pkey "system.version.email"').rowcount, 0) + self.assertEquals(self.execute('Any X WHERE X pkey "system.version.file"').rowcount, 0) + self.failIf('email' in self.config.cubes()) + self.failIf('file' in self.config.cubes()) + except : + import traceback + traceback.print_exc() + raise finally: self.mh.cmd_add_cube('email') cubes.add('email') @@ -390,9 +406,13 @@ 'sender', 'in_thread', 'reply_to', 'data_format'): self.failUnless(ertype in schema, ertype) self.assertEquals(sorted(schema['see_also']._rproperties.keys()), - [('EmailThread', 'EmailThread'), ('Folder', 'Folder')]) - self.assertEquals(sorted(schema['see_also'].subjects()), ['EmailThread', 'Folder']) - self.assertEquals(sorted(schema['see_also'].objects()), ['EmailThread', 'Folder']) + sorted([('EmailThread', 'EmailThread'), ('Folder', 'Folder'), + ('Bookmark', 'Bookmark'), + ('Bookmark', 'Note'), + ('Note', 'Note'), + ('Note', 'Bookmark')])) + self.assertEquals(sorted(schema['see_also'].subjects()), ['Bookmark', 'EmailThread', 'Folder', 'Note']) + self.assertEquals(sorted(schema['see_also'].objects()), ['Bookmark', 'EmailThread', 'Folder', 'Note']) from cubes.email.__pkginfo__ import version as email_version from cubes.file.__pkginfo__ import version as file_version self.assertEquals(self.execute('Any V WHERE X value V, X pkey "system.version.email"')[0][0], @@ -407,6 +427,16 @@ # why this commit is necessary is unclear to me (though without it # next test may fail complaining of missing tables self.commit() + + def test_set_state(self): + user = self.session.user + self.set_debug(True) + self.mh.set_state(user.eid, 'deactivated') + user.clear_related_cache('in_state', 'subject') + try: + self.assertEquals(user.state, 'deactivated') + finally: + self.set_debug(False) if __name__ == '__main__': unittest_main() diff -r a81d3babb582 -r 9d61b146f505 server/test/unittest_msplanner.py --- a/server/test/unittest_msplanner.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/test/unittest_msplanner.py Wed Apr 15 17:36:09 2009 +0200 @@ -48,6 +48,12 @@ {'X': 'Societe'}, {'X': 'State'}, {'X': 'SubDivision'}, {'X': 'Tag'}, {'X': 'TrInfo'}, {'X': 'Transition'}]) +def clear_ms_caches(repo): + clear_cache(repo, 'rel_type_sources') + clear_cache(repo, 'can_cross_relation') + clear_cache(repo, 'is_multi_sources_relation') + # XXX source_defs + # keep cnx so it's not garbage collected and the associated session is closed repo, cnx = init_test_database('sqlite') @@ -90,6 +96,7 @@ repo.sources_by_uri['cards'] = self.sources[-1] self.rql = self.sources[-1] do_monkey_patch() + clear_ms_caches(repo) def tearDown(self): undo_monkey_patch() @@ -118,19 +125,19 @@ def _test(self, rql, *args): if len(args) == 3: - kwargs, sourcesvars, needsplit = args + kwargs, sourcesterms, needsplit = args else: - sourcesvars, needsplit = args + sourcesterms, needsplit = args kwargs = None plan = self._prepare_plan(rql, kwargs) union = plan.rqlst plan.preprocess(union) ppi = PartPlanInformation(plan, union.children[0]) - for sourcevars in ppi._sourcesvars.itervalues(): + for sourcevars in ppi._sourcesterms.itervalues(): for var in sourcevars.keys(): solindices = sourcevars.pop(var) sourcevars[var._ms_table_key()] = solindices - self.assertEquals(ppi._sourcesvars, sourcesvars) + self.assertEquals(ppi._sourcesterms, sourcesterms) self.assertEquals(ppi.needsplit, needsplit) @@ -163,7 +170,7 @@ """ ueid = self.session.user.eid self._test('Any X WHERE X eid %(x)s', {'x': ueid}, - {}, False) + {self.system: {'x': s[0]}}, False) def test_simple_invariant(self): """retrieve EUser X from system source only (X is invariant and in_group not supported by ldap source) @@ -241,8 +248,11 @@ def test_complex_optional(self): ueid = self.session.user.eid self._test('Any U WHERE WF wf_info_for X, X eid %(x)s, WF owned_by U?, WF from_state FS', {'x': ueid}, - {self.system: {'WF': s[0], 'FS': s[0], 'U': s[0], 'from_state': s[0], 'owned_by': s[0], 'wf_info_for': s[0]}}, False) - + {self.system: {'WF': s[0], 'FS': s[0], 'U': s[0], + 'from_state': s[0], 'owned_by': s[0], 'wf_info_for': s[0], + 'x': s[0]}}, + False) + def test_exists4(self): """ State S could come from both rql source and system source, @@ -253,29 +263,99 @@ 'EXISTS(X copain T, T login L, T login in ("comme", "cochon")) OR ' 'EXISTS(X in_state S, S name "pascontent", NOT X copain T2, T2 login "billy")', {self.system: {'X': s[0], 'S': s[0], 'T2': s[0], 'T': s[0], 'G': s[0], 'copain': s[0], 'in_group': s[0]}, - self.ldap: {'X': s[0], 'T2': s[0], 'T': s[0]}}, True) + self.ldap: {'X': s[0], 'T2': s[0], 'T': s[0]}}, + True) def test_relation_need_split(self): self._test('Any X, S WHERE X in_state S', {self.system: {'X': s[0, 1, 2], 'S': s[0, 1, 2]}, - self.rql: {'X': s[2], 'S': s[2]}}, True) + self.rql: {'X': s[2], 'S': s[2]}}, + True) + + def test_not_relation_need_split(self): + self._test('Any SN WHERE NOT X in_state S, S name SN', + {self.rql: {'X': s[2], 'S': s[0, 1, 2]}, + self.system: {'X': s[0, 1, 2], 'S': s[0, 1, 2]}}, + True) + + def test_not_relation_no_split_external(self): + repo._type_source_cache[999999] = ('Note', 'cards', 999999) + # similar to the above test but with an eid coming from the external source. + # the same plan may be used, since we won't find any record in the system source + # linking 9999999 to a state + self._test('Any SN WHERE NOT X in_state S, X eid %(x)s, S name SN', + {'x': 999999}, + {self.rql: {'x': s[0], 'S': s[0]}, + self.system: {'x': s[0], 'S': s[0]}}, + False) def test_relation_restriction_ambigous_need_split(self): self._test('Any X,T WHERE X in_state S, S name "pending", T tags X', {self.system: {'X': s[0, 1, 2], 'S': s[0, 1, 2], 'T': s[0, 1, 2], 'tags': s[0, 1, 2]}, - self.rql: {'X': s[2], 'S': s[2]}}, True) + self.rql: {'X': s[2], 'S': s[2]}}, + True) def test_simplified_var(self): repo._type_source_cache[999999] = ('Note', 'cards', 999999) self._test('Any U WHERE U in_group G, (G name IN ("managers", "logilab") OR (X require_permission P?, P name "bla", P require_group G)), X eid %(x)s, U eid %(u)s', {'x': 999999, 'u': self.session.user.eid}, - {self.system: {'P': s[0], 'G': s[0], 'X': s[0], 'require_permission': s[0], 'in_group': s[0], 'P': s[0], 'require_group': s[0]}}, False) + {self.system: {'P': s[0], 'G': s[0], 'X': s[0], + 'require_permission': s[0], 'in_group': s[0], 'P': s[0], 'require_group': s[0], + 'u': s[0]}}, + False) def test_delete_relation1(self): ueid = self.session.user.eid self._test('Any X, Y WHERE X created_by Y, X eid %(x)s, NOT Y eid %(y)s', {'x': ueid, 'y': ueid}, - {self.system: {'Y': s[0], 'created_by': s[0]}}, False) + {self.system: {'Y': s[0], 'created_by': s[0], 'x': s[0]}}, + False) + + def test_crossed_relation_eid_1_needattr(self): + repo._type_source_cache[999999] = ('Note', 'system', 999999) + ueid = self.session.user.eid + self._test('Any Y,T WHERE X eid %(x)s, X multisource_crossed_rel Y, Y type T', + {'x': 999999,}, + {self.rql: {'Y': s[0]}, self.system: {'Y': s[0], 'x': s[0]}}, + True) + + def test_crossed_relation_eid_1_invariant(self): + repo._type_source_cache[999999] = ('Note', 'system', 999999) + self._test('Any Y WHERE X eid %(x)s, X multisource_crossed_rel Y', + {'x': 999999}, + {self.system: {'Y': s[0], 'x': s[0]}}, + False) + + def test_crossed_relation_eid_2_invariant(self): + repo._type_source_cache[999999] = ('Note', 'cards', 999999) + self._test('Any Y WHERE X eid %(x)s, X multisource_crossed_rel Y', + {'x': 999999,}, + {self.rql: {'Y': s[0], 'multisource_crossed_rel': s[0], 'x': s[0]}, + self.system: {'Y': s[0], 'multisource_crossed_rel': s[0], 'x': s[0]}}, + False) + + def test_version_crossed_depends_on_1(self): + repo._type_source_cache[999999] = ('Note', 'cards', 999999) + self._test('Any X,AD,AE WHERE E eid %(x)s, E multisource_crossed_rel X, X in_state AD, AD name AE', + {'x': 999999}, + {self.rql: {'X': s[0], 'AD': s[0], 'multisource_crossed_rel': s[0], 'x': s[0]}, + self.system: {'X': s[0], 'AD': s[0], 'multisource_crossed_rel': s[0], 'x': s[0]}}, + True) + + def test_version_crossed_depends_on_2(self): + repo._type_source_cache[999999] = ('Note', 'system', 999999) + self._test('Any X,AD,AE WHERE E eid %(x)s, E multisource_crossed_rel X, X in_state AD, AD name AE', + {'x': 999999}, + {self.rql: {'X': s[0], 'AD': s[0]}, + self.system: {'X': s[0], 'AD': s[0], 'x': s[0]}}, + True) + + def test_simplified_var_3(self): + repo._type_source_cache[999999] = ('Note', 'cards', 999999) + repo._type_source_cache[999998] = ('State', 'cards', 999998) + self._test('Any S,T WHERE S eid %(s)s, N eid %(n)s, N type T, N is Note, S is State', + {'n': 999999, 's': 999998}, + {self.rql: {'s': s[0], 'N': s[0]}}, False) @@ -1142,50 +1222,40 @@ # in the source where %(x)s is not coming from and will be removed during rql # generation for the external source self._test('Any SN WHERE NOT X in_state S, X eid %(x)s, S name SN', - [('OneFetchStep', [('Any SN WHERE NOT 5 in_state S, S name SN, S is State', [{'S': 'State', 'SN': 'String'}])], + [('OneFetchStep', [('Any SN WHERE NOT 5 in_state S, S name SN, S is State', + [{'S': 'State', 'SN': 'String'}])], None, None, [self.rql, self.system], {}, [])], {'x': ueid}) def test_not_relation_no_split_external(self): repo._type_source_cache[999999] = ('Note', 'cards', 999999) - # similar to the above test but with an eid coming from the external source + # similar to the above test but with an eid coming from the external source. + # the same plan may be used, since we won't find any record in the system source + # linking 9999999 to a state self._test('Any SN WHERE NOT X in_state S, X eid %(x)s, S name SN', - [('UnionStep', None, None, - [('OneFetchStep', - [('Any SN WHERE NOT 999999 in_state S, S name SN, S is State', - [{'S': 'State', 'SN': 'String'}])], - None, None, [self.rql], {}, - []), - ('OneFetchStep', - [('Any SN WHERE S name SN, S is State', - [{'S': 'State', 'SN': 'String'}])], - None, None, [self.system], {}, - [])] - )], + [('OneFetchStep', [('Any SN WHERE NOT 999999 in_state S, S name SN, S is State', + [{'S': 'State', 'SN': 'String'}])], + None, None, [self.rql, self.system], {}, [])], {'x': 999999}) def test_not_relation_need_split(self): - ueid = self.session.user.eid self._test('Any SN WHERE NOT X in_state S, S name SN', - [('FetchStep', [('Any SN,S WHERE S name SN, S is State', [{'S': 'State', 'SN': 'String'}])], + [('FetchStep', [('Any SN,S WHERE S name SN, S is State', + [{'S': 'State', 'SN': 'String'}])], [self.rql, self.system], None, {'S': 'table0.C1', 'S.name': 'table0.C0', 'SN': 'table0.C0'}, []), - ('FetchStep', [('Any X WHERE X is Note', [{'X': 'Note'}])], - [self.rql, self.system], None, {'X': 'table1.C0'}, - []), ('IntersectStep', None, None, [('OneFetchStep', + [('Any SN WHERE NOT X in_state S, S name SN, S is State, X is Note', + [{'S': 'State', 'SN': 'String', 'X': 'Note'}])], + None, None, [self.rql, self.system], {}, + []), + ('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'}, {'S': 'State', 'SN': 'String', 'X': 'EUser'}])], None, None, [self.system], {'S': 'table0.C1', 'S.name': 'table0.C0', 'SN': 'table0.C0'}, - []), - ('OneFetchStep', - [('Any SN WHERE NOT X in_state S, S name SN, S is State, X is Note', - [{'S': 'State', 'SN': 'String', 'X': 'Note'}])], - None, None, [self.system], {'S': 'table0.C1', 'S.name': 'table0.C0', 'SN': 'table0.C0', - 'X': 'table1.C0'}, - [])] + []),] )]) def test_external_attributes_and_relation(self): @@ -1372,7 +1442,6 @@ def test_crossed_relation_eid_1_invariant(self): repo._type_source_cache[999999] = ('Note', 'system', 999999) - ueid = self.session.user.eid self._test('Any Y WHERE X eid %(x)s, X multisource_crossed_rel Y', [('OneFetchStep', [('Any Y WHERE 999999 multisource_crossed_rel Y', [{u'Y': 'Note'}])], None, None, [self.system], {}, []) @@ -1381,7 +1450,6 @@ def test_crossed_relation_eid_1_needattr(self): repo._type_source_cache[999999] = ('Note', 'system', 999999) - ueid = self.session.user.eid self._test('Any Y,T WHERE X eid %(x)s, X multisource_crossed_rel Y, Y type T', [('FetchStep', [('Any Y,T WHERE Y type T, Y is Note', [{'T': 'String', 'Y': 'Note'}])], [self.rql, self.system], None, @@ -1395,7 +1463,6 @@ def test_crossed_relation_eid_2_invariant(self): repo._type_source_cache[999999] = ('Note', 'cards', 999999) - ueid = self.session.user.eid self._test('Any Y WHERE X eid %(x)s, X multisource_crossed_rel Y', [('OneFetchStep', [('Any Y WHERE 999999 multisource_crossed_rel Y, Y is Note', [{'Y': 'Note'}])], None, None, [self.rql, self.system], {}, []) @@ -1404,22 +1471,25 @@ def test_crossed_relation_eid_2_needattr(self): repo._type_source_cache[999999] = ('Note', 'cards', 999999) - ueid = self.session.user.eid - self._test('Any Y,T WHERE X eid %(x)s, X multisource_crossed_rel Y, Y type T', + self._test('Any Y,T WHERE X eid %(x)s, X multisource_crossed_rel Y, Y type T', [('FetchStep', [('Any Y,T WHERE Y type T, Y is Note', [{'T': 'String', 'Y': 'Note'}])], [self.rql, self.system], None, {'T': 'table0.C1', 'Y': 'table0.C0', 'Y.type': 'table0.C1'}, []), - ('OneFetchStep', [('Any Y,T WHERE 999999 multisource_crossed_rel Y, Y type T, Y is Note', - [{'T': 'String', 'Y': 'Note'}])], - None, None, [self.rql, self.system], - {'T': 'table0.C1', 'Y': 'table0.C0', 'Y.type': 'table0.C1'}, - []) - ], + ('UnionStep', None, None, + [('OneFetchStep', [('Any Y,T WHERE 999999 multisource_crossed_rel Y, Y type T, Y is Note', + [{'T': 'String', 'Y': 'Note'}])], + None, None, [self.rql], None, + []), + ('OneFetchStep', [('Any Y,T WHERE 999999 multisource_crossed_rel Y, Y type T, Y is Note', + [{'T': 'String', 'Y': 'Note'}])], + None, None, [self.system], + {'T': 'table0.C1', 'Y': 'table0.C0', 'Y.type': 'table0.C1'}, + [])] + )], {'x': 999999,}) def test_crossed_relation_eid_not_1(self): repo._type_source_cache[999999] = ('Note', 'system', 999999) - ueid = self.session.user.eid self._test('Any Y WHERE X eid %(x)s, NOT X multisource_crossed_rel Y', [('FetchStep', [('Any Y WHERE Y is Note', [{'Y': 'Note'}])], [self.rql, self.system], None, {'Y': 'table0.C0'}, []), @@ -1431,14 +1501,12 @@ # def test_crossed_relation_eid_not_2(self): # repo._type_source_cache[999999] = ('Note', 'cards', 999999) -# ueid = self.session.user.eid # self._test('Any Y WHERE X eid %(x)s, NOT X multisource_crossed_rel Y', # [], # {'x': 999999,}) - def test_crossed_relation_base(self): + def test_crossed_relation_base_XXXFIXME(self): repo._type_source_cache[999999] = ('Note', 'system', 999999) - ueid = self.session.user.eid self._test('Any X,Y,T WHERE X multisource_crossed_rel Y, Y type T, X type T', [('FetchStep', [('Any X,T WHERE X type T, X is Note', [{'T': 'String', 'X': 'Note'}])], [self.rql, self.system], None, @@ -1446,12 +1514,18 @@ ('FetchStep', [('Any Y,T WHERE Y type T, Y is Note', [{'T': 'String', 'Y': 'Note'}])], [self.rql, self.system], None, {'T': 'table1.C1', 'Y': 'table1.C0', 'Y.type': 'table1.C1'}, []), - ('OneFetchStep', [('Any X,Y,T WHERE X multisource_crossed_rel Y, Y type T, X type T, X is Note, Y is Note', - [{'T': 'String', 'X': 'Note', 'Y': 'Note'}])], - None, None, [self.rql, self.system], - {'T': 'table1.C1', 'X': 'table0.C0', 'X.type': 'table0.C1', - 'Y': 'table1.C0', 'Y.type': 'table1.C1'}, - [])], + ('UnionStep', None, None, + [('OneFetchStep', [('Any X,Y,T WHERE X multisource_crossed_rel Y, Y type T, X type T, X is Note, Y is Note', + [{'T': 'String', 'X': 'Note', 'Y': 'Note'}])], + None, None, [self.rql], None, + []), + ('OneFetchStep', [('Any X,Y,T WHERE X multisource_crossed_rel Y, Y type T, X type T, X is Note, Y is Note', + [{'T': 'String', 'X': 'Note', 'Y': 'Note'}])], + None, None, [self.system], + {'T': 'table1.C1', 'X': 'table0.C0', 'X.type': 'table0.C1', + 'Y': 'table1.C0', 'Y.type': 'table1.C1'}, + [])] + )], {'x': 999999,}) # edition queries tests ################################################### @@ -1768,8 +1842,8 @@ [('FetchStep', [('Any X,AA,AB WHERE X login AA, X modification_date AB, X is EUser', [{'AA': 'String', 'AB': 'Datetime', 'X': 'EUser'}])], - [self.ldap], None, {'AA': 'table0.C1', 'AB': 'table0.C2', - 'X': 'table0.C0', 'X.login': 'table0.C1', 'X.modification_date': 'table0.C2'}, + [self.ldap, self.system], None, {'AA': 'table0.C1', 'AB': 'table0.C2', + 'X': 'table0.C0', 'X.login': 'table0.C1', 'X.modification_date': 'table0.C2'}, []), ('OneFetchStep', [('Any X,AA,AB ORDERBY AA WHERE 999999 owned_by X, X login AA, X modification_date AB, X is EUser', @@ -1799,7 +1873,7 @@ self._test('Any X ORDERBY Z DESC WHERE X modification_date Z, E eid %(x)s, E see_also X', [('FetchStep', [('Any X,Z WHERE X modification_date Z, X is Note', [{'X': 'Note', 'Z': 'Datetime'}])], - [self.rql], None, {'X': 'table0.C0', 'X.modification_date': 'table0.C1', 'Z': 'table0.C1'}, + [self.rql, self.system], None, {'X': 'table0.C0', 'X.modification_date': 'table0.C1', 'Z': 'table0.C1'}, []), ('AggrStep', 'Any X ORDERBY Z DESC', None, None, 'table1', None, @@ -1818,16 +1892,74 @@ )], {'x': 999999}) + def test_nonregr13_1(self): + # identity wrapped into exists: + # should'nt propagate constraint that U is in the same source as ME + self._test('Any B,U,UL GROUPBY B,U,UL WHERE B created_by U?, B is File ' + 'WITH U,UL BEING (Any U,UL WHERE ME eid %(x)s, (EXISTS(U identity ME) ' + 'OR (EXISTS(U in_group G, G name IN("managers", "staff")))) ' + 'OR (EXISTS(U in_group H, ME in_group H, NOT H name "users")), U login UL, U is EUser)', + [('FetchStep', [('Any U,UL WHERE U login UL, U is EUser', + [{'U': 'EUser', 'UL': 'String'}])], + [self.ldap, self.system], None, + {'U': 'table0.C0', 'U.login': 'table0.C1', 'UL': 'table0.C1'}, + []), + ('FetchStep', [('Any U,UL WHERE ((EXISTS(U identity 5)) OR (EXISTS(U in_group G, G name IN("managers", "staff"), G is EGroup))) OR (EXISTS(U in_group H, 5 in_group H, NOT H name "users", H is EGroup)), U login UL, U is EUser', + [{'G': 'EGroup', 'H': 'EGroup', 'U': 'EUser', 'UL': 'String'}])], + [self.system], + {'U': 'table0.C0', 'U.login': 'table0.C1', 'UL': 'table0.C1'}, + {'U': 'table1.C0', 'U.login': 'table1.C1', 'UL': 'table1.C1'}, + []), + ('OneFetchStep', [('Any B,U,UL GROUPBY B,U,UL WHERE B created_by U?, B is File', + [{'B': 'File', 'U': 'EUser', 'UL': 'String'}])], + None, None, [self.system], + {'U': 'table1.C0', 'UL': 'table1.C1'}, + [])], + {'x': self.session.user.eid}) + + def test_nonregr13_2(self): + # identity *not* wrapped into exists. + # + # XXX this test fail since in this case, in "U identity 5" U and 5 are + # from the same scope so constraints are applied (telling the U should + # come from the same source as user with eid 5). + # + # IMO this is normal, unless we introduce a special case for the + # identity relation. BUT I think it's better to leave it as is and to + # explain constraint propagation rules, and so why this should be + # wrapped in exists() if used in multi-source + self.skip('take a look at me if you wish') + self._test('Any B,U,UL GROUPBY B,U,UL WHERE B created_by U?, B is File ' + 'WITH U,UL BEING (Any U,UL WHERE ME eid %(x)s, (U identity ME ' + 'OR (EXISTS(U in_group G, G name IN("managers", "staff")))) ' + 'OR (EXISTS(U in_group H, ME in_group H, NOT H name "users")), U login UL, U is EUser)', + [('FetchStep', [('Any U,UL WHERE U login UL, U is EUser', + [{'U': 'EUser', 'UL': 'String'}])], + [self.ldap, self.system], None, + {'U': 'table0.C0', 'U.login': 'table0.C1', 'UL': 'table0.C1'}, + []), + ('FetchStep', [('Any U,UL WHERE ((U identity 5) OR (EXISTS(U in_group G, G name IN("managers", "staff"), G is EGroup))) OR (EXISTS(U in_group H, 5 in_group H, NOT H name "users", H is EGroup)), U login UL, U is EUser', + [{'G': 'EGroup', 'H': 'EGroup', 'U': 'EUser', 'UL': 'String'}])], + [self.system], + {'U': 'table0.C0', 'U.login': 'table0.C1', 'UL': 'table0.C1'}, + {'U': 'table1.C0', 'U.login': 'table1.C1', 'UL': 'table1.C1'}, + []), + ('OneFetchStep', [('Any B,U,UL GROUPBY B,U,UL WHERE B created_by U?, B is File', + [{'B': 'File', 'U': 'EUser', 'UL': 'String'}])], + None, None, [self.system], + {'U': 'table1.C0', 'UL': 'table1.C1'}, + [])], + {'x': self.session.user.eid}) + class MSPlannerTwoSameExternalSourcesTC(BasePlannerTC): """test planner related feature on a 3-sources repository: - * 2 rql source supporting Card + * 2 rql sources supporting Card """ repo = repo def setUp(self): - #_QuerierTC.setUp(self) self.o = repo.querier self.session = repo._sessions.values()[0] self.pool = self.session.set_pool() @@ -1844,7 +1976,11 @@ self.rql2 = self.sources[-1] do_monkey_patch() self.planner = MSPlanner(self.o.schema, self.o._rqlhelper) - + assert repo.sources_by_uri['cards2'].support_relation('multisource_crossed_rel') + assert 'multisource_crossed_rel' in repo.sources_by_uri['cards2'].cross_relations + assert repo.sources_by_uri['cards'].support_relation('multisource_crossed_rel') + assert 'multisource_crossed_rel' in repo.sources_by_uri['cards'].cross_relations + clear_ms_caches(repo) _test = test_plan def tearDown(self): @@ -1869,7 +2005,92 @@ {'X': 'table0.C0', 'X.title': 'table0.C1', 'XT': 'table0.C1'}, [])], {'t': 999999}) - + + def test_version_depends_on(self): + self.repo._type_source_cache[999999] = ('Note', 'cards', 999999) + self._test('Any X,AD,AE WHERE E eid %(x)s, E migrated_from X, X in_state AD, AD name AE', + [('FetchStep', [('Any X,AD,AE WHERE X in_state AD, AD name AE, AD is State, X is Note', + [{'AD': 'State', 'AE': 'String', 'X': 'Note'}])], + [self.rql, self.rql2, self.system], + None, {'AD': 'table0.C1', 'AD.name': 'table0.C2', + 'AE': 'table0.C2', 'X': 'table0.C0'}, + []), + ('OneFetchStep', [('Any X,AD,AE WHERE 999999 migrated_from X, AD name AE, AD is State, X is Note', + [{'AD': 'State', 'AE': 'String', 'X': 'Note'}])], + None, None, [self.system], + {'AD': 'table0.C1', 'AD.name': 'table0.C2', 'AE': 'table0.C2', 'X': 'table0.C0'}, + [])], + {'x': 999999}) + + def test_version_crossed_depends_on_1(self): + self.repo._type_source_cache[999999] = ('Note', 'cards', 999999) + self._test('Any X,AD,AE WHERE E eid %(x)s, E multisource_crossed_rel X, X in_state AD, AD name AE', + [('FetchStep', [('Any X,AD,AE WHERE X in_state AD, AD name AE, AD is State, X is Note', + [{'AD': 'State', 'AE': 'String', 'X': 'Note'}])], + [self.rql, self.rql2, self.system], + None, {'AD': 'table0.C1', 'AD.name': 'table0.C2', + 'AE': 'table0.C2', 'X': 'table0.C0'}, + []), + ('UnionStep', None, None, + [('OneFetchStep', [('Any X,AD,AE WHERE 999999 multisource_crossed_rel X, AD name AE, AD is State, X is Note', + [{'AD': 'State', 'AE': 'String', 'X': 'Note'}])], + None, None, [self.rql], None, + []), + ('OneFetchStep', [('Any X,AD,AE WHERE 999999 multisource_crossed_rel X, AD name AE, AD is State, X is Note', + [{'AD': 'State', 'AE': 'String', 'X': 'Note'}])], + None, None, [self.system], + {'AD': 'table0.C1', 'AD.name': 'table0.C2', + 'AE': 'table0.C2', 'X': 'table0.C0'}, + [])] + )], + {'x': 999999}) + + def test_version_crossed_depends_on_2(self): + self.repo._type_source_cache[999999] = ('Note', 'system', 999999) + self._test('Any X,AD,AE WHERE E eid %(x)s, E multisource_crossed_rel X, X in_state AD, AD name AE', + [('FetchStep', [('Any X,AD,AE WHERE X in_state AD, AD name AE, AD is State, X is Note', + [{'AD': 'State', 'AE': 'String', 'X': 'Note'}])], + [self.rql, self.rql2, self.system], + None, {'AD': 'table0.C1', 'AD.name': 'table0.C2', + 'AE': 'table0.C2', 'X': 'table0.C0'}, + []), + ('OneFetchStep', [('Any X,AD,AE WHERE 999999 multisource_crossed_rel X, AD name AE, AD is State, X is Note', + [{'AD': 'State', 'AE': 'String', 'X': 'Note'}])], + None, None, [self.system], + {'AD': 'table0.C1', 'AD.name': 'table0.C2', 'AE': 'table0.C2', 'X': 'table0.C0'}, + [])], + {'x': 999999}) + + def test_version_crossed_depends_on_3(self): + self._test('Any X,AD,AE WHERE E multisource_crossed_rel X, X in_state AD, AD name AE, E is Note', + [('FetchStep', [('Any X,AD,AE WHERE X in_state AD, AD name AE, AD is State, X is Note', + [{'AD': 'State', 'AE': 'String', 'X': 'Note'}])], + [self.rql, self.rql2, self.system], + None, {'AD': 'table0.C1', 'AD.name': 'table0.C2', + 'AE': 'table0.C2', 'X': 'table0.C0'}, + []), + ('FetchStep', [('Any E WHERE E is Note', [{'E': 'Note'}])], + [self.rql, self.rql2, self.system], + None, {'E': 'table1.C0'}, + []), + ('UnionStep', None, None, + [('OneFetchStep', [('Any X,AD,AE WHERE E multisource_crossed_rel X, AD name AE, AD is State, E is Note, X is Note', + [{'AD': 'State', 'AE': 'String', 'E': 'Note', 'X': 'Note'}])], + None, None, [self.rql, self.rql2], None, + []), + ('OneFetchStep', [('Any X,AD,AE WHERE E multisource_crossed_rel X, AD name AE, AD is State, E is Note, X is Note', + [{'AD': 'State', 'AE': 'String', 'E': 'Note', 'X': 'Note'}])], + None, None, [self.system], + {'AD': 'table0.C1', + 'AD.name': 'table0.C2', + 'AE': 'table0.C2', + 'E': 'table1.C0', + 'X': 'table0.C0'}, + [])] + )] + ) + + if __name__ == '__main__': from logilab.common.testlib import unittest_main unittest_main() diff -r a81d3babb582 -r 9d61b146f505 server/test/unittest_multisources.py --- a/server/test/unittest_multisources.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/test/unittest_multisources.py Wed Apr 15 17:36:09 2009 +0200 @@ -10,10 +10,13 @@ sourcefile = 'sources_multi' -class ExternalSourceConfiguration(TestServerConfiguration): +class ExternalSource1Configuration(TestServerConfiguration): sourcefile = 'sources_extern' + +class ExternalSource2Configuration(TestServerConfiguration): + sourcefile = 'sources_multi2' -repo2, cnx2 = init_test_database('sqlite', config=ExternalSourceConfiguration('data')) +repo2, cnx2 = init_test_database('sqlite', config=ExternalSource1Configuration('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"') @@ -22,9 +25,11 @@ MTIME = now() - 0.1 +repo3, cnx3 = init_test_database('sqlite', config=ExternalSource2Configuration('data')) + # XXX, access existing connection, no pyro connection from cubicweb.server.sources.pyrorql import PyroRQLSource -PyroRQLSource.get_connection = lambda x: cnx2 +PyroRQLSource.get_connection = lambda x: x.uri == 'extern-multi' and cnx3 or cnx2 # necessary since the repository is closing its initial connections pool though # we want to keep cnx2 valid from cubicweb.dbapi import Connection @@ -84,12 +89,12 @@ 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.repo.sources_by_uri['extern'].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.repo.sources_by_uri['extern'].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 @@ -98,7 +103,7 @@ cnx = self.login('anon') cu = cnx.cursor() rset = cu.execute('Any X WHERE X has_text "card"') - self.assertEquals(len(rset), 5) + self.assertEquals(len(rset), 5, zip(rset.rows, rset.description)) def test_synchronization(self): cu = cnx2.cursor() @@ -107,13 +112,14 @@ cnx2.commit() try: # force sync - self.repo.sources[-1].synchronize(MTIME) + self.repo.sources_by_uri['extern'].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"')) + self.repo.sources_by_uri['extern'].synchronize(MTIME) + rset = self.execute('Any X WHERE X has_text "affreux"') + self.failIf(rset) finally: # restore state cu.execute('SET X ref "AFFREF" WHERE X eid %(x)s', {'x': aff1}, 'x') @@ -139,7 +145,8 @@ 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) + iec1 = self.repo.extid2eid(self.repo.sources_by_uri['extern'], 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])) diff -r a81d3babb582 -r 9d61b146f505 server/test/unittest_querier.py --- a/server/test/unittest_querier.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/test/unittest_querier.py Wed Apr 15 17:36:09 2009 +0200 @@ -9,7 +9,9 @@ from mx.DateTime import today, now, DateTimeType from rql import BadRQLQuery, RQLSyntaxError + from cubicweb import QueryError, Unauthorized +from cubicweb.server.sqlutils import SQL_PREFIX from cubicweb.server.utils import crypt_password from cubicweb.server.sources.native import make_schema @@ -454,7 +456,7 @@ 'WHERE RT name N, RDEF relation_type RT ' 'HAVING COUNT(RDEF) > 10') self.assertListEquals(rset.rows, - [[u'description', 11], ['in_basket', 12], + [[u'description', 11], ['in_basket', 11], [u'name', 13], [u'created_by', 33], [u'creation_date', 33], [u'is', 33], [u'is_instance_of', 33], [u'modification_date', 33], [u'owned_by', 33]]) @@ -468,6 +470,7 @@ self.assertEquals(rset.rows[0][0], self.ueid) def test_select_complex_sort(self): + self.skip('retry me once http://www.sqlite.org/cvstrac/tktview?tn=3773 is fixed') rset = self.execute('Any X ORDERBY X,D LIMIT 5 WHERE X creation_date D') result = rset.rows result.sort() @@ -1072,7 +1075,8 @@ self.assertRaises(Unauthorized, self.execute, "Any P WHERE X is EUser, X login 'bob', X upassword P") cursor = self.pool['system'] - cursor.execute("SELECT upassword from EUser WHERE login='bob'") + cursor.execute("SELECT %supassword from %sEUser WHERE %slogin='bob'" + % (SQL_PREFIX, SQL_PREFIX, SQL_PREFIX)) passwd = cursor.fetchone()[0].getvalue() self.assertEquals(passwd, crypt_password('toto', passwd[:2])) rset = self.execute("Any X WHERE X is EUser, X login 'bob', X upassword '%s'" % passwd) @@ -1085,7 +1089,8 @@ self.assertEquals(rset.description[0][0], 'EUser') rset = self.execute("SET X upassword %(pwd)s WHERE X is EUser, X login 'bob'", {'pwd': 'tutu'}) - cursor.execute("SELECT upassword from EUser WHERE login='bob'") + cursor.execute("SELECT %supassword from %sEUser WHERE %slogin='bob'" + % (SQL_PREFIX, SQL_PREFIX, SQL_PREFIX)) passwd = cursor.fetchone()[0].getvalue() self.assertEquals(passwd, crypt_password('tutu', passwd[:2])) rset = self.execute("Any X WHERE X is EUser, X login 'bob', X upassword '%s'" % passwd) @@ -1212,6 +1217,7 @@ cause: old variable ref inserted into a fresh rqlst copy (in RQLSpliter._complex_select_plan) """ + self.skip('retry me once http://www.sqlite.org/cvstrac/tktview?tn=3773 is fixed') self.execute('Any X ORDERBY D DESC WHERE X creation_date D') def test_nonregr_extra_joins(self): diff -r a81d3babb582 -r 9d61b146f505 server/test/unittest_repository.py --- a/server/test/unittest_repository.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/test/unittest_repository.py Wed Apr 15 17:36:09 2009 +0200 @@ -8,17 +8,18 @@ from copy import deepcopy from mx.DateTime import DateTimeType, now + from logilab.common.testlib import TestCase, unittest_main -from cubicweb.devtools.apptest import RepositoryBasedTC -from cubicweb.devtools.repotest import tuplify from yams.constraints import UniqueConstraint from cubicweb import BadConnectionId, RepositoryError, ValidationError, UnknownEid, AuthenticationError from cubicweb.schema import CubicWebSchema, RQLConstraint from cubicweb.dbapi import connect, repo_connect - +from cubicweb.devtools.apptest import RepositoryBasedTC +from cubicweb.devtools.repotest import tuplify from cubicweb.server import repository +from cubicweb.server.sqlutils import SQL_PREFIX # start name server anyway, process will fail if already running @@ -46,11 +47,16 @@ self.repo.config._cubes = None # avoid assertion error self.repo.fill_schema() pool = self.repo._get_pool() + table = SQL_PREFIX + 'EEType' + namecol = SQL_PREFIX + 'name' + finalcol = SQL_PREFIX + 'final' try: sqlcursor = pool['system'] - sqlcursor.execute('SELECT name FROM EEType WHERE final is NULL') + sqlcursor.execute('SELECT %s FROM %s WHERE %s is NULL' % ( + namecol, table, finalcol)) self.assertEquals(sqlcursor.fetchall(), []) - sqlcursor.execute('SELECT name FROM EEType WHERE final=%(final)s ORDER BY name', {'final': 'TRUE'}) + sqlcursor.execute('SELECT %s FROM %s WHERE %s=%%(final)s ORDER BY %s' + % (namecol, table, finalcol, namecol), {'final': 'TRUE'}) self.assertEquals(sqlcursor.fetchall(), [(u'Boolean',), (u'Bytes',), (u'Date',), (u'Datetime',), (u'Decimal',),(u'Float',), diff -r a81d3babb582 -r 9d61b146f505 server/test/unittest_rql2sql.py --- a/server/test/unittest_rql2sql.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/test/unittest_rql2sql.py Wed Apr 15 17:36:09 2009 +0200 @@ -31,111 +31,111 @@ PARSER = [ (r"Personne P WHERE P nom 'Zig\'oto';", - '''SELECT P.eid -FROM Personne AS P -WHERE P.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.eid -FROM Personne AS P -WHERE P.nom ILIKE Zig"oto%'''), + '''SELECT P.cw_eid +FROM cw_Personne AS P +WHERE P.cw_nom ILIKE Zig"oto%'''), ] BASIC = [ - + ("Any X WHERE X is Affaire", - '''SELECT X.eid -FROM Affaire AS X'''), + '''SELECT X.cw_eid +FROM cw_Affaire AS X'''), ("Any X WHERE X eid 0", '''SELECT 0'''), ("Personne P", - '''SELECT P.eid -FROM Personne AS P'''), + '''SELECT P.cw_eid +FROM cw_Personne AS P'''), ("Personne P WHERE P test TRUE", - '''SELECT P.eid -FROM Personne AS P -WHERE P.test=True'''), + '''SELECT P.cw_eid +FROM cw_Personne AS P +WHERE P.cw_test=True'''), ("Personne P WHERE P test false", - '''SELECT P.eid -FROM Personne AS P -WHERE P.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.eid -FROM 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 Societe AS S, travaille_relation AS rel_travaille0 -WHERE rel_travaille0.eid_to=S.eid AND S.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 Societe AS S, concerne_relation AS rel_concerne0, concerne_relation AS rel_concerne1 -WHERE rel_concerne0.eid_to=rel_concerne1.eid_from AND rel_concerne1.eid_to=S.eid AND S.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 Division AS X, evaluee_relation AS rel_evaluee0 -WHERE rel_evaluee0.eid_from=X.eid AND X.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 Personne AS X, evaluee_relation AS rel_evaluee0 -WHERE rel_evaluee0.eid_from=X.eid AND X.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 Societe AS X, evaluee_relation AS rel_evaluee0 -WHERE rel_evaluee0.eid_from=X.eid AND X.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 SubDivision AS X, evaluee_relation AS rel_evaluee0 -WHERE rel_evaluee0.eid_from=X.eid AND X.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 Division AS X, evaluee_relation AS rel_evaluee0 -WHERE rel_evaluee0.eid_from=X.eid AND X.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 Personne AS X, evaluee_relation AS rel_evaluee0 -WHERE rel_evaluee0.eid_from=X.eid AND X.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 Societe AS X, evaluee_relation AS rel_evaluee0 -WHERE rel_evaluee0.eid_from=X.eid AND X.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 SubDivision AS X, evaluee_relation AS rel_evaluee0 -WHERE rel_evaluee0.eid_from=X.eid AND X.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.eid -FROM Affaire AS X -WHERE DATE(X.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 EGroup, G name N, E eid 12, E read_permission G", - '''SELECT G.name -FROM EGroup AS G, read_permission_relation AS rel_read_permission0 -WHERE rel_read_permission0.eid_from=12 AND rel_read_permission0.eid_to=G.eid'''), + '''SELECT G.cw_name +FROM cw_EGroup 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.login -FROM EUser AS U -WHERE U.login=admin"""), + """SELECT U.cw_login +FROM cw_EUser AS U +WHERE U.cw_login=admin"""), ('Any T WHERE T tags X, X is State', '''SELECT rel_tags0.eid_from -FROM State AS X, tags_relation AS rel_tags0 -WHERE rel_tags0.eid_to=X.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 @@ -144,45 +144,40 @@ ("Any X WHERE X prenom 'lulu'," "EXISTS(X owned_by U, U in_group G, G name 'lulufanclub' OR G name 'managers');", - '''SELECT X.eid -FROM Personne AS X -WHERE X.prenom=lulu AND EXISTS(SELECT 1 FROM owned_by_relation AS rel_owned_by0, in_group_relation AS rel_in_group1, EGroup AS G WHERE rel_owned_by0.eid_from=X.eid AND rel_in_group1.eid_from=rel_owned_by0.eid_to AND rel_in_group1.eid_to=G.eid AND ((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_EGroup 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.eid -FROM Personne AS X -WHERE X.prenom=lulu AND NOT EXISTS(SELECT 1 FROM owned_by_relation AS rel_owned_by0, in_group_relation AS rel_in_group1, EGroup AS G WHERE rel_owned_by0.eid_from=X.eid AND rel_in_group1.eid_from=rel_owned_by0.eid_to AND rel_in_group1.eid_to=G.eid AND ((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_EGroup 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= [ - ('Any X WHERE X is ET, ET eid 2', - '''SELECT rel_is0.eid_from -FROM is_relation AS rel_is0 -WHERE rel_is0.eid_to=2'''), - ("Societe S WHERE S nom 'Logilab' OR S nom 'Caesium'", - '''SELECT S.eid -FROM Societe AS 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))'''), ('Any X WHERE X nom "toto", X eid IN (9700, 9710, 1045, 674)', - '''SELECT X.eid -FROM Division AS X -WHERE X.nom=toto AND 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) UNION ALL -SELECT X.eid -FROM Personne AS X -WHERE X.nom=toto AND X.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.eid -FROM Societe AS X -WHERE X.nom=toto AND X.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.eid -FROM SubDivision AS X -WHERE X.nom=toto AND X.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) @@ -190,34 +185,34 @@ GROUP BY rel_evaluee0.eid_from'''), ("Any X WHERE X concerne B or C concerne X", - '''SELECT X.eid -FROM Affaire AS X, concerne_relation AS rel_concerne0, concerne_relation AS rel_concerne1 -WHERE ((rel_concerne0.eid_from=X.eid) OR (rel_concerne1.eid_to=X.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.eid -FROM Personne AS X, concerne_relation AS rel_concerne1, travaille_relation AS rel_travaille0 -WHERE ((rel_travaille0.eid_from=X.eid) OR (rel_concerne1.eid_from=X.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.eid -FROM Note AS N, evaluee_relation AS rel_evaluee0 -WHERE ((rel_evaluee0.eid_to=N.eid) OR (N.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.eid -FROM Note AS N, evaluee_relation AS rel_evaluee0 -WHERE ((rel_evaluee0.eid_to=N.eid) OR (EXISTS(SELECT 1 FROM todo_by_relation AS rel_todo_by1 WHERE rel_todo_by1.eid_from=N.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.eid -FROM Note AS N, evaluee_relation AS rel_evaluee0, todo_by_relation AS rel_todo_by1 -WHERE ((rel_evaluee0.eid_to=N.eid) OR (rel_todo_by1.eid_from=N.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.eid -FROM Affaire AS X, concerne_relation AS rel_concerne0, concerne_relation AS rel_concerne1 -WHERE ((rel_concerne0.eid_from=X.eid AND rel_concerne0.eid_to=12) OR (rel_concerne1.eid_from=13 AND rel_concerne1.eid_to=X.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 @@ -225,9 +220,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.eid -FROM Personne AS P, SubDivision AS S1, SubDivision AS S2, travaille_subdivision_relation AS rel_travaille_subdivision0, travaille_subdivision_relation AS rel_travaille_subdivision1 -WHERE ((rel_travaille_subdivision0.eid_from=P.eid AND rel_travaille_subdivision0.eid_to=S1.eid) OR (rel_travaille_subdivision1.eid_from=P.eid AND rel_travaille_subdivision1.eid_to=S2.eid)) AND S1.nom=logilab AND 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'''), ('Any X WHERE T tags X', '''SELECT rel_tags0.eid_to @@ -239,31 +234,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.name, R.name, OE.name -FROM EEType AS OE, EEType AS SE, EFRDef AS X, ERType AS R -WHERE X.from_entity=44 AND SE.eid=44 AND X.relation_type=139 AND R.eid=139 AND X.to_entity=42 AND OE.eid=42 + '''SELECT SE.cw_name, R.cw_name, OE.cw_name +FROM cw_EEType AS OE, cw_EEType AS SE, cw_EFRDef AS X, cw_ERType 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.name, R.name, OE.name -FROM EEType AS OE, EEType AS SE, ENFRDef AS X, ERType AS R -WHERE X.from_entity=44 AND SE.eid=44 AND X.relation_type=139 AND R.eid=139 AND X.to_entity=42 AND OE.eid=42'''), +SELECT SE.cw_name, R.cw_name, OE.cw_name +FROM cw_EEType AS OE, cw_EEType AS SE, cw_ENFRDef AS X, cw_ERType 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'''), # 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 DISTINCT O.eid -FROM Note AS S, Personne AS O -WHERE (S.ecrit_par IS NULL OR S.ecrit_par!=O.eid) AND S.eid=1 AND O.inline2=S.inline1'''), + '''SELECT DISTINCT O.cw_eid +FROM cw_Note AS S, cw_Personne AS O +WHERE (S.cw_ecrit_par IS NULL OR 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.eid AS C0, STOCKPROC(S.para) AS C1 -FROM Note AS S -WHERE S.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.eid -FROM Note AS N, filed_under_relation AS rel_filed_under1, todo_by_relation AS rel_todo_by0 -WHERE rel_todo_by0.eid_from=N.eid AND rel_todo_by0.eid_to=2 AND rel_filed_under1.eid_from=N.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 @@ -277,103 +272,103 @@ 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.name -FROM EGroup AS G, in_group_relation AS rel_in_group0 -WHERE rel_in_group0.eid_to=G.eid AND ((G.name=managers) OR (EXISTS(SELECT 1 FROM copain_relation AS rel_copain1, EUser AS T WHERE rel_copain1.eid_from=rel_in_group0.eid_from AND rel_copain1.eid_to=T.eid AND T.login IN(comme, cochon))))'''), + '''SELECT G.cw_name +FROM cw_EGroup 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_EUser 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.eid -FROM Card AS C -WHERE EXISTS(SELECT 1 FROM documented_by_relation AS rel_documented_by0 WHERE rel_documented_by0.eid_to=C.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.eid -FROM 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.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.title -FROM 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.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.name, X.login -FROM EGroup AS G, EUser AS X, in_group_relation AS rel_in_group0 -WHERE rel_in_group0.eid_from=X.eid AND rel_in_group0.eid_to=G.eid AND EXISTS(SELECT 1 FROM copain_relation AS rel_copain1, EUser AS T WHERE rel_copain1.eid_from=X.eid AND rel_copain1.eid_to=T.eid AND T.login=X.login AND T.login IN(comme, cochon))'''), + '''SELECT G.cw_name, X.cw_login +FROM cw_EGroup AS G, cw_EUser 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_EUser 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 EUser, T tags X, S eid IN(32), X in_state S', - '''SELECT X.eid, 32, MAX(rel_tags0.eid_from) -FROM EUser AS X, tags_relation AS rel_tags0 -WHERE rel_tags0.eid_to=X.eid AND X.in_state=32 -GROUP BY X.eid'''), + '''SELECT X.cw_eid, 32, MAX(rel_tags0.eid_from) +FROM cw_EUser 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.nom -FROM Societe AS C, concerne_relation AS rel_concerne0 -WHERE rel_concerne0.eid_to=C.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, Card AS N WHERE rel_concerne0.eid_from=rel_documented_by2.eid_from AND rel_documented_by2.eid_to=N.eid AND N.title=published))) -GROUP BY C.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 EUser', '''SELECT rel_evaluee0.eid_to -FROM EUser AS Y, evaluee_relation AS rel_evaluee0 -WHERE rel_evaluee0.eid_from=Y.eid'''), +FROM cw_EUser 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.login -FROM EUser AS X, EUser AS Y -WHERE X.login=admin AND X.eid=Y.eid'''), + '''SELECT Y.cw_login +FROM cw_EUser AS X, cw_EUser 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.login -FROM EUser AS X, EUser AS Y -WHERE X.login=admin AND NOT X.eid=Y.eid'''), + '''SELECT Y.cw_login +FROM cw_EUser AS X, cw_EUser 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.login -FROM EUser AS X LEFT OUTER JOIN EUser AS Y ON (X.eid=Y.eid) -WHERE X.login=admin'''), + '''SELECT Y.cw_login +FROM cw_EUser AS X LEFT OUTER JOIN cw_EUser AS Y ON (X.cw_eid=Y.cw_eid) +WHERE X.cw_login=admin'''), ('Any XN ORDERBY XN WHERE X name XN', - '''SELECT X.name -FROM Basket AS X + '''SELECT X.cw_name +FROM cw_Basket AS X UNION ALL -SELECT X.name -FROM ECache AS X +SELECT X.cw_name +FROM cw_ECache AS X UNION ALL -SELECT X.name -FROM EConstraintType AS X +SELECT X.cw_name +FROM cw_EConstraintType AS X UNION ALL -SELECT X.name -FROM EEType AS X +SELECT X.cw_name +FROM cw_EEType AS X UNION ALL -SELECT X.name -FROM EGroup AS X +SELECT X.cw_name +FROM cw_EGroup AS X UNION ALL -SELECT X.name -FROM EPermission AS X +SELECT X.cw_name +FROM cw_EPermission AS X UNION ALL -SELECT X.name -FROM ERType AS X +SELECT X.cw_name +FROM cw_ERType AS X UNION ALL -SELECT X.name -FROM File AS X +SELECT X.cw_name +FROM cw_File AS X UNION ALL -SELECT X.name -FROM Folder AS X +SELECT X.cw_name +FROM cw_Folder AS X UNION ALL -SELECT X.name -FROM Image AS X +SELECT X.cw_name +FROM cw_Image AS X UNION ALL -SELECT X.name -FROM State AS X +SELECT X.cw_name +FROM cw_State AS X UNION ALL -SELECT X.name -FROM Tag AS X +SELECT X.cw_name +FROM cw_Tag AS X UNION ALL -SELECT X.name -FROM Transition AS X +SELECT X.cw_name +FROM cw_Transition AS X ORDER BY 1'''), # ('Any XN WHERE X name XN GROUPBY XN', @@ -383,180 +378,180 @@ # DISTINCT, can use relatin under exists scope as principal ('DISTINCT Any X,Y WHERE X name "EGroup", Y eid IN(1, 2, 3), EXISTS(X read_permission Y)', - '''SELECT DISTINCT X.eid, rel_read_permission0.eid_to -FROM EEType AS X, read_permission_relation AS rel_read_permission0 -WHERE X.name=EGroup AND rel_read_permission0.eid_to IN(1, 2, 3) AND EXISTS(SELECT 1 WHERE rel_read_permission0.eid_from=X.eid) + '''SELECT DISTINCT X.cw_eid, rel_read_permission0.eid_to +FROM cw_EEType AS X, read_permission_relation AS rel_read_permission0 +WHERE X.cw_name=EGroup 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.eid, rel_read_permission0.eid_to -FROM ERType AS X, read_permission_relation AS rel_read_permission0 -WHERE X.name=EGroup AND rel_read_permission0.eid_to IN(1, 2, 3) AND EXISTS(SELECT 1 WHERE rel_read_permission0.eid_from=X.eid)'''), +SELECT DISTINCT X.cw_eid, rel_read_permission0.eid_to +FROM cw_ERType AS X, read_permission_relation AS rel_read_permission0 +WHERE X.cw_name=EGroup 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 "EGroup", Y eid IN(1, 2, 3), EXISTS(X read_permission Y)', - '''SELECT X.eid, Y.eid -FROM EEType AS X, EGroup AS Y -WHERE X.name=EGroup AND Y.eid IN(1, 2, 3) AND EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=X.eid AND rel_read_permission0.eid_to=Y.eid) + '''SELECT X.cw_eid, Y.cw_eid +FROM cw_EEType AS X, cw_EGroup AS Y +WHERE X.cw_name=EGroup 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.eid, Y.eid -FROM EEType AS X, RQLExpression AS Y -WHERE X.name=EGroup AND Y.eid IN(1, 2, 3) AND EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=X.eid AND rel_read_permission0.eid_to=Y.eid) +SELECT X.cw_eid, Y.cw_eid +FROM cw_EEType AS X, cw_RQLExpression AS Y +WHERE X.cw_name=EGroup 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.eid, Y.eid -FROM EGroup AS Y, ERType AS X -WHERE X.name=EGroup AND Y.eid IN(1, 2, 3) AND EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=X.eid AND rel_read_permission0.eid_to=Y.eid) +SELECT X.cw_eid, Y.cw_eid +FROM cw_EGroup AS Y, cw_ERType AS X +WHERE X.cw_name=EGroup 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.eid, Y.eid -FROM ERType AS X, RQLExpression AS Y -WHERE X.name=EGroup AND Y.eid IN(1, 2, 3) AND EXISTS(SELECT 1 FROM read_permission_relation AS rel_read_permission0 WHERE rel_read_permission0.eid_from=X.eid AND rel_read_permission0.eid_to=Y.eid)'''), +SELECT X.cw_eid, Y.cw_eid +FROM cw_ERType AS X, cw_RQLExpression AS Y +WHERE X.cw_name=EGroup 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 "EGroup", Y eid IN(1, 2, 3), NOT EXISTS(X read_permission Y)', - '''SELECT DISTINCT X.eid, Y.eid -FROM EEType AS X, EGroup AS Y -WHERE X.name=EGroup AND Y.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.eid AND rel_read_permission0.eid_to=Y.eid) + '''SELECT DISTINCT X.cw_eid, Y.cw_eid +FROM cw_EEType AS X, cw_EGroup AS Y +WHERE X.cw_name=EGroup 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.eid, Y.eid -FROM EEType AS X, RQLExpression AS Y -WHERE X.name=EGroup AND Y.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.eid AND rel_read_permission0.eid_to=Y.eid) +SELECT DISTINCT X.cw_eid, Y.cw_eid +FROM cw_EEType AS X, cw_RQLExpression AS Y +WHERE X.cw_name=EGroup 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.eid, Y.eid -FROM EGroup AS Y, ERType AS X -WHERE X.name=EGroup AND Y.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.eid AND rel_read_permission0.eid_to=Y.eid) +SELECT DISTINCT X.cw_eid, Y.cw_eid +FROM cw_EGroup AS Y, cw_ERType AS X +WHERE X.cw_name=EGroup 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.eid, Y.eid -FROM ERType AS X, RQLExpression AS Y -WHERE X.name=EGroup AND Y.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.eid AND rel_read_permission0.eid_to=Y.eid)'''), +SELECT DISTINCT X.cw_eid, Y.cw_eid +FROM cw_ERType AS X, cw_RQLExpression AS Y +WHERE X.cw_name=EGroup 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 "EGroup", Y eid IN(1, 2, 3), NOT X read_permission Y', - '''SELECT DISTINCT X.eid, Y.eid -FROM EEType AS X, EGroup AS Y -WHERE X.name=EGroup AND Y.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.eid AND rel_read_permission0.eid_to=Y.eid) + '''SELECT DISTINCT X.cw_eid, Y.cw_eid +FROM cw_EEType AS X, cw_EGroup AS Y +WHERE X.cw_name=EGroup 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.eid, Y.eid -FROM EEType AS X, RQLExpression AS Y -WHERE X.name=EGroup AND Y.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.eid AND rel_read_permission0.eid_to=Y.eid) +SELECT DISTINCT X.cw_eid, Y.cw_eid +FROM cw_EEType AS X, cw_RQLExpression AS Y +WHERE X.cw_name=EGroup 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.eid, Y.eid -FROM EGroup AS Y, ERType AS X -WHERE X.name=EGroup AND Y.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.eid AND rel_read_permission0.eid_to=Y.eid) +SELECT DISTINCT X.cw_eid, Y.cw_eid +FROM cw_EGroup AS Y, cw_ERType AS X +WHERE X.cw_name=EGroup 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.eid, Y.eid -FROM ERType AS X, RQLExpression AS Y -WHERE X.name=EGroup AND Y.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.eid AND rel_read_permission0.eid_to=Y.eid)'''), +SELECT DISTINCT X.cw_eid, Y.cw_eid +FROM cw_ERType AS X, cw_RQLExpression AS Y +WHERE X.cw_name=EGroup 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 "EGroup", Y eid IN(1, 2, 3), NOT X read_permission Y', - '''SELECT X.eid, Y.eid -FROM EEType AS X, EGroup AS Y -WHERE X.name=EGroup AND Y.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.eid AND rel_read_permission0.eid_to=Y.eid) + '''SELECT X.cw_eid, Y.cw_eid +FROM cw_EEType AS X, cw_EGroup AS Y +WHERE X.cw_name=EGroup 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.eid, Y.eid -FROM EEType AS X, RQLExpression AS Y -WHERE X.name=EGroup AND Y.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.eid AND rel_read_permission0.eid_to=Y.eid) +SELECT X.cw_eid, Y.cw_eid +FROM cw_EEType AS X, cw_RQLExpression AS Y +WHERE X.cw_name=EGroup 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.eid, Y.eid -FROM EGroup AS Y, ERType AS X -WHERE X.name=EGroup AND Y.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.eid AND rel_read_permission0.eid_to=Y.eid) +SELECT X.cw_eid, Y.cw_eid +FROM cw_EGroup AS Y, cw_ERType AS X +WHERE X.cw_name=EGroup 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.eid, Y.eid -FROM ERType AS X, RQLExpression AS Y -WHERE X.name=EGroup AND Y.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.eid AND rel_read_permission0.eid_to=Y.eid)'''), +SELECT X.cw_eid, Y.cw_eid +FROM cw_ERType AS X, cw_RQLExpression AS Y +WHERE X.cw_name=EGroup 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;', - '''SELECT (MAX(T1.C0) + MIN(T1.C0)), T1.C1 FROM (SELECT X.eid AS C0, X.name AS C1 -FROM 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.eid AS C0, X.name AS C1 -FROM ECache AS X +SELECT X.cw_eid AS C0, X.cw_name AS C1 +FROM cw_ECache AS X UNION ALL -SELECT X.eid AS C0, X.name AS C1 -FROM EConstraintType AS X +SELECT X.cw_eid AS C0, X.cw_name AS C1 +FROM cw_EConstraintType AS X UNION ALL -SELECT X.eid AS C0, X.name AS C1 -FROM EEType AS X +SELECT X.cw_eid AS C0, X.cw_name AS C1 +FROM cw_EEType AS X UNION ALL -SELECT X.eid AS C0, X.name AS C1 -FROM EGroup AS X +SELECT X.cw_eid AS C0, X.cw_name AS C1 +FROM cw_EGroup AS X UNION ALL -SELECT X.eid AS C0, X.name AS C1 -FROM EPermission AS X +SELECT X.cw_eid AS C0, X.cw_name AS C1 +FROM cw_EPermission AS X UNION ALL -SELECT X.eid AS C0, X.name AS C1 -FROM ERType AS X +SELECT X.cw_eid AS C0, X.cw_name AS C1 +FROM cw_ERType AS X UNION ALL -SELECT X.eid AS C0, X.name AS C1 -FROM File AS X +SELECT X.cw_eid AS C0, X.cw_name AS C1 +FROM cw_File AS X UNION ALL -SELECT X.eid AS C0, X.name AS C1 -FROM Folder AS X +SELECT X.cw_eid AS C0, X.cw_name AS C1 +FROM cw_Folder AS X UNION ALL -SELECT X.eid AS C0, X.name AS C1 -FROM Image AS X +SELECT X.cw_eid AS C0, X.cw_name AS C1 +FROM cw_Image AS X UNION ALL -SELECT X.eid AS C0, X.name AS C1 -FROM State AS X +SELECT X.cw_eid AS C0, X.cw_name AS C1 +FROM cw_State AS X UNION ALL -SELECT X.eid AS C0, X.name AS C1 -FROM Tag AS X +SELECT X.cw_eid AS C0, X.cw_name AS C1 +FROM cw_Tag AS X UNION ALL -SELECT X.eid AS C0, X.name AS C1 -FROM Transition AS X) AS T1 +SELECT X.cw_eid AS C0, X.cw_name AS C1 +FROM cw_Transition AS X) AS T1 GROUP BY T1.C1'''), ('Any MAX(X)+MIN(LENGTH(D)), N GROUPBY N ORDERBY 1, N, DF WHERE X name N, X data D, X data_format DF;', - '''SELECT (MAX(T1.C1) + MIN(LENGTH(T1.C0))), T1.C2 FROM (SELECT X.data AS C0, X.eid AS C1, X.name AS C2, X.data_format AS C3 -FROM 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_name AS C2, X.cw_data_format AS C3 +FROM cw_File AS X UNION ALL -SELECT X.data AS C0, X.eid AS C1, X.name AS C2, X.data_format AS C3 -FROM Image AS X) AS T1 +SELECT X.cw_data AS C0, X.cw_eid AS C1, X.cw_name AS C2, X.cw_data_format AS C3 +FROM cw_Image AS X) AS T1 GROUP BY T1.C2 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.sujet AS C0, A.ref AS C1 -FROM 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 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.data AS C0, X.eid AS C1, X.name AS C2, X.data_format AS C3 -FROM 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_name AS C2, X.cw_data_format AS C3 +FROM cw_File AS X UNION -SELECT DISTINCT X.data AS C0, X.eid AS C1, X.name AS C2, X.data_format AS C3 -FROM Image AS X) AS T1 +SELECT DISTINCT X.cw_data AS C0, X.cw_eid AS C1, X.cw_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 (EUser, EGroup))', - '''SELECT T.eid -FROM Tag AS T -WHERE NOT (T.name IN(t1, t2)) AND EXISTS(SELECT 1 FROM tags_relation AS rel_tags0, EGroup AS X WHERE rel_tags0.eid_from=T.eid AND rel_tags0.eid_to=X.eid UNION SELECT 1 FROM tags_relation AS rel_tags1, EUser AS X WHERE rel_tags1.eid_from=T.eid AND rel_tags1.eid_to=X.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_EGroup 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_EUser 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.eid -FROM EUser AS U -WHERE U.eid IN(1, 2) AND EXISTS(SELECT 1 FROM owned_by_relation AS rel_owned_by0 WHERE rel_owned_by0.eid_to=U.eid)'''), + '''SELECT U.cw_eid +FROM cw_EUser 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.eid -FROM EUser AS U -WHERE EXISTS(SELECT 1 FROM owned_by_relation AS rel_owned_by0 WHERE U.eid IN(1, 2) AND rel_owned_by0.eid_to=U.eid)'''), + '''SELECT U.cw_eid +FROM cw_EUser 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.eid) -FROM EUser AS U -WHERE EXISTS(SELECT 1 FROM owned_by_relation AS rel_owned_by0, Affaire AS P WHERE rel_owned_by0.eid_from=P.eid AND rel_owned_by0.eid_to=U.eid UNION SELECT 1 FROM owned_by_relation AS rel_owned_by1, Note AS P WHERE rel_owned_by1.eid_from=P.eid AND rel_owned_by1.eid_to=U.eid)'''), + '''SELECT COUNT(U.cw_eid) +FROM cw_EUser 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'''), ('Any MAX(X) WHERE X is Note', - '''SELECT MAX(X.eid) -FROM Note AS X'''), + '''SELECT MAX(X.cw_eid) +FROM cw_Note AS X'''), ('Any X WHERE X eid > 12', '''SELECT X.eid @@ -569,17 +564,17 @@ WHERE X.type='Note' AND X.eid>12"""), ('Any X, T WHERE X eid > 12, X title T', - """SELECT X.eid, X.title -FROM Bookmark AS X -WHERE X.eid>12 + """SELECT X.cw_eid, X.cw_title +FROM cw_Bookmark AS X +WHERE X.cw_eid>12 UNION ALL -SELECT X.eid, X.title -FROM Card AS X -WHERE X.eid>12 +SELECT X.cw_eid, X.cw_title +FROM cw_Card AS X +WHERE X.cw_eid>12 UNION ALL -SELECT X.eid, X.title -FROM EmailThread AS X -WHERE X.eid>12"""), +SELECT X.cw_eid, X.cw_title +FROM cw_EmailThread AS X +WHERE X.cw_eid>12"""), ('Any X', '''SELECT X.eid @@ -589,11 +584,11 @@ '''SELECT 12'''), ('Any X GROUPBY X ORDERBY Y WHERE X eid 12, X login Y', - '''SELECT X.eid -FROM EUser AS X -WHERE X.eid=12 -GROUP BY X.eid -ORDER BY X.login'''), + '''SELECT X.cw_eid +FROM cw_EUser AS X +WHERE X.cw_eid=12 +GROUP BY X.cw_eid +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) @@ -603,80 +598,80 @@ 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.login AS C0, STOCKPROC(U.login) AS C1 -FROM EUser AS U + '''SELECT T1.C0 FROM (SELECT DISTINCT U.cw_login AS C0, STOCKPROC(U.cw_login) AS C1 +FROM cw_EUser 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.eid AS C0, X.login AS C1 -FROM EUser AS X, bookmarked_by_relation AS rel_bookmarked_by0 -WHERE rel_bookmarked_by0.eid_to=X.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_EUser 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.eid AS C0, S.name AS C1 -FROM Affaire AS X, State AS S -WHERE X.in_state=S.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.eid AS C0, S.name AS C1 -FROM EUser AS X, State AS S -WHERE X.in_state=S.eid +SELECT DISTINCT X.cw_eid AS C0, S.cw_name AS C1 +FROM cw_EUser AS X, cw_State AS S +WHERE X.cw_in_state=S.cw_eid UNION -SELECT DISTINCT X.eid AS C0, S.name AS C1 -FROM Note AS X, State AS S -WHERE X.in_state=S.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'''), ] MULTIPLE_SEL = [ ("DISTINCT Any X,Y where P is Personne, P nom X , P prenom Y;", - '''SELECT DISTINCT P.nom, P.prenom -FROM 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.nom, P.prenom -FROM Personne AS P -WHERE NOT (P.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.eid, Y.eid -FROM Personne AS X, Personne AS Y -WHERE Y.nom=X.nom AND NOT (Y.eid=X.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.eid -FROM Personne AS X -WHERE NOT EXISTS(SELECT 1 FROM evaluee_relation AS rel_evaluee0 WHERE rel_evaluee0.eid_from=X.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.eid -FROM 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.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.eid -FROM Personne AS X -WHERE NOT EXISTS(SELECT 1 FROM travaille_relation AS rel_travaille0 WHERE rel_travaille0.eid_from=X.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.eid -FROM Personne AS P -WHERE NOT (DATE(P.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.eid -FROM Personne AS P -WHERE NOT EXISTS(SELECT 1 FROM concerne_relation AS rel_concerne0 WHERE rel_concerne0.eid_from=P.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.eid -FROM Affaire AS A -WHERE NOT EXISTS(SELECT 1 FROM concerne_relation AS rel_concerne0 WHERE rel_concerne0.eid_to=A.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.eid -FROM Affaire AS A, Personne AS P -WHERE NOT EXISTS(SELECT 1 FROM concerne_relation AS rel_concerne0 WHERE rel_concerne0.eid_from=P.eid AND rel_concerne0.eid_to=A.eid) AND A.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 @@ -684,17 +679,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.eid -FROM EGroup AS S, Tag AS T, tags_relation AS rel_tags0 -WHERE NOT (T.eid=28258) AND rel_tags0.eid_from=T.eid AND rel_tags0.eid_to=S.eid + '''SELECT S.cw_eid +FROM cw_EGroup 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.eid -FROM State AS S, Tag AS T, tags_relation AS rel_tags0 -WHERE NOT (T.eid=28258) AND rel_tags0.eid_from=T.eid AND rel_tags0.eid_to=S.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.eid -FROM Tag AS S, Tag AS T, tags_relation AS rel_tags0 -WHERE NOT (T.eid=28258) AND rel_tags0.eid_from=T.eid AND rel_tags0.eid_to=S.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', @@ -703,260 +698,260 @@ WHERE rel_created_by0.eid_from=5 AND NOT (rel_created_by0.eid_to=6)'''), ('Note X WHERE NOT Y evaluee X', - '''SELECT X.eid -FROM Note AS X -WHERE NOT EXISTS(SELECT 1 FROM evaluee_relation AS rel_evaluee0 WHERE rel_evaluee0.eid_to=X.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.eid -FROM Division AS Y -WHERE NOT EXISTS(SELECT 1 FROM evaluee_relation AS rel_evaluee0 WHERE rel_evaluee0.eid_from=Y.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.eid -FROM EUser AS Y -WHERE NOT EXISTS(SELECT 1 FROM evaluee_relation AS rel_evaluee0 WHERE rel_evaluee0.eid_from=Y.eid) +SELECT Y.cw_eid +FROM cw_EUser 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.eid -FROM Personne AS Y -WHERE NOT EXISTS(SELECT 1 FROM evaluee_relation AS rel_evaluee0 WHERE rel_evaluee0.eid_from=Y.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.eid -FROM Societe AS Y -WHERE NOT EXISTS(SELECT 1 FROM evaluee_relation AS rel_evaluee0 WHERE rel_evaluee0.eid_from=Y.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.eid -FROM SubDivision AS Y -WHERE NOT EXISTS(SELECT 1 FROM evaluee_relation AS rel_evaluee0 WHERE rel_evaluee0.eid_from=Y.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 EUser', - '''SELECT X.eid -FROM Note AS X -WHERE NOT EXISTS(SELECT 1 FROM evaluee_relation AS rel_evaluee0,EUser AS Y WHERE rel_evaluee0.eid_from=Y.eid AND rel_evaluee0.eid_to=X.eid)'''), + '''SELECT X.cw_eid +FROM cw_Note AS X +WHERE NOT EXISTS(SELECT 1 FROM evaluee_relation AS rel_evaluee0,cw_EUser AS Y WHERE rel_evaluee0.eid_from=Y.cw_eid AND rel_evaluee0.eid_to=X.cw_eid)'''), ('Any X,T WHERE X title T, NOT X is Bookmark', - '''SELECT DISTINCT X.eid, X.title -FROM Card AS X + '''SELECT DISTINCT X.cw_eid, X.cw_title +FROM cw_Card AS X UNION -SELECT DISTINCT X.eid, X.title -FROM EmailThread AS X'''), +SELECT DISTINCT X.cw_eid, X.cw_title +FROM cw_EmailThread AS X'''), ('Any K,V WHERE P is EProperty, P pkey K, P value V, NOT P for_user U', - '''SELECT DISTINCT P.pkey, P.value -FROM EProperty AS P -WHERE P.for_user IS NULL'''), + '''SELECT DISTINCT P.cw_pkey, P.cw_value +FROM cw_EProperty AS P +WHERE P.cw_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) + '''SELECT DISTINCT S.cw_eid +FROM cw_Affaire AS X, cw_State AS S +WHERE (X.cw_in_state IS NULL OR X.cw_in_state!=S.cw_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)'''), +SELECT DISTINCT S.cw_eid +FROM cw_EUser AS X, cw_State AS S +WHERE (X.cw_in_state IS NULL OR X.cw_in_state!=S.cw_eid)'''), ] OUTER_JOIN = [ ('Any X,S WHERE X travaille S?', - '''SELECT X.eid, rel_travaille0.eid_to -FROM Personne AS X LEFT OUTER JOIN travaille_relation AS rel_travaille0 ON (rel_travaille0.eid_from=X.eid)''' -#SELECT X.eid, S.eid -#FROM Personne AS X LEFT OUTER JOIN travaille_relation AS rel_travaille0 ON (rel_travaille0.eid_from=X.eid) LEFT OUTER JOIN Societe AS S ON (rel_travaille0.eid_to=S.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)''' +#SELECT X.cw_eid, S.cw_eid +#FROM cw_Personne AS X LEFT OUTER JOIN travaille_relation AS rel_travaille0 ON (rel_travaille0.eid_from=X.cw_eid) LEFT OUTER JOIN cw_Societe AS S ON (rel_travaille0.eid_to=S.cw_eid)''' ), ('Any S,X WHERE X? travaille S, S is Societe', - '''SELECT S.eid, rel_travaille0.eid_from -FROM Societe AS S LEFT OUTER JOIN travaille_relation AS rel_travaille0 ON (rel_travaille0.eid_to=S.eid)''' -#SELECT S.eid, X.eid -#FROM Societe AS S LEFT OUTER JOIN travaille_relation AS rel_travaille0 ON (rel_travaille0.eid_to=S.eid) LEFT OUTER JOIN Personne AS X ON (rel_travaille0.eid_from=X.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)''' +#SELECT S.cw_eid, X.cw_eid +#FROM cw_Societe AS S LEFT OUTER JOIN travaille_relation AS rel_travaille0 ON (rel_travaille0.eid_to=S.cw_eid) LEFT OUTER JOIN cw_Personne AS X ON (rel_travaille0.eid_from=X.cw_eid)''' ), ('Any N,A WHERE N inline1 A?', - '''SELECT N.eid, N.inline1 -FROM 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.name -FROM TrInfo AS X LEFT OUTER JOIN State AS S ON (X.from_state=S.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.eid, N.eid -FROM Affaire AS A LEFT OUTER JOIN Note AS N ON (N.inline1=A.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.eid, A.creation_date, A.modification_date, A.comment, A.from_state, A.to_state, A.wf_info_for -FROM TrInfo AS A -WHERE A.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.from_state, WF.to_state, WF.comment, WF.creation_date, rel_owned_by0.eid_to -FROM TrInfo AS WF, owned_by_relation AS rel_owned_by0 -WHERE WF.wf_info_for=1 AND WF.to_state IS NOT NULL AND rel_owned_by0.eid_from=WF.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.eid -FROM Affaire AS X -WHERE EXISTS(SELECT 1 FROM owned_by_relation AS rel_owned_by0, EUser AS U, Affaire AS A LEFT OUTER JOIN concerne_relation AS rel_concerne1 ON (rel_concerne1.eid_from=A.eid) LEFT OUTER JOIN Societe AS S ON (rel_concerne1.eid_to=S.eid), owned_by_relation AS rel_owned_by2 WHERE ((rel_owned_by0.eid_from=A.eid AND rel_owned_by0.eid_to=U.eid) OR (rel_owned_by2.eid_from=S.eid AND rel_owned_by2.eid_to=U.eid)) AND X.eid=A.eid)'''), + '''SELECT X.cw_eid +FROM cw_Affaire AS X +WHERE EXISTS(SELECT 1 FROM owned_by_relation AS rel_owned_by0, cw_EUser 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.eid, rel_evaluee1.eid_to -FROM Personne AS C LEFT OUTER JOIN travaille_relation AS rel_travaille0 ON (rel_travaille0.eid_from=C.eid) LEFT OUTER JOIN Societe AS G ON (rel_travaille0.eid_to=G.eid) LEFT OUTER JOIN evaluee_relation AS rel_evaluee1 ON (rel_evaluee1.eid_from=G.eid)''' -#SELECT C.eid, M.eid -#FROM Personne AS C LEFT OUTER JOIN travaille_relation AS rel_travaille0 ON (rel_travaille0.eid_from=C.eid) LEFT OUTER JOIN Societe AS G ON (rel_travaille0.eid_to=G.eid) LEFT OUTER JOIN evaluee_relation AS rel_evaluee1 ON (rel_evaluee1.eid_from=G.eid) LEFT OUTER JOIN Note AS M ON (rel_evaluee1.eid_to=M.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)''' +#SELECT C.cw_eid, M.cw_eid +#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) LEFT OUTER JOIN cw_Note AS M ON (rel_evaluee1.eid_to=M.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.eid, rel_documented_by0.eid_to -FROM Affaire AS A LEFT OUTER JOIN documented_by_relation AS rel_documented_by0 ON (rel_documented_by0.eid_from=A.eid) -WHERE ((rel_documented_by0.eid_to IS NULL) OR (EXISTS(SELECT 1 FROM require_permission_relation AS rel_require_permission1, EPermission 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.eid AND F.name=read AND rel_require_group2.eid_from=F.eid AND rel_in_group3.eid_from=1 AND rel_in_group3.eid_to=rel_require_group2.eid_to)))'''), + '''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_EPermission 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.eid -FROM Personne AS X LEFT OUTER JOIN connait_relation AS rel_connait0 ON (rel_connait0.eid_to=12) -WHERE X.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''' #SELECT 12 -#FROM Personne AS X LEFT OUTER JOIN connait_relation AS rel_connait0 ON (rel_connait0.eid_to=12) LEFT OUTER JOIN Personne AS P ON (rel_connait0.eid_from=P.eid) -#WHERE X.eid=12''' +#FROM cw_Personne AS X LEFT OUTER JOIN connait_relation AS rel_connait0 ON (rel_connait0.eid_to=12) LEFT OUTER JOIN Personne AS P ON (rel_connait0.eid_from=P.cw_eid) +#WHERE X.cw_eid=12''' ), ('Any GN, TN ORDERBY GN WHERE T tags G?, T name TN, G name GN', - '''SELECT _T0.C1, T.name -FROM Tag AS T LEFT OUTER JOIN tags_relation AS rel_tags0 ON (rel_tags0.eid_from=T.eid) LEFT OUTER JOIN (SELECT G.eid AS C0, G.name AS C1 -FROM EGroup 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_EGroup AS G UNION ALL -SELECT G.eid AS C0, G.name AS C1 -FROM State AS G +SELECT G.cw_eid AS C0, G.cw_name AS C1 +FROM cw_State AS G UNION ALL -SELECT G.eid AS C0, G.name AS C1 -FROM 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 EGroup', - '''SELECT T.eid, G.eid -FROM Tag AS T LEFT OUTER JOIN tags_relation AS rel_tags0 ON (rel_tags0.eid_from=T.eid) LEFT OUTER JOIN EGroup AS G ON (rel_tags0.eid_to=G.eid AND G.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_EGroup 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.eid, rel_tags0.eid_to -FROM Tag AS T LEFT OUTER JOIN tags_relation AS rel_tags0 ON (rel_tags0.eid_from=T.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 EGroup', - '''SELECT T.eid, G.eid -FROM Tag AS T LEFT OUTER JOIN tags_relation AS rel_tags0 ON (rel_tags0.eid_from=T.eid) LEFT OUTER JOIN EGroup AS G ON (rel_tags0.eid_to=G.eid AND G.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_EGroup 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 EUser', - '''SELECT T.eid, G.eid, S.eid -FROM State AS S, Tag AS T LEFT OUTER JOIN tags_relation AS rel_tags0 ON (rel_tags0.eid_from=T.eid) LEFT OUTER JOIN EUser AS G ON (rel_tags0.eid_to=G.eid) -WHERE G.in_state=S.eid AND S.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_EUser 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 EUser', - '''SELECT rel_tags0.eid_from, G.eid, G.in_state -FROM EUser AS G, tags_relation AS rel_tags0 -WHERE rel_tags0.eid_to=G.eid AND (G.in_state=1 OR G.in_state IS NULL)'''), + '''SELECT rel_tags0.eid_from, G.cw_eid, G.cw_in_state +FROM cw_EUser 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 EUser', - '''SELECT T.eid, G.eid, G.in_state -FROM Tag AS T LEFT OUTER JOIN tags_relation AS rel_tags0 ON (rel_tags0.eid_from=T.eid) LEFT OUTER JOIN EUser AS G ON (rel_tags0.eid_to=G.eid AND (G.in_state=1 OR G.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_EUser 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 EUser', - '''SELECT T.eid, G.eid, S.eid -FROM Tag AS T LEFT OUTER JOIN tags_relation AS rel_tags0 ON (rel_tags0.eid_from=T.eid) LEFT OUTER JOIN EUser AS G ON (rel_tags0.eid_to=G.eid) LEFT OUTER JOIN State AS S ON (G.in_state=S.eid AND S.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_EUser 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.eid, _T0.C0, _T0.C1 -FROM Tag AS T LEFT OUTER JOIN tags_relation AS rel_tags0 ON (rel_tags0.eid_from=T.eid) LEFT OUTER JOIN (SELECT G.eid AS C0, S.eid AS C1 -FROM Affaire AS G LEFT OUTER JOIN State AS S ON (G.in_state=S.eid AND 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) UNION ALL -SELECT G.eid AS C0, S.eid AS C1 -FROM EUser AS G LEFT OUTER JOIN State AS S ON (G.in_state=S.eid AND S.name=hop) +SELECT G.cw_eid AS C0, S.cw_eid AS C1 +FROM cw_EUser 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.eid AS C0, S.eid AS C1 -FROM Note AS G LEFT OUTER JOIN State AS S ON (G.in_state=S.eid AND S.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)'''), ] VIRTUAL_VARS = [ ("Personne P WHERE P travaille S, S tel T, S fax T, S is Societe;", '''SELECT rel_travaille0.eid_from -FROM Societe AS S, travaille_relation AS rel_travaille0 -WHERE rel_travaille0.eid_to=S.eid AND S.fax=S.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.eid -FROM Affaire AS X, Personne AS P -WHERE X.eid=0 AND P.datenaiss1))', '''SELECT _T0.C0, _T0.C1 -FROM ((SELECT X.name AS C0, COUNT(X.eid) AS C1 -FROM State AS X -GROUP BY X.name -HAVING COUNT(X.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.name AS C0, COUNT(X.eid) AS C1 -FROM Transition AS X -GROUP BY X.name -HAVING COUNT(X.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.eid AS C0, X.name AS C1 -FROM State AS X) +FROM ((SELECT X.cw_eid AS C0, X.cw_name AS C1 +FROM cw_State AS X) UNION ALL -(SELECT X.eid AS C0, X.name AS C1 -FROM 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.name, COUNT(_T0.C0) -FROM ((SELECT X.eid AS C0 -FROM 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.eid AS C0 -FROM Affaire AS X -WHERE ((EXISTS(SELECT 1 FROM owned_by_relation AS rel_owned_by0 WHERE rel_owned_by0.eid_from=X.eid AND rel_owned_by0.eid_to=1)) OR (((EXISTS(SELECT 1 FROM Affaire AS D LEFT OUTER JOIN concerne_relation AS rel_concerne1 ON (rel_concerne1.eid_from=D.eid) LEFT OUTER JOIN Note AS B ON (rel_concerne1.eid_to=B.eid), owned_by_relation AS rel_owned_by2 WHERE rel_owned_by2.eid_from=B.eid AND rel_owned_by2.eid_to=1 AND X.eid=D.eid)) OR (EXISTS(SELECT 1 FROM Affaire AS F LEFT OUTER JOIN concerne_relation AS rel_concerne3 ON (rel_concerne3.eid_from=F.eid) LEFT OUTER JOIN Societe AS E ON (rel_concerne3.eid_to=E.eid), owned_by_relation AS rel_owned_by4 WHERE rel_owned_by4.eid_from=E.eid AND rel_owned_by4.eid_to=1 AND X.eid=F.eid))))))) AS _T0, EEType AS ET, is_relation AS rel_is0 -WHERE rel_is0.eid_from=_T0.C0 AND rel_is0.eid_to=ET.eid -GROUP BY ET.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_EEType 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 @@ -1304,33 +1353,33 @@ 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"', - """SELECT X.eid -FROM Basket AS X, appears AS appears0 -WHERE appears0.words @@ to_tsquery('default', 'toto&tata') AND appears0.uid=X.eid AND X.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.eid -FROM File AS X, appears AS appears0 -WHERE appears0.words @@ to_tsquery('default', 'toto&tata') AND appears0.uid=X.eid AND X.name=tutu +SELECT X.cw_eid +FROM appears AS appears0, cw_File 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.eid -FROM Folder AS X, appears AS appears0 -WHERE appears0.words @@ to_tsquery('default', 'toto&tata') AND appears0.uid=X.eid AND X.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 UNION ALL -SELECT X.eid -FROM Image AS X, appears AS appears0 -WHERE appears0.words @@ to_tsquery('default', 'toto&tata') AND appears0.uid=X.eid AND X.name=tutu +SELECT X.cw_eid +FROM appears AS appears0, cw_Image 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.eid -FROM State AS X, appears AS appears0 -WHERE appears0.words @@ to_tsquery('default', 'toto&tata') AND appears0.uid=X.eid AND X.name=tutu +SELECT X.cw_eid +FROM appears AS appears0, cw_State 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.eid -FROM Tag AS X, appears AS appears0 -WHERE appears0.words @@ to_tsquery('default', 'toto&tata') AND appears0.uid=X.eid AND X.name=tutu +SELECT X.cw_eid +FROM appears AS appears0, cw_Tag 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.eid -FROM Transition AS X, appears AS appears0 -WHERE appears0.words @@ to_tsquery('default', 'toto&tata') AND appears0.uid=X.eid AND X.name=tutu"""), +SELECT X.cw_eid +FROM appears AS appears0, cw_Transition 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 @@ -1343,7 +1392,7 @@ def test_from_clause_needed(self): queries = [("Any 1 WHERE EXISTS(T is EGroup, T name 'managers')", '''SELECT 1 -WHERE EXISTS(SELECT 1 FROM EGroup AS T WHERE T.name=managers)'''), +WHERE EXISTS(SELECT 1 FROM cw_EGroup 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)'''), @@ -1354,7 +1403,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, Affaire AS P WHERE rel_owned_by0.eid_from=P.eid AND rel_owned_by0.eid_to=1 UNION SELECT 1 FROM owned_by_relation AS rel_owned_by1, Note AS P WHERE rel_owned_by1.eid_from=P.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)''') class SqliteSQLGeneratorTC(PostgresSQLGeneratorTC): @@ -1370,19 +1419,19 @@ self.o = SQLGenerator(schema, dbms_helper) def _norm_sql(self, sql): - return sql.strip().replace(' ILIKE ', ' LIKE ') + return sql.strip().replace(' ILIKE ', ' LIKE ').replace('\nINTERSECT ALL\n', '\nINTERSECT\n') def test_union(self): for t in self._parse(( ('(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.name -FROM State AS X + '''SELECT X.cw_name +FROM cw_State AS X ORDER BY 1 UNION ALL -SELECT XX.name -FROM Transition AS XX +SELECT XX.cw_name +FROM cw_Transition AS XX ORDER BY 1'''), )): yield t @@ -1397,11 +1446,11 @@ ' UNION ' '(Any NN WHERE XX name NN, XX is Transition))', '''SELECT _T0.C0 -FROM (SELECT X.name AS C0 -FROM State AS X +FROM (SELECT X.cw_name AS C0 +FROM cw_State AS X UNION ALL -SELECT XX.name AS C0 -FROM 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 ' @@ -1409,26 +1458,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.name AS C0, COUNT(X.eid) AS C1 -FROM State AS X -GROUP BY X.name -HAVING COUNT(X.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.name AS C0, COUNT(X.eid) AS C1 -FROM Transition AS X -GROUP BY X.name -HAVING COUNT(X.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.eid AS C0, X.name AS C1 -FROM State AS X +FROM (SELECT X.cw_eid AS C0, X.cw_name AS C1 +FROM cw_State AS X UNION ALL -SELECT X.eid AS C0, X.name AS C1 -FROM 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'''), )): @@ -1452,33 +1501,33 @@ 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"', - """SELECT X.eid -FROM Basket AS X, appears AS appears0 -WHERE appears0.word_id IN (SELECT word_id FROM word WHERE word in ('toto', 'tata')) AND appears0.uid=X.eid AND X.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.eid -FROM File AS X, appears AS appears0 -WHERE appears0.word_id IN (SELECT word_id FROM word WHERE word in ('toto', 'tata')) AND appears0.uid=X.eid AND X.name=tutu +SELECT X.cw_eid +FROM appears AS appears0, cw_File 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.eid -FROM Folder AS X, appears AS appears0 -WHERE appears0.word_id IN (SELECT word_id FROM word WHERE word in ('toto', 'tata')) AND appears0.uid=X.eid AND X.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 UNION ALL -SELECT X.eid -FROM Image AS X, appears AS appears0 -WHERE appears0.word_id IN (SELECT word_id FROM word WHERE word in ('toto', 'tata')) AND appears0.uid=X.eid AND X.name=tutu +SELECT X.cw_eid +FROM appears AS appears0, cw_Image 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.eid -FROM State AS X, appears AS appears0 -WHERE appears0.word_id IN (SELECT word_id FROM word WHERE word in ('toto', 'tata')) AND appears0.uid=X.eid AND X.name=tutu +SELECT X.cw_eid +FROM appears AS appears0, cw_State 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.eid -FROM Tag AS X, appears AS appears0 -WHERE appears0.word_id IN (SELECT word_id FROM word WHERE word in ('toto', 'tata')) AND appears0.uid=X.eid AND X.name=tutu +SELECT X.cw_eid +FROM appears AS appears0, cw_Tag 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.eid -FROM Transition AS X, appears AS appears0 -WHERE appears0.word_id IN (SELECT word_id FROM word WHERE word in ('toto', 'tata')) AND appears0.uid=X.eid AND X.name=tutu"""), +SELECT X.cw_eid +FROM appears AS appears0, cw_Transition 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 @@ -1503,7 +1552,7 @@ queries = [("Any 1 WHERE EXISTS(T is EGroup, T name 'managers')", '''SELECT 1 FROM (SELECT 1) AS _T -WHERE EXISTS(SELECT 1 FROM EGroup AS T WHERE T.name=managers)'''), +WHERE EXISTS(SELECT 1 FROM cw_EGroup 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 @@ -1528,33 +1577,33 @@ 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"', - """SELECT X.eid -FROM Basket AS X, appears AS appears0 -WHERE MATCH (appears0.words) AGAINST ('toto tata' IN BOOLEAN MODE) AND appears0.uid=X.eid AND X.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.eid -FROM File AS X, appears AS appears0 -WHERE MATCH (appears0.words) AGAINST ('toto tata' IN BOOLEAN MODE) AND appears0.uid=X.eid AND X.name=tutu +SELECT X.cw_eid +FROM appears AS appears0, cw_File 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.eid -FROM Folder AS X, appears AS appears0 -WHERE MATCH (appears0.words) AGAINST ('toto tata' IN BOOLEAN MODE) AND appears0.uid=X.eid AND X.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 UNION ALL -SELECT X.eid -FROM Image AS X, appears AS appears0 -WHERE MATCH (appears0.words) AGAINST ('toto tata' IN BOOLEAN MODE) AND appears0.uid=X.eid AND X.name=tutu +SELECT X.cw_eid +FROM appears AS appears0, cw_Image 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.eid -FROM State AS X, appears AS appears0 -WHERE MATCH (appears0.words) AGAINST ('toto tata' IN BOOLEAN MODE) AND appears0.uid=X.eid AND X.name=tutu +SELECT X.cw_eid +FROM appears AS appears0, cw_State 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.eid -FROM Tag AS X, appears AS appears0 -WHERE MATCH (appears0.words) AGAINST ('toto tata' IN BOOLEAN MODE) AND appears0.uid=X.eid AND X.name=tutu +SELECT X.cw_eid +FROM appears AS appears0, cw_Tag 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.eid -FROM Transition AS X, appears AS appears0 -WHERE MATCH (appears0.words) AGAINST ('toto tata' IN BOOLEAN MODE) AND appears0.uid=X.eid AND X.name=tutu""") +SELECT X.cw_eid +FROM appears AS appears0, cw_Transition 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): yield t @@ -1564,7 +1613,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, Affaire AS P WHERE rel_owned_by0.eid_from=P.eid AND rel_owned_by0.eid_to=1 UNION SELECT 1 FROM owned_by_relation AS rel_owned_by1, Note AS P WHERE rel_owned_by1.eid_from=P.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)''') diff -r a81d3babb582 -r 9d61b146f505 server/test/unittest_rqlannotation.py --- a/server/test/unittest_rqlannotation.py Thu Jan 15 10:13:25 2009 +0100 +++ b/server/test/unittest_rqlannotation.py Wed Apr 15 17:36:09 2009 +0200 @@ -286,6 +286,12 @@ '(EXISTS(S owned_by 1)) OR (EXISTS(S documented_by N, N title "published"))') self.assertEquals(rqlst.defined_vars['S']._q_invariant, True) + def test_nonregr_ambiguity(self): + rqlst = self._prepare('Note N WHERE N attachment F') + # N may be an image as well, not invariant + self.assertEquals(rqlst.defined_vars['N']._q_invariant, False) + self.assertEquals(rqlst.defined_vars['F']._q_invariant, True) + if __name__ == '__main__': from logilab.common.testlib import unittest_main unittest_main() diff -r a81d3babb582 -r 9d61b146f505 skeleton/__pkginfo__.py.tmpl --- a/skeleton/__pkginfo__.py.tmpl Thu Jan 15 10:13:25 2009 +0100 +++ b/skeleton/__pkginfo__.py.tmpl Wed Apr 15 17:36:09 2009 +0200 @@ -1,6 +1,7 @@ # pylint: disable-msg=W0622 """%(distname)s application packaging information""" +modname = '%(cubename)s' distname = '%(distname)s' numversion = (0, 1, 0) @@ -10,8 +11,8 @@ copyright = '''Copyright (c) %(year)s %(author)s. %(author-web-site)s -- mailto:%(author-email)s''' -author = %(author)s' -author_email = %(author-email)s' +author = '%(author)s' +author_email = '%(author-email)s' short_desc = '%(shortdesc)s' long_desc = '''%(longdesc)s''' diff -r a81d3babb582 -r 9d61b146f505 sobjects/notification.py --- a/sobjects/notification.py Thu Jan 15 10:13:25 2009 +0100 +++ b/sobjects/notification.py Wed Apr 15 17:36:09 2009 +0200 @@ -160,8 +160,8 @@ def context(self, **kwargs): entity = self.entity(0, 0) for key, val in kwargs.iteritems(): - if val and val.strip(): - kwargs[key] = self.req._(val) + if val and isinstance(val, unicode) and val.strip(): + kwargs[key] = self.req._(val) kwargs.update({'user': self.user_login(), 'eid': entity.eid, 'etype': entity.dc_type(), diff -r a81d3babb582 -r 9d61b146f505 test/unittest_cwconfig.py --- a/test/unittest_cwconfig.py Thu Jan 15 10:13:25 2009 +0100 +++ b/test/unittest_cwconfig.py Wed Apr 15 17:36:09 2009 +0200 @@ -1,4 +1,6 @@ +import sys import os +from os.path import dirname, join, abspath from tempfile import mktemp from logilab.common.testlib import TestCase, unittest_main @@ -8,7 +10,7 @@ def unabsolutize(path): parts = path.split(os.sep) - for i, part in enumerate(parts): + for i, part in reversed(tuple(enumerate(parts))): if part in ('cubicweb', 'cubes', 'cubes'): return '/'.join(parts[i+1:]) raise Exception('duh? %s' % path) @@ -69,6 +71,36 @@ ['entities', 'web/views', 'sobjects', 'file/entities.py', 'file/views', 'file/hooks.py', 'email/entities.py', 'email/views', 'email/hooks.py']) - + + def test_cubes_path(self): + # make sure we don't import the email cube, but the stdlib email package + import email + self.assertNotEquals(dirname(email.__file__), self.config.CUBES_DIR) + os.environ['CW_CUBES_PATH'] = join(dirname(__file__), 'data', 'cubes') + self.assertEquals(self.config.cubes_search_path(), + [abspath(join(dirname(__file__), 'data', 'cubes')), + self.config.CUBES_DIR]) + os.environ['CW_CUBES_PATH'] = '%s%s%s%s%s' % (join(dirname(__file__), 'data', 'cubes'), + os.pathsep, self.config.CUBES_DIR, + os.pathsep, 'unexistant') + # filter out unexistant and duplicates + self.assertEquals(self.config.cubes_search_path(), + [abspath(join(dirname(__file__), 'data', 'cubes')), + self.config.CUBES_DIR]) + self.failUnless('mycube' in self.config.available_cubes()) + # test cubes python path + self.config.adjust_sys_path() + import cubes + self.assertEquals(cubes.__path__, self.config.cubes_search_path()) + # this import should succeed once path is adjusted + from cubes import mycube + self.assertEquals(mycube.__path__, [abspath(join(dirname(__file__), 'data', 'cubes', 'mycube'))]) + # file cube should be overriden by the one found in data/cubes + sys.modules.pop('cubes.file', None) + del cubes.file + from cubes import file + self.assertEquals(file.__path__, [abspath(join(dirname(__file__), 'data', 'cubes', 'file'))]) + + if __name__ == '__main__': unittest_main() diff -r a81d3babb582 -r 9d61b146f505 test/unittest_rset.py --- a/test/unittest_rset.py Thu Jan 15 10:13:25 2009 +0100 +++ b/test/unittest_rset.py Wed Apr 15 17:36:09 2009 +0200 @@ -300,7 +300,13 @@ attr = etype == 'Bookmark' and 'title' or 'name' self.assertEquals(entity[attr], n) - + def test_related_entity_optional(self): + e = self.add_entity('Bookmark', title=u'aaaa', path=u'path') + rset = self.execute('Any B,U,L WHERE B bookmarked_by U?, U login L') + entity, rtype = rset.related_entity(0, 2) + self.assertEquals(entity, None) + self.assertEquals(rtype, None) + def test_related_entity_union_subquery(self): e = self.add_entity('Bookmark', title=u'aaaa', path=u'path') rset = self.execute('Any X,N ORDERBY N WITH X,N BEING ' diff -r a81d3babb582 -r 9d61b146f505 test/unittest_schema.py --- a/test/unittest_schema.py Thu Jan 15 10:13:25 2009 +0100 +++ b/test/unittest_schema.py Wed Apr 15 17:36:09 2009 +0200 @@ -227,6 +227,7 @@ def setUp(self): self.loader = CubicWebSchemaLoader() self.loader.defined = {} + self.loader.loaded_files = [] self.loader._instantiate_handlers() def _test(self, schemafile, msg): diff -r a81d3babb582 -r 9d61b146f505 toolsutils.py --- a/toolsutils.py Thu Jan 15 10:13:25 2009 +0100 +++ b/toolsutils.py Wed Apr 15 17:36:09 2009 +0200 @@ -273,7 +273,7 @@ }), ("host", {'short': 'H', 'type' : 'string', 'metavar': '', - 'default': 'all-in-one', + 'default': None, 'help': 'specify the name server\'s host name. Will be detected by \ broadcast if not provided.', }), diff -r a81d3babb582 -r 9d61b146f505 vregistry.py --- a/vregistry.py Thu Jan 15 10:13:25 2009 +0100 +++ b/vregistry.py Wed Apr 15 17:36:09 2009 +0200 @@ -20,7 +20,7 @@ :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -105,7 +105,10 @@ "can't be used together") if '__select__' not in classdict and '__selectors__' in classdict: selectors = classdict['__selectors__'] - classdict['__select__'] = classmethod(chainall(*selectors)) + if len(selectors) > 1: + classdict['__select__'] = classmethod(chainall(*selectors)) + else: + classdict['__select__'] = classmethod(selectors[0]) return super(autoselectors, mcs).__new__(mcs, name, bases, classdict) def __setattr__(self, attr, value): diff -r a81d3babb582 -r 9d61b146f505 web/application.py --- a/web/application.py Thu Jan 15 10:13:25 2009 +0100 +++ b/web/application.py Wed Apr 15 17:36:09 2009 +0200 @@ -1,7 +1,7 @@ """CubicWeb web client application object :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -317,6 +317,7 @@ try: ctrlid, rset = self.url_resolver.process(req, path) controller = self.select_controller(ctrlid, req) + req.update_search_state() result = controller.publish(rset=rset) if req.cnx is not None: # req.cnx is None if anonymous aren't allowed and we are diff -r a81d3babb582 -r 9d61b146f505 web/box.py --- a/web/box.py Thu Jan 15 10:13:25 2009 +0100 +++ b/web/box.py Wed Apr 15 17:36:09 2009 +0200 @@ -14,9 +14,9 @@ accepts_registerer, extresources_registerer, etype_rtype_priority_registerer) from cubicweb.common.selectors import ( - etype_rtype_selector, one_line_rset, accept_selector, accept_rtype_selector, - primaryview_selector, contextprop_selector, has_related_entities, - _rqlcondition_selector) + etype_rtype_selector, one_line_rset, accept, has_relation, + primary_view, match_context_prop, has_related_entities, + _rql_condition) from cubicweb.common.view import Template from cubicweb.common.appobject import ReloadableMixIn @@ -42,7 +42,7 @@ box.render(self.w) """ __registry__ = 'boxes' - __selectors__ = Template.__selectors__ + (contextprop_selector,) + __selectors__ = Template.__selectors__ + (match_context_prop,) categories_in_order = () property_defs = { @@ -150,17 +150,15 @@ class EntityBoxTemplate(BoxTemplate): """base class for boxes related to a single entity""" __registerer__ = accepts_registerer - __selectors__ = (one_line_rset, primaryview_selector, - contextprop_selector, etype_rtype_selector, - accept_rtype_selector, accept_selector, - _rqlcondition_selector) + __selectors__ = (one_line_rset, primary_view, + match_context_prop, etype_rtype_selector, + has_relation, accept, _rql_condition) accepts = ('Any',) context = 'incontext' condition = None def call(self, row=0, col=0, **kwargs): - """classes inheriting from EntityBoxTemplate should defined cell_call, - """ + """classes inheriting from EntityBoxTemplate should define cell_call""" self.cell_call(row, col, **kwargs) @@ -185,7 +183,7 @@ class attributes. """ - def cell_call(self, row, col): + def cell_call(self, row, col, view=None): self.req.add_js('cubicweb.ajax.js') entity = self.entity(row, col) box = SideBoxWidget(display_name(self.req, self.rtype), self.id) diff -r a81d3babb582 -r 9d61b146f505 web/component.py --- a/web/component.py Thu Jan 15 10:13:25 2009 +0100 +++ b/web/component.py Wed Apr 15 17:36:09 2009 +0200 @@ -56,7 +56,10 @@ condition = None def call(self, view): - raise RuntimeError() + return self.cell_call(0, 0, view) + + def cell_call(self, row, col, view): + raise NotImplementedError() class NavigationComponent(VComponent): @@ -70,6 +73,19 @@ selected_page_link_templ = u'%s' previous_page_link_templ = next_page_link_templ = page_link_templ no_previous_page_link = no_next_page_link = u'' + + @classmethod + def selected(cls, req, rset, row=None, col=None, page_size=None, **kwargs): + """by default web app objects are usually instantiated on + selection according to a request, a result set, and optional + row and col + """ + instance = super(NavigationComponent, cls).selected(req, rset, row, col, **kwargs) + if page_size is not None: + instance.page_size = page_size + elif 'page_size' in req.form: + instance.page_size = int(req.form['page_size']) + return instance def __init__(self, req, rset): super(NavigationComponent, self).__init__(req, rset) @@ -145,17 +161,17 @@ """ return None - def call(self, view=None): + def cell_call(self, row, col, view=None): rql = self.rql() if rql is None: - entity = self.rset.get_entity(0, 0) + entity = self.rset.get_entity(row, col) if self.target == 'object': role = 'subject' else: role = 'object' rset = entity.related(self.rtype, role) else: - eid = self.rset[0][0] + eid = self.rset[row][col] rset = self.req.execute(self.rql(), {'x': eid}, 'x') if not rset.rowcount: return diff -r a81d3babb582 -r 9d61b146f505 web/controller.py --- a/web/controller.py Thu Jan 15 10:13:25 2009 +0100 +++ b/web/controller.py Wed Apr 15 17:36:09 2009 +0200 @@ -11,7 +11,7 @@ from cubicweb import typed_eid from cubicweb.common.registerers import priority_registerer -from cubicweb.common.selectors import in_group_selector +from cubicweb.common.selectors import match_user_group from cubicweb.common.appobject import AppObject from cubicweb.web import LOGGER, Redirect, RequestError @@ -68,7 +68,7 @@ """ __registry__ = 'controllers' __registerer__ = priority_registerer - __selectors__ = (in_group_selector,) + __selectors__ = (match_user_group,) require_groups = () def __init__(self, *args, **kwargs): diff -r a81d3babb582 -r 9d61b146f505 web/data/cubicweb.ajax.js --- a/web/data/cubicweb.ajax.js Thu Jan 15 10:13:25 2009 +0100 +++ b/web/data/cubicweb.ajax.js Wed Apr 15 17:36:09 2009 +0200 @@ -9,8 +9,29 @@ var JSON_BASE_URL = baseuri() + 'json?'; +function postAjaxLoad(node) { + // find sortable tables if there are some + if (typeof(Sortable) != 'undefined') { + Sortable.sortTables(node); + } + // find textareas and wrap them if there are some + if (typeof(FCKeditor) != 'undefined') { + buildWysiwygEditors(node); + } + if (typeof initFacetBoxEvents != 'undefined') { + initFacetBoxEvents(node); + } + if (typeof buildWidgets != 'undefined') { + buildWidgets(node); + } + if (typeof roundedCornersOnLoad != 'undefined') { + roundedCornersOnLoad(); + } +} + // cubicweb loadxhtml plugin to make jquery handle xhtml response jQuery.fn.loadxhtml = function(url, data, reqtype, mode) { + var ajax = null; if (reqtype == 'post') { ajax = jQuery.post; @@ -27,6 +48,7 @@ delete data.callback; } var node = this.get(0); // only consider the first element + ajax = jQuery.post; ajax(url, data, function(response) { var domnode = getDomFromResponse(response); if (mode == 'swap') { @@ -40,28 +62,12 @@ } else if (mode == 'append') { jQuery(node).append(domnode); } - // find sortable tables if there are some - if (typeof(Sortable) != 'undefined') { - Sortable.sortTables(node); - } - // find textareas and wrap them if there are some - if (typeof(FCKeditor) != 'undefined') { - buildWysiwygEditors(node); - } - - if (typeof initFacetBoxEvents != 'undefined') { - initFacetBoxEvents(node); - } - - if (typeof buildWidgets != 'undefined') { - buildWidgets(node); - } - + postAjaxLoad(node); while (jQuery.isFunction(callback)) { callback = callback.apply(this, [domnode]); } }); -} +}; @@ -69,7 +75,7 @@ * the associated RQL to build them (Async call) */ function loadDynamicFragments() { - var fragments = getElementsByTagAndClassName('div', 'dynamicFragment'); + var fragments = jQuery('div.dynamicFragment'); if (fragments.length == 0) { return; } @@ -277,7 +283,7 @@ * while the page was generated. */ function unregisterUserCallback(cbname) { - d = async_remote_exec('unregister_user_callback', cbname); + var d = async_remote_exec('unregister_user_callback', cbname); d.addCallback(function() {resetCursor();}); d.addErrback(function(xxx) { updateMessage(_("an error occured")); diff -r a81d3babb582 -r 9d61b146f505 web/data/cubicweb.calendar.css --- a/web/data/cubicweb.calendar.css Thu Jan 15 10:13:25 2009 +0100 +++ b/web/data/cubicweb.calendar.css Wed Apr 15 17:36:09 2009 +0200 @@ -73,10 +73,6 @@ text-align: right; } -table.omcalendar tr td div.calCellTitle div.stopper { - clear:pos; -} - table.omcalendar tr td { padding: 3px 0.5em 1em; } diff -r a81d3babb582 -r 9d61b146f505 web/data/cubicweb.calendar_popup.css --- a/web/data/cubicweb.calendar_popup.css Thu Jan 15 10:13:25 2009 +0100 +++ b/web/data/cubicweb.calendar_popup.css Wed Apr 15 17:36:09 2009 +0200 @@ -45,7 +45,7 @@ table.popupCalendar th.prev, table.popupCalendar th.next { - color: orangered; + color: #ff4500; font-size: 50%; font-weight: bold; padding: 2px 0px; diff -r a81d3babb582 -r 9d61b146f505 web/data/cubicweb.compat.js --- a/web/data/cubicweb.compat.js Thu Jan 15 10:13:25 2009 +0100 +++ b/web/data/cubicweb.compat.js Wed Apr 15 17:36:09 2009 +0200 @@ -242,7 +242,36 @@ UL = createDomFunction('ul'); // cubicweb specific -IFRAME = createDomFunction('iframe'); +//IFRAME = createDomFunction('iframe'); +function IFRAME(params){ + if ('name' in params){ + try { + var node = document.createElement('