- ugh ! beta4 is double logging....fixed that....

- added test/fixed eager aliasizing for self-referential m2m relations

2 files changed, 10 insertions, 8 deletions

diff --git a/lib/sqlalchemy/logging.py b/lib/sqlalchemy/logging.py
index caaecf302..44b83b253 100644
--- a/lib/sqlalchemy/logging.py
+++ b/lib/sqlalchemy/logging.py
@@ -67,11 +67,12 @@ def is_info_enabled(logger):
 
 def instance_logger(instance, echoflag=None):
     if echoflag is not None:
-        default_logging(_get_instance_name(instance))
         l = logging.getLogger(_get_instance_name(instance))
         if echoflag == 'debug':
+            default_logging(_get_instance_name(instance))
             l.setLevel(logging.DEBUG)
         elif echoflag is True:
+            default_logging(_get_instance_name(instance))
             l.setLevel(logging.INFO)
         elif echoflag is False:
             l.setLevel(logging.NOTSET)
diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py
index b3f58c954..30ecbdfe8 100644
--- a/lib/sqlalchemy/orm/util.py
+++ b/lib/sqlalchemy/orm/util.py
@@ -271,14 +271,15 @@ class PropertyAliasedClauses(AliasedClauses):
         if prop.secondary:
             self.secondary = prop.secondary.alias()
             if parentclauses is not None:
-                aliasizer = sql_util.ClauseAdapter(self.alias).\
-                        chain(sql_util.ClauseAdapter(self.secondary)).\
-                        chain(sql_util.ClauseAdapter(parentclauses.alias))
+                primary_aliasizer = sql_util.ClauseAdapter(self.secondary).chain(sql_util.ClauseAdapter(parentclauses.alias))
+                secondary_aliasizer = sql_util.ClauseAdapter(self.alias).chain(sql_util.ClauseAdapter(self.secondary))
+
             else:
-                aliasizer = sql_util.ClauseAdapter(self.alias).\
-                    chain(sql_util.ClauseAdapter(self.secondary))
-            self.secondaryjoin = aliasizer.traverse(secondaryjoin, clone=True)
-            self.primaryjoin = aliasizer.traverse(primaryjoin, clone=True)
+                primary_aliasizer = sql_util.ClauseAdapter(self.secondary)
+                secondary_aliasizer = sql_util.ClauseAdapter(self.alias).chain(sql_util.ClauseAdapter(self.secondary))
+                
+            self.secondaryjoin = secondary_aliasizer.traverse(secondaryjoin, clone=True)
+            self.primaryjoin = primary_aliasizer.traverse(primaryjoin, clone=True)
         else:
             if parentclauses is not None: 
                 aliasizer = sql_util.ClauseAdapter(self.alias, exclude=prop.local_side)