History ordering bug with SQLAlchemy 0.5 (developers - queries are no longer ordered by primary key by default, so order explicitly if it matters) and a <model_object>.c that slipped through.

lib/galaxy/jobs/__init__.py

@@ -174,7 +174,7 @@ class JobQueue( object ):
         if self.track_jobs_in_database:
             for j in self.sa_session.query( model.Job ) \
                             .options( lazyload( "external_output_metadata" ), lazyload( "parameters" ) ) \
-                            .filter( model.Job.c.state == model.Job.states.NEW ):
+                            .filter( model.Job.state == model.Job.states.NEW ):
                 job = JobWrapper( j, self.app.toolbox.tools_by_id[ j.tool_id ], self )
                 new_jobs.append( job )
         else:

lib/galaxy/web/controllers/root.py

@@ -72,7 +72,8 @@ class RootController( BaseController ):
                 .filter( model.HistoryDatasetAssociation.history == history ) \
                 .options( eagerload( "children" ) ) \
                 .join( "dataset" ).filter( model.Dataset.purged == False ) \
-                .options( eagerload_all( "dataset.actions" ) )
+                .options( eagerload_all( "dataset.actions" ) ) \
+                .order_by( model.HistoryDatasetAssociation.hid )
             if not show_deleted:
                 query = query.filter( model.HistoryDatasetAssociation.deleted == False )
             return trans.stream_template_mako( "root/history.mako",