# HG changeset patch # User Marcin Kuzminski # Date 2011-06-06 15:30:34 # Node ID cd865113423eeee6273577c0ef9a38f8fec5f5ba # Parent b6cac385cef0246de7b04ce0b21fec58ba13ab84 applied caching query update from latest sqlalchemy diff --git a/rhodecode/model/caching_query.py b/rhodecode/model/caching_query.py --- a/rhodecode/model/caching_query.py +++ b/rhodecode/model/caching_query.py @@ -276,6 +276,7 @@ def _params_from_query(query): v = [] def visit_bindparam(bind): value = query._params.get(bind.key, bind.value) + # lazyloader may dig a callable in here, intended # to late-evaluate params after autoflush is called. # convert to a scalar value. @@ -285,6 +286,4 @@ def _params_from_query(query): v.append(value) if query._criterion is not None: visitors.traverse(query._criterion, {}, {'bindparam':visit_bindparam}) - for f in query._from_obj: - visitors.traverse(f, {}, {'bindparam':visit_bindparam}) return v