rowid_column becomes more like the "order by column". 'default_ordering' flag sent to create_engine enables whether or not the rowid_column on a Table will be None or not. mappers/relations will by default use the rowid_column for ordering if its not None, else theres no default ordering.

still should better define 'default_ordering'/'rowid_column' relationship since its a little kludgy.

2 files changed, 8 insertions, 8 deletions

diff --git a/lib/sqlalchemy/mapping/mapper.py b/lib/sqlalchemy/mapping/mapper.py
index f9b62b9f5..6af044fbb 100644
--- a/lib/sqlalchemy/mapping/mapper.py
+++ b/lib/sqlalchemy/mapping/mapper.py
@@ -603,7 +603,7 @@ class Mapper(object):
             if self.order_by:
                 order_by = self.order_by
             elif self.table.rowid_column is not None:
-                order_by = self.table.rowid_column
+                order_by = [self.table.rowid_column]
             else:
                 order_by = None
         else:
@@ -611,7 +611,7 @@ class Mapper(object):
             
         if self._should_nest(**kwargs):
             s2 = sql.select(self.table.primary_key, whereclause, use_labels=True, **kwargs)
-            if not kwargs.get('distinct', False):
+            if not kwargs.get('distinct', False) and self.table.rowid_column is not None:
                 s2.order_by(self.table.rowid_column)
             s3 = s2.alias('rowcount')
             crit = []
@@ -621,17 +621,17 @@ class Mapper(object):
             if kwargs.has_key('order_by'):
                 statement.order_by(*kwargs['order_by'])
             else:
-                statement.order_by(order_by)
+                statement.order_by(*order_by)
         else:
             statement = sql.select([], whereclause, from_obj=[self.table], use_labels=True, **kwargs)
             if order_by is not None and kwargs.get('order_by', None) is None:
-                statement.order_by(order_by)
+                statement.order_by(*order_by)
             # for a DISTINCT query, you need the columns explicitly specified in order
             # to use it in "order_by" - in the case we added the rowid column in,
             # add that to the column list
             # TODO: this idea should be handled by the SELECT statement itself, insuring
             # that order_by cols are in the select list if DISTINCT is selected
-            if kwargs.get('distinct', False) and order_by is self.table.rowid_column:
+            if kwargs.get('distinct', False) and self.table.rowid_column is not None and order_by == [self.table.rowid_column]:
                 statement.append_column(self.table.rowid_column)
         # plugin point
         
diff --git a/lib/sqlalchemy/mapping/properties.py b/lib/sqlalchemy/mapping/properties.py
index 6fb078d78..d049aec98 100644
--- a/lib/sqlalchemy/mapping/properties.py
+++ b/lib/sqlalchemy/mapping/properties.py
@@ -592,7 +592,7 @@ class LazyLoader(PropertyLoader):
             if allparams:
                 if self.order_by is not None:
                     order_by = self.order_by
-                elif self.secondary is not None:
+                elif self.secondary is not None and self.secondary.rowid_column is not None:
                     order_by = [self.secondary.rowid_column]
                 else:
                     order_by = None
@@ -714,11 +714,11 @@ class EagerLoader(PropertyLoader):
 
         if self.secondaryjoin is not None:
             statement._outerjoin = sql.outerjoin(towrap, self.secondary, self.primaryjoin).outerjoin(self.eagertarget, self.eagersecondary)
-            if self.order_by is None:
+            if self.order_by is None and self.secondary.rowid_column is not None:
                 statement.order_by(self.secondary.rowid_column)
         else:
             statement._outerjoin = towrap.outerjoin(self.eagertarget, self.eagerprimary)
-            if self.order_by is None:
+            if self.order_by is None and self.eagertarget.rowid_column is not None:
                 statement.order_by(self.eagertarget.rowid_column)
 
         if self.eager_order_by is not None: