builders: Refactor SQL statements

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/buildservice/builders.py b/src/buildservice/builders.py
index 75eb15fcdfaa57e4877769015c32def704d0e670..9860376d1918f70ccc8223eda1b9b5c8cb93e14e 100644 (file)
--- a/src/buildservice/builders.py
+++ b/src/buildservice/builders.py
@@ -39,22 +39,51 @@ class Builders(base.Object):
                # Initialize stats
                self.stats = BuildersStats(self.backend)
 
-       def create(self, name, user=None, log=True):
+       def create(self, name, user=None):
                """
                        Creates a new builder.
                """
-               builder = self._get_builder("INSERT INTO builders(name) \
-                       VALUES(%s) RETURNING *", name)
+               builder = self._get_builder("""
+                       INSERT INTO
+                               builders
+                       (
+                               name,
+                               created_by
+                       )
+                       VALUES
+                       (
+                               %s, %s
+                       )
+                       RETURNING
+                               *
+                       """, name, user,
+               )
 
-               # The Builder object and the passphrase are returned.
                return builder
 
-       def get_by_id(self, builder_id):
-               return self._get_builder("SELECT * FROM builders WHERE id = %s", builder_id)
+       def get_by_id(self, id):
+               return self._get_builder("""
+                       SELECT
+                               *
+                       FROM
+                               builders
+                       WHERE
+                               id = %s
+                       """, id,
+               )
 
        def get_by_name(self, name):
-               return self._get_builder("SELECT * FROM builders \
-                       WHERE name = %s AND deleted_at IS NULL", name)
+               return self._get_builder("""
+                       SELECT
+                               *
+                       FROM
+                               builders
+                       WHERE
+                               deleted_at IS NULL
+                       AND
+                               name = %s
+                       """, name,
+               )
 
        @property
        def connected(self):