Add DB handlers and rename to v2

7 files changed, 15 insertions, 15 deletions

diff --git a/opendc/models/machine.py b/opendc/models/machine.py
index f233d329..e6e49c4b 100644
--- a/opendc/models/machine.py
+++ b/opendc/models/machine.py
@@ -64,7 +64,7 @@ class Machine(Model):
 
         try:
             statement = 'SELECT id FROM machines WHERE rack_id = %s AND position = %s'
-            machine_id = database.fetchone(statement, (rack.id, position))[0]
+            machine_id = database.fetch_one(statement, (rack.id, position))[0]
         except:
             return cls(id=-1)
 
@@ -102,7 +102,7 @@ class Machine(Model):
         for device_table in self.device_table_to_attribute.keys():
 
             statement = 'SELECT * FROM machine_{} WHERE machine_id = %s'.format(device_table)
-            results = database.fetchall(statement, (self.id,))
+            results = database.fetch_all(statement, (self.id,))
 
             device_ids = []
 
diff --git a/opendc/models/machine_state.py b/opendc/models/machine_state.py
index ad295e1a..3e3fdab9 100644
--- a/opendc/models/machine_state.py
+++ b/opendc/models/machine_state.py
@@ -38,7 +38,7 @@ class MachineState(Model):
         machine_states = []
 
         statement = 'SELECT * FROM machine_states WHERE experiment_id = %s'
-        results = database.fetchall(statement, (experiment_id,))
+        results = database.fetch_all(statement, (experiment_id,))
 
         for row in results:
             machine_states.append(cls._from_database_row(row))
@@ -52,7 +52,7 @@ class MachineState(Model):
         machine_states = []
 
         statement = 'SELECT * FROM machine_states WHERE experiment_id = %s AND machine_states.tick = %s'
-        results = database.fetchall(statement, (experiment_id, tick))
+        results = database.fetch_all(statement, (experiment_id, tick))
 
         for row in results:
             machine_states.append(cls._from_database_row(row))
@@ -65,7 +65,7 @@ class MachineState(Model):
         super(MachineState, self).read()
 
         statement = 'SELECT tick FROM task_states WHERE id = %s'
-        result = database.fetchone(statement, (self.task_state_id,))
+        result = database.fetch_one(statement, (self.task_state_id,))
 
         self.tick = result[0]
 
diff --git a/opendc/models/model.py b/opendc/models/model.py
index 8ab410d4..00ab50d1 100644
--- a/opendc/models/model.py
+++ b/opendc/models/model.py
@@ -163,7 +163,7 @@ class Model(object):
         """Initialize a Model by fetching it from the database."""
 
         parameters = {}
-        model_from_database = database.fetchone(statement, values)
+        model_from_database = database.fetch_one(statement, values)
 
         if model_from_database is None:
             return None
@@ -207,11 +207,11 @@ class Model(object):
 
         if column_name is not None and value is not None:
             statement = 'SELECT * FROM {} WHERE {} = %s'.format(cls.TABLE_NAME, column_name)
-            database_models = database.fetchall(statement, (value,))
+            database_models = database.fetch_all(statement, (value,))
 
         else:
             statement = 'SELECT * FROM {}'.format(cls.TABLE_NAME)
-            database_models = database.fetchall(statement)
+            database_models = database.fetch_all(statement)
 
         models = []
 
@@ -267,7 +267,7 @@ class Model(object):
             )
             values = (getattr(self, column),)
 
-        return database.fetchone(query, values)[0] == 1
+        return database.fetch_one(query, values)[0] == 1
 
     def insert(self):
         """Insert this Model into the database."""
diff --git a/opendc/models/rack_state.py b/opendc/models/rack_state.py
index c0f0ff6c..440ab293 100644
--- a/opendc/models/rack_state.py
+++ b/opendc/models/rack_state.py
@@ -35,7 +35,7 @@ class RackState(Model):
             WHERE machine_states.experiment_id = %s
             GROUP BY machine_states.tick, racks.id
         '''
-        results = database.fetchall(statement, (experiment_id,))
+        results = database.fetch_all(statement, (experiment_id,))
 
         for row in results:
             rack_states.append(cls._from_database_row(row))
@@ -57,7 +57,7 @@ class RackState(Model):
                 AND machine_states.tick = %s
             GROUP BY machine_states.tick, racks.id
         '''
-        results = database.fetchall(statement, (experiment_id, tick))
+        results = database.fetch_all(statement, (experiment_id, tick))
 
         for row in results:
             rack_states.append(cls._from_database_row(row))
diff --git a/opendc/models/room_state.py b/opendc/models/room_state.py
index 2729407f..2404d86b 100644
--- a/opendc/models/room_state.py
+++ b/opendc/models/room_state.py
@@ -39,7 +39,7 @@ class RoomState(Model):
                 AND machine_states.experiment_id = %s
             GROUP BY machine_states.tick, rooms.id
         '''
-        results = database.fetchall(statement, (experiment_id,))
+        results = database.fetch_all(statement, (experiment_id,))
 
         for row in results:
             room_states.append(cls._from_database_row(row))
@@ -65,7 +65,7 @@ class RoomState(Model):
                 AND machine_states.tick = %s
             GROUP BY rooms.id
         '''
-        results = database.fetchall(statement, (experiment_id, tick))
+        results = database.fetch_all(statement, (experiment_id, tick))
 
         for row in results:
             room_states.append(cls._from_database_row(row))
diff --git a/opendc/models/task_duration.py b/opendc/models/task_duration.py
index 1dc3ca01..14cbc31a 100644
--- a/opendc/models/task_duration.py
+++ b/opendc/models/task_duration.py
@@ -31,7 +31,7 @@ class TaskDuration(Model):
             GROUP BY task_id
         '''
 
-        results = database.fetchall(statement, (experiment_id,))
+        results = database.fetch_all(statement, (experiment_id,))
 
         for row in results:
             room_states.append(cls._from_database_row(row))
diff --git a/opendc/models/task_state.py b/opendc/models/task_state.py
index 8dca2d03..83cc6a62 100644
--- a/opendc/models/task_state.py
+++ b/opendc/models/task_state.py
@@ -26,7 +26,7 @@ class TaskState(Model):
         task_states = []
 
         statement = 'SELECT * FROM task_states WHERE experiment_id = %s AND tick = %s'
-        results = database.fetchall(statement, (experiment_id, tick))
+        results = database.fetch_all(statement, (experiment_id, tick))
 
         for row in results:
             task_states.append(