users: Rename deleted to deleted_at

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

diff --git a/src/buildservice/users.py b/src/buildservice/users.py
index 49dcf95509b7cf3ea3b83bf6eed1fe5aaaf30103..5bc1e1b6d277fe163771c1d0538b5ae85050028a 100644 (file)
--- a/src/buildservice/users.py
+++ b/src/buildservice/users.py
@@ -94,7 +94,7 @@ class Users(base.Object):
                        FROM
                                users
                        WHERE
-                               deleted IS FALSE
+                               deleted_at IS NULL
                        ORDER BY
                                name
                        """,
@@ -109,7 +109,7 @@ class Users(base.Object):
                        FROM
                                users
                        WHERE
-                               deleted IS FALSE
+                               deleted_at IS NULL
                        """,
                )
 
@@ -218,7 +218,7 @@ class Users(base.Object):
                        FROM
                                users
                        WHERE
-                               deleted IS FALSE
+                               deleted_at IS NULL
                        AND
                                name = %s
                        """, name,
@@ -330,7 +330,7 @@ class Users(base.Object):
                        FROM
                                users
                        WHERE
-                               deleted IS FALSE
+                               deleted_at IS NULL
                        AND
                                name = ANY(%s)
                        """, [row.get("uid")[0].decode() for row in res],

diff --git a/src/database.sql b/src/database.sql
index 690526b2499784b67b713f9f1ce004e2143ec0c5..a14d3ad50f4dc497917d66b86625b81e49c26420 100644 (file)
--- a/src/database.sql
+++ b/src/database.sql
@@ -1131,7 +1131,7 @@ ALTER SEQUENCE public.user_push_subscriptions_id_seq OWNED BY public.user_push_s
 CREATE TABLE public.users (
     id integer NOT NULL,
     name text NOT NULL,
-    deleted boolean DEFAULT false NOT NULL,
+    deleted_at timestamp without time zone,
     registered_at timestamp without time zone DEFAULT now() NOT NULL,
     admin boolean DEFAULT false NOT NULL,
     quota bigint,