[ticket:374] [ticket:377] [ticket:375], small fix to mutable types unit test

diff --git a/lib/sqlalchemy/engine/strategies.py b/lib/sqlalchemy/engine/strategies.py
index d48412160d62f67c65e6fabc07a21b26b6a94eea..a7f2cc00363661639e6ca8bf4627d978c46bffab 100644 (file)
--- a/lib/sqlalchemy/engine/strategies.py
+++ b/lib/sqlalchemy/engine/strategies.py
@@ -67,7 +67,7 @@ class DefaultEngineStrategy(EngineStrategy):
             pool_args['use_threadlocal'] = self.pool_threadlocal()
             pool = poolclass(creator, **pool_args)
         else:
-            if isinstance(pool, poollib.DBProxy):
+            if isinstance(pool, poollib._DBProxy):
                 pool = pool.get_pool(*cargs, **cparams)
             else:
                 pool = pool

diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index e07f691f41d1e83ebc1cd392055b3985653be629..5c1a3b5647931bac4b2b27ba12e27e4027fac82a 100644 (file)
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -1149,8 +1149,8 @@ class Mapper(object):
             if populate_existing or context.session.is_expired(instance, unexpire=True):
                 if not context.identity_map.has_key(identitykey):
                     context.identity_map[identitykey] = instance
-               if self.extension.populate_instance(self, context, row, instance, identitykey, True) is EXT_PASS:
-                   self.populate_instance(context, instance, row, identitykey, True)
+                if self.extension.populate_instance(self, context, row, instance, identitykey, True) is EXT_PASS:
+                    self.populate_instance(context, instance, row, identitykey, True)
             if self.extension.append_result(self, context, row, instance, identitykey, result, isnew) is EXT_PASS:
                 if result is not None:
                     result.append(instance)

diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py
index 68022f70b6a0399d14bc21fd775ed8cc7229cf0a..fb6894f0bc06b98d975dc922e9e86cedd4c9538c 100644 (file)
--- a/lib/sqlalchemy/schema.py
+++ b/lib/sqlalchemy/schema.py
@@ -389,7 +389,6 @@ class Column(SchemaItem, sql._ColumnClause):
                 return self.table.name + "." + self.name
             else:
                 return self.name
-            return self.name
         else:
             return self.name
     

diff --git a/test/orm/unitofwork.py b/test/orm/unitofwork.py
index 9f4e56dd09c60679d166c8182075020893cea921..e6a1060aa1f4d469d91d0167a721d804c07d7cff 100644 (file)
--- a/test/orm/unitofwork.py
+++ b/test/orm/unitofwork.py
@@ -279,7 +279,7 @@ class MutableTypesTest(UnitOfWorkTest):
         self.assert_sql(db, lambda: ctx.current.flush(), [
             (
                 "UPDATE mutabletest SET value=:value WHERE mutabletest.id = :mutabletest_id",
-                {'mutabletest_id': 1, 'value': u'someothervalue'}
+                {'mutabletest_id': f1.id, 'value': u'someothervalue'}
             ),
         ])
         f1.value = unicode('hi')
@@ -287,7 +287,7 @@ class MutableTypesTest(UnitOfWorkTest):
         self.assert_sql(db, lambda: ctx.current.flush(), [
             (
                 "UPDATE mutabletest SET data=:data, value=:value WHERE mutabletest.id = :mutabletest_id",
-                {'mutabletest_id': 1, 'value': u'hi', 'data':f1.data}
+                {'mutabletest_id': f1.id, 'value': u'hi', 'data':f1.data}
             ),
         ])