diff options
| author | Georgios Andreadis <g.andreadis@student.tudelft.nl> | 2017-08-13 23:17:50 +0300 |
|---|---|---|
| committer | Georgios Andreadis <g.andreadis@student.tudelft.nl> | 2017-08-13 23:17:50 +0300 |
| commit | 3d086d18a2639a76c4739b6ca7ca06416356c706 (patch) | |
| tree | 5c9e122ae7e84b8013e8a742714a5779f871f6ad /opendc/models/rack_state.py | |
| parent | f589682b0840aab0624122052eb863cf8dc3a0b9 (diff) | |
| parent | bc70e6ae115beb469541c12014ffdecc01a1e50c (diff) | |
Merge branch 'master' into flat-api
Diffstat (limited to 'opendc/models/rack_state.py')
| -rw-r--r-- | opendc/models/rack_state.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/opendc/models/rack_state.py b/opendc/models/rack_state.py index 77cafd95..e43dc940 100644 --- a/opendc/models/rack_state.py +++ b/opendc/models/rack_state.py @@ -32,7 +32,7 @@ class RackState(Model): FROM racks JOIN machines ON racks.id = machines.rack_id JOIN machine_states ON machines.id = machine_states.machine_id - WHERE machine_states.experiment_id = ? + WHERE machine_states.experiment_id = %s GROUP BY machine_states.tick, racks.id ''' results = database.fetchall(statement, (experiment_id,)) @@ -53,8 +53,8 @@ class RackState(Model): FROM racks JOIN machines ON racks.id = machines.rack_id JOIN machine_states ON machines.id = machine_states.machine_id - WHERE machine_states.experiment_id = ? - AND machine_states.tick = ? + WHERE machine_states.experiment_id = %s + AND machine_states.tick = %s GROUP BY machine_states.tick, racks.id ''' results = database.fetchall(statement, (experiment_id, tick)) |