From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 29 May 2023 14:26:37 +0000 (+0000)
Subject: builders: Refactor SQL statements
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c28faacb063091926d31241d5285938e2002a08;p=pbs.git

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 75eb15fc..9860376d 100644
--- 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):