Hide (almost all) remaining SQL code in DB module.

[plomtask] / plomtask / conditions.py

diff --git a/plomtask/conditions.py b/plomtask/conditions.py
index b87e3ac3e16f1500da87962d2adfb333093f0f54..9a442000a99befa563582346826244739bf13ae7 100644 (file)
--- a/plomtask/conditions.py
+++ b/plomtask/conditions.py
@@ -27,7 +27,7 @@ class Condition(BaseModel):
         assert isinstance(condition, Condition)
         for name in ('title', 'description'):
             table_name = f'condition_{name}s'
-            for row_ in db_conn.all_where(table_name, 'parent', row[0]):
+            for row_ in db_conn.row_where(table_name, 'parent', row[0]):
                 getattr(condition, name).history_from_row(row_)
         return condition
 
@@ -38,9 +38,9 @@ class Condition(BaseModel):
         for id_, condition in db_conn.cached_conditions.items():
             conditions[id_] = condition
         already_recorded = conditions.keys()
-        for row in db_conn.exec('SELECT id FROM conditions'):
-            if row[0] not in already_recorded:
-                condition = cls.by_id(db_conn, row[0])
+        for id_ in db_conn.column_all('conditions', 'id'):
+            if id_ not in already_recorded:
+                condition = cls.by_id(db_conn, id_)
                 conditions[condition.id_] = condition
         return list(conditions.values())