- changed the name to "local/remote pairs"

- added closing ' to symbol str()  (I'm assuming it's supposed to be that way)

diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py
index fb10357cfb5c7bd7b0166d7bed894d4c8b42cfed..a171923fe948637a1acfdb6a4c1d721603cc8498 100644 (file)
--- a/lib/sqlalchemy/orm/properties.py
+++ b/lib/sqlalchemy/orm/properties.py
@@ -590,9 +590,9 @@ class PropertyLoader(StrategizedProperty):
         else:
             self.secondary_synchronize_pairs = None
     
-    def equated_pairs(self):
+    def local_remote_pairs(self):
         return zip(self.local_side, self.remote_side)
-    equated_pairs = property(equated_pairs)
+    local_remote_pairs = property(local_remote_pairs)
     
     def __determine_remote_side(self):
         if self.remote_side:
@@ -667,11 +667,12 @@ class PropertyLoader(StrategizedProperty):
 
     def _post_init(self):
         if logging.is_info_enabled(self.logger):
-            self.logger.info(str(self) + " setup primary join " + str(self.primaryjoin))
-            self.logger.info(str(self) + " setup secondary join " + str(self.secondaryjoin))
-            self.logger.info(str(self) + " synchronize pairs " + ",".join(["(%s => %s)" % (l, r) for l, r in self.synchronize_pairs]))
-            self.logger.info(str(self) + " equated pairs " + ",".join(["(%s == %s)" % (l, r) for l, r in self.equated_pairs]))
-            self.logger.info(str(self) + " relation direction " + (self.direction is ONETOMANY and "one-to-many" or (self.direction is MANYTOONE and "many-to-one" or "many-to-many")))
+            self.logger.info(str(self) + " setup primary join %s" % self.primaryjoin)
+            self.logger.info(str(self) + " setup secondary join %s" % self.secondaryjoin)
+            self.logger.info(str(self) + " synchronize pairs [%s]" % ",".join(["(%s => %s)" % (l, r) for l, r in self.synchronize_pairs]))
+            self.logger.info(str(self) + " secondary synchronize pairs [%s]" % ",".join(["(%s => %s)" % (l, r) for l, r in self.secondary_synchronize_pairs or []]))
+            self.logger.info(str(self) + " local/remote pairs [%s]" % ",".join(["(%s / %s)" % (l, r) for l, r in self.local_remote_pairs]))
+            self.logger.info(str(self) + " relation direction %s" % self.direction)
 
         if self.uselist is None and self.direction is MANYTOONE:
             self.uselist = False

diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index 6bd0d530f53c7ce7c9abe57143178fc1dd60fa02..e4c85b5d712fcf9a68b60ab2e0495909851ca583 100644 (file)
--- a/lib/sqlalchemy/orm/strategies.py
+++ b/lib/sqlalchemy/orm/strategies.py
@@ -354,7 +354,7 @@ class LazyLoader(AbstractRelationLoader):
         equated_columns = {}
 
         secondaryjoin = prop.secondaryjoin
-        equated = dict(prop.equated_pairs)
+        equated = dict(prop.local_remote_pairs)
         
         def should_bind(targetcol, othercol):
             if reverse_direction and not secondaryjoin:

diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py
index 101ef1462c9c0d792508e03ae3256746af00bdd1..ceabb39ebb04abc796ec0ea862b2cbc6a5d549d7 100644 (file)
--- a/lib/sqlalchemy/util.py
+++ b/lib/sqlalchemy/util.py
@@ -1026,7 +1026,7 @@ class _symbol(object):
     def __reduce__(self):
         return symbol, (self.name,)
     def __repr__(self):
-        return "<symbol '%s>" % self.name
+        return "<symbol '%s'>" % self.name
 _symbol.__name__ = 'symbol'
 
 class symbol(object):

diff --git a/test/orm/relationships.py b/test/orm/relationships.py
index 6583e5584fae6bab445815479798c5000e124e5f..89fd86f27578e8cacb060be2272097243bb5d9f1 100644 (file)
--- a/test/orm/relationships.py
+++ b/test/orm/relationships.py
@@ -973,7 +973,7 @@ class InvalidRelationEscalationTest(ORMTest):
             'foos':relation(Foo, primaryjoin=foos.c.id>foos.c.fid, viewonly=True, foreign_keys=[foos.c.fid])
         })
         compile_mappers()
-        self.assertEquals(Foo.foos.property.equated_pairs, [(foos.c.id, foos.c.fid)])
+        self.assertEquals(Foo.foos.property.local_remote_pairs, [(foos.c.id, foos.c.fid)])
 
     def test_equated(self):
         mapper(Foo, foos, properties={