cleanup

diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index 3e9f2724ca74695eca9acd09ddb52d3c1f03aaf0..4e80aceeb68e104e87f61477b8e5fe3d711930cc 100644 (file)
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -197,7 +197,7 @@ class Mapper(object):
                     l.append(k)
                     
         if len(self.pks_by_table[self.mapped_table]) == 0:
-            raise exceptions.ArgumentError("Could not assemble any primary key columsn from given tables for table '%s'" % (self.mapped_table.name))
+            raise exceptions.ArgumentError("Could not assemble any primary key columns for mapped table '%s'" % (self.mapped_table.name))
             
         # make table columns addressable via the mapper
         self.columns = util.OrderedProperties()

diff --git a/lib/sqlalchemy/sql_util.py b/lib/sqlalchemy/sql_util.py
index 1a720d1d505effd4f8441eea03a5def677665c37..509a7fe3ed00d6341e97f291ca60907f70f7a99f 100644 (file)
--- a/lib/sqlalchemy/sql_util.py
+++ b/lib/sqlalchemy/sql_util.py
@@ -16,7 +16,7 @@ class TableCollection(object):
             sorted = self._sorted
         except AttributeError, e:
             self._sorted = self._do_sort()
-            return self.sort(reverse=reverse)
+            sorted = self._sorted
         if reverse:
             x = sorted[:]
             x.reverse()