From f2568b9bdedd12427aaaed393c68dcf20691ea11 Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 10 Jan 2012 11:43:47 -0500
Subject: - 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.

---
 lib/sqlalchemy/sql/util.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'lib/sqlalchemy/sql/util.py')

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
-- 
cgit v1.2.1