fix to lazy loads when mapping to joins

diff --git a/CHANGES b/CHANGES
index 5dd60be3a3dfd85331f8c8035f4344e572a1b5ea..16f10e81a82ab77896cdd10b5266bf39dd79cf9b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -25,6 +25,7 @@ for sqlite applications that dispose of threads en masse)
 - fixed small pickle bug(s) with lazy loaders [ticket:265] [ticket:267]
 - fixed possible error in mysql reflection where certain versions
 return an array instead of string for SHOW CREATE TABLE call
+- fix to lazy loads when mapping to joins
 
 0.2.6
 - big overhaul to schema to allow truly composite primary and foreign

diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py
index f03feaa1c238f5eb16afc0e91c7d98edfb6dc64f..26717fb659fbb6bc1f6507abb8041f72bdbc9bc0 100644 (file)
--- a/lib/sqlalchemy/orm/properties.py
+++ b/lib/sqlalchemy/orm/properties.py
@@ -435,18 +435,20 @@ class LazyLoader(PropertyLoader):
 def create_lazy_clause(table, primaryjoin, secondaryjoin, foreignkey):
     binds = {}
     reverse = {}
+    def column_in_table(table, column):
+        return table.corresponding_column(column, raiseerr=False, keys_ok=False) is not None
+        
     def bind_label():
         return "lazy_" + hex(random.randint(0, 65535))[2:]
-    
     def visit_binary(binary):
         circular = isinstance(binary.left, schema.Column) and isinstance(binary.right, schema.Column) and binary.left.table is binary.right.table
-        if isinstance(binary.left, schema.Column) and isinstance(binary.right, schema.Column) and ((not circular and binary.left.table is table) or (circular and binary.right in foreignkey)):
+        if isinstance(binary.left, schema.Column) and isinstance(binary.right, schema.Column) and ((not circular and column_in_table(table, binary.left)) or (circular and binary.right in foreignkey)):
             col = binary.left
             binary.left = binds.setdefault(binary.left,
                     sql.BindParamClause(bind_label(), None, shortname=binary.left.name, type=binary.right.type))
             reverse[binary.right] = binds[col]
 
-        if isinstance(binary.right, schema.Column) and isinstance(binary.left, schema.Column) and ((not circular and binary.right.table is table) or (circular and binary.left in foreignkey)):
+        if isinstance(binary.right, schema.Column) and isinstance(binary.left, schema.Column) and ((not circular and column_in_table(table, binary.right)) or (circular and binary.left in foreignkey)):
             col = binary.right
             binary.right = binds.setdefault(binary.right,
                     sql.BindParamClause(bind_label(), None, shortname=binary.right.name, type=binary.left.type))