diff --git a/lnt/server/ui/views.py b/lnt/server/ui/views.py index 5e97cbd5..a39bd9f4 100644 --- a/lnt/server/ui/views.py +++ b/lnt/server/ui/views.py @@ -881,6 +881,7 @@ def load_graph_data(plot_parameter, show_failures, limit, xaxis_date, revision_c # we want to load. Actually, we should just make this a single query. values = session.query(plot_parameter.field.column, ts.Order, ts.Run.start_time, ts.Run.id) \ + .select_from(ts.Sample) \ .join(ts.Run).join(ts.Order) \ .filter(ts.Run.machine_id == plot_parameter.machine.id) \ .filter(ts.Sample.test == plot_parameter.test) \ @@ -924,6 +925,7 @@ def load_geomean_data(field, machine, limit, xaxis_date, revision_cache=None): values = session.query(sqlalchemy.sql.func.min(field.column), ts.Order, sqlalchemy.sql.func.min(ts.Run.start_time)) \ + .select_from(ts.Sample) \ .join(ts.Run).join(ts.Order).join(ts.Test) \ .filter(ts.Run.machine_id == machine.id) \ .filter(field.column.isnot(None)) \ @@ -1106,6 +1108,7 @@ def v4_graph(): q_baseline = session.query(req.field.column, ts.Order.llvm_project_revision, ts.Run.start_time, ts.Machine.name) \ + .select_from(ts.Sample) \ .join(ts.Run).join(ts.Order).join(ts.Machine) \ .filter(ts.Run.id == baseline.id) \ .filter(ts.Sample.test == req.test) \ @@ -1903,6 +1906,7 @@ def v4_matrix(): for req in plot_parameters: q = session.query(req.field.column, ts.Order.llvm_project_revision, ts.Order.id) \ + .select_from(ts.Sample) \ .join(ts.Run) \ .join(ts.Order) \ .filter(ts.Run.machine_id == req.machine.id) \ @@ -1939,6 +1943,7 @@ def v4_matrix(): q_baseline = session.query(req.field.column, ts.Order.llvm_project_revision, ts.Order.id) \ + .select_from(ts.Sample) \ .join(ts.Run) \ .join(ts.Order) \ .filter(ts.Run.machine_id == req.machine.id) \