From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 22 May 2023 20:18:35 +0000 (+0000)
Subject: repos: I found more queries with incorrect field names
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f789938aaa48daaabc1201b54b26eba911d7f16;p=pbs.git

repos: I found more queries with incorrect field names

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

diff --git a/src/buildservice/distribution.py b/src/buildservice/distribution.py
index 6c889afe..22dc5056 100644
--- a/src/buildservice/distribution.py
+++ b/src/buildservice/distribution.py
@@ -275,7 +275,7 @@ class Distribution(base.DataObject):
 			FROM
 				repositories
 			WHERE
-				deleted IS FALSE
+				deleted_at IS NULL
 			AND
 				distro_id = %s
 			AND
@@ -292,7 +292,7 @@ class Distribution(base.DataObject):
 			FROM
 				repositories
 			WHERE
-				deleted IS FALSE
+				deleted_at IS NULL
 			AND
 				distro_id = %s
 			AND
diff --git a/src/buildservice/repository.py b/src/buildservice/repository.py
index 9022abc7..5f1be9bd 100644
--- a/src/buildservice/repository.py
+++ b/src/buildservice/repository.py
@@ -41,7 +41,7 @@ class Repositories(base.Object):
 
 	def __iter__(self):
 		repositories = self._get_repositories("SELECT * FROM repositories \
-			WHERE deleted IS FALSE ORDER BY distro_id, name")
+			WHERE deleted_at IS NULL ORDER BY distro_id, name")
 
 		return iter(repositories)
 
@@ -56,9 +56,10 @@ class Repositories(base.Object):
 			FROM
 				repositories
 			WHERE
-				deleted IS FALSE
+				deleted_at IS NULL
 			AND
-				mirrored IS TRUE""",
+				mirrored IS TRUE
+			""",
 		)
 
 		return list(repos)
@@ -110,7 +111,7 @@ class Repositories(base.Object):
 			slug = misc.normalize(name, iteration=i)
 
 			exists = self.db.get("SELECT 1 FROM repositories \
-				WHERE deleted IS FALSE AND owner_id = %s AND slug = %s", owner, slug)
+				WHERE deleted_at IS NULL AND owner_id = %s AND slug = %s", owner, slug)
 			if not exists:
 				return slug