details: http://www.bx.psu.edu/hg/galaxy/rev/f242b5a3fedc changeset: 1646:f242b5a3fedc user: James Taylor <james@jamestaylor.org> date: Tue Dec 02 13:49:32 2008 -0500 description: imported patch job-eager-load 1 file(s) affected in this change: lib/galaxy/model/mapping.py diffs (28 lines): diff -r 1dc78a13070c -r f242b5a3fedc lib/galaxy/model/mapping.py --- a/lib/galaxy/model/mapping.py Tue Dec 02 13:49:29 2008 -0500 +++ b/lib/galaxy/model/mapping.py Tue Dec 02 13:49:32 2008 -0500 @@ -305,19 +305,19 @@ ) ) assign_mapper( context, JobToInputDatasetAssociation, JobToInputDatasetAssociation.table, - properties=dict( job=relation( Job ), dataset=relation( HistoryDatasetAssociation ) ) ) + properties=dict( job=relation( Job ), dataset=relation( HistoryDatasetAssociation, lazy=False ) ) ) assign_mapper( context, JobToOutputDatasetAssociation, JobToOutputDatasetAssociation.table, - properties=dict( job=relation( Job ), dataset=relation( HistoryDatasetAssociation ) ) ) + properties=dict( job=relation( Job ), dataset=relation( HistoryDatasetAssociation, lazy=False ) ) ) assign_mapper( context, JobParameter, JobParameter.table ) assign_mapper( context, Job, Job.table, properties=dict( galaxy_session=relation( GalaxySession ), history=relation( History ), - parameters=relation( JobParameter ), - input_datasets=relation( JobToInputDatasetAssociation ), - output_datasets=relation( JobToOutputDatasetAssociation ) ) ) + parameters=relation( JobParameter, lazy=False ), + input_datasets=relation( JobToInputDatasetAssociation, lazy=False ), + output_datasets=relation( JobToOutputDatasetAssociation, lazy=False ) ) ) assign_mapper( context, Event, Event.table, properties=dict( history=relation( History ),