aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Kuzminski <marcin@python-works.com>2011-06-06 17:30:34 +0200
committerMarcin Kuzminski <marcin@python-works.com>2011-06-06 17:30:34 +0200
commitb23b53b6e461a5335c960100dc605388735654fb (patch)
treed4208b71faf1a1c1e8a4944de4128f57a43186b5
parent9e639bbdc54efb9eda7e1599a7f6f24bf75338e1 (diff)
applied caching query update from latest sqlalchemy
--HG-- branch : beta
-rw-r--r--rhodecode/model/caching_query.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/rhodecode/model/caching_query.py b/rhodecode/model/caching_query.py
index 96e020ff..c7b8d333 100644
--- 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