diff -r 3b79a0fc91db -r c5aec27c1bf7 cwconfig.py --- a/cwconfig.py Mon Mar 08 09:51:29 2010 +0100 +++ b/cwconfig.py Mon Mar 08 17:57:29 2010 +0100 @@ -998,7 +998,7 @@ _EXT_REGISTERED = False def register_stored_procedures(): - from logilab.common.adbh import FunctionDescr + from logilab.db import FunctionDescr from rql.utils import register_function, iter_funcnode_variables global _EXT_REGISTERED @@ -1010,8 +1010,7 @@ supported_backends = ('postgres', 'sqlite',) rtype = 'String' - @classmethod - def st_description(cls, funcnode, mainindex, tr): + def st_description(self, funcnode, mainindex, tr): return ', '.join(sorted(term.get_description(mainindex, tr) for term in iter_funcnode_variables(funcnode))) @@ -1023,6 +1022,7 @@ register_function(CONCAT_STRINGS) # XXX bw compat + class GROUP_CONCAT(CONCAT_STRINGS): supported_backends = ('mysql', 'postgres', 'sqlite',) @@ -1033,8 +1033,7 @@ supported_backends = ('postgres', 'sqlite',) rtype = 'String' - @classmethod - def st_description(cls, funcnode, mainindex, tr): + def st_description(self, funcnode, mainindex, tr): return funcnode.children[0].get_description(mainindex, tr) register_function(LIMIT_SIZE) @@ -1046,7 +1045,6 @@ register_function(TEXT_LIMIT_SIZE) - class FSPATH(FunctionDescr): supported_backends = ('postgres', 'sqlite',) rtype = 'Bytes'