fixed ticket 72, where a copied clause was using the identical bind param object...

diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py
index 666a9d18cfe202892354de733bc3831fe437c6b8..f88b3118fb394167387d1733c6690aede5b4e491 100644 (file)
--- a/lib/sqlalchemy/sql.py
+++ b/lib/sqlalchemy/sql.py
@@ -616,6 +616,8 @@ class BindParamClause(ClauseElement, CompareMixin):
         visitor.visit_bindparam(self)
     def _get_from_objects(self):
         return []
+    def copy_container(self):
+        return BindParamClause(self.key, self.value, self.shortname, self.type)
     def typeprocess(self, value, engine):
         return self._get_convert_type(engine).convert_bind_param(value, engine)
     def compare(self, other):

diff --git a/test/manytomany.py b/test/manytomany.py
index 611ac30c09df1aa2a735c6975d78ef87fe4a012f..4fe5298ca55dfbf47563bebb41a850037455513f 100644 (file)
--- a/test/manytomany.py
+++ b/test/manytomany.py
@@ -206,7 +206,66 @@ class M2MTest2(testbase.AssertMixin):
         del s.courses[1]
         self.assert_(len(s.courses) == 2)
         
-    
+class M2MTest3(testbase.AssertMixin):    
+       def setUpAll(self):
+               e = testbase.db
+               global c, c2a1, c2a2, b, a
+               c = Table('c', e, 
+                       Column('c1', Integer, primary_key = True),
+                       Column('c2', String(20)),
+               ).create()
+
+               a = Table('a', e, 
+                       Column('a1', Integer, primary_key=True),
+                       Column('a2', String(20)),
+                       Column('c1', Integer, ForeignKey('c.c1'))
+                       ).create()
+
+               c2a1 = Table('ctoaone', e, 
+                       Column('c1', Integer, ForeignKey('c.c1')),
+                       Column('a1', Integer, ForeignKey('a.a1'))
+               ).create()
+               c2a2 = Table('ctoatwo', e, 
+                       Column('c1', Integer, ForeignKey('c.c1')),
+                       Column('a1', Integer, ForeignKey('a.a1'))
+               ).create()
+
+               b = Table('b', e, 
+                       Column('b1', Integer, primary_key=True),
+                       Column('a1', Integer, ForeignKey('a.a1')),
+                       Column('b2', Boolean)
+               ).create()
+
+       def tearDownAll(self):
+               b.drop()
+               c2a2.drop()
+               c2a1.drop()
+               a.drop()
+               c.drop()
+
+       def testbasic(self):
+               class C(object):pass
+               class A(object):pass
+               class B(object):pass
+
+               assign_mapper(B, b)
+
+               assign_mapper(A, a, 
+                       properties = {
+                               'tbs' : relation(B, primaryjoin=and_(b.c.a1==a.c.a1, b.c.b2 == True), lazy=False),
+                       }
+               )
+
+               assign_mapper(C, c, 
+                       properties = {
+                               'a1s' : relation(A, secondary=c2a1, lazy=False),
+                               'a2s' : relation(A, secondary=c2a2, lazy=False)
+                       }
+               )
+
+               o1 = C.get(1)
+
+
 
 if __name__ == "__main__":    
     testbase.main()