summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/util.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-01-10 11:43:47 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2012-01-10 11:43:47 -0500
commitf2568b9bdedd12427aaaed393c68dcf20691ea11 (patch)
tree46d6c04de66ceeb1d84aef63d6982bdb2317e2bb /lib/sqlalchemy/sql/util.py
parentd78d2d60aa30b0b6c3c230ddf3cafda2529e6409 (diff)
downloadsqlalchemy-f2568b9bdedd12427aaaed393c68dcf20691ea11.tar.gz
- Fixed regression from 0.6 whereby if
"load_on_pending" relationship() flag were used where a non-"get()" lazy clause needed to be emitted on a pending object, it would fail to load.
Diffstat (limited to 'lib/sqlalchemy/sql/util.py')
-rw-r--r--lib/sqlalchemy/sql/util.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py
index 33be99d87..97975441e 100644
--- a/lib/sqlalchemy/sql/util.py
+++ b/lib/sqlalchemy/sql/util.py
@@ -152,13 +152,7 @@ def bind_values(clause):
v = []
def visit_bindparam(bind):
- value = bind.value
-
- # evaluate callables
- if callable(value):
- value = value()
-
- v.append(value)
+ v.append(bind.effective_value)
visitors.traverse(clause, {}, {'bindparam':visit_bindparam})
return v