filelists: Rename database fields to avoid keywords

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

diff --git a/src/buildservice/packages.py b/src/buildservice/packages.py
index 568f77e495e7c492b072b40d04b133b49beb1810..eff4ae7ac163aa7fc4dd29e03ce3160c0ed93ff5 100644 (file)
--- a/src/buildservice/packages.py
+++ b/src/buildservice/packages.py
@@ -387,8 +387,8 @@ class Package(base.DataObject):
                                path,
                                size,
                                mode,
-                               "user",
-                               "group",
+                               uname,
+                               gname,
                                ctime,
                                mtime,
                                digest_sha512,
@@ -403,8 +403,8 @@ class Package(base.DataObject):
                                file.path,
                                file.size,
                                file.mode,
-                               file.user,
-                               file.group,
+                               file.uname,
+                               file.gname,
                                file.ctime,
                                file.mtime,
                                file.digest(PAKFIRE_DIGEST_SHA2_512),

diff --git a/src/database.sql b/src/database.sql
index 764181c3afa76c6d4dcca394b16f84c8d8bc9840..533038b5ab212fe40e7e47d4f29852b311bce959 100644 (file)
--- a/src/database.sql
+++ b/src/database.sql
@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 13.7 (Debian 13.7-0+deb11u1)
--- Dumped by pg_dump version 13.7 (Debian 13.7-0+deb11u1)
+-- Dumped from database version 13.8 (Debian 13.8-0+deb11u1)
+-- Dumped by pg_dump version 13.8 (Debian 13.8-0+deb11u1)
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
@@ -421,8 +421,8 @@ CREATE TABLE public.filelists (
     size bigint NOT NULL,
     config boolean DEFAULT false NOT NULL,
     mode integer NOT NULL,
-    "user" text NOT NULL,
-    "group" text NOT NULL,
+    uname text NOT NULL,
+    gname text NOT NULL,
     capabilities text,
     ctime timestamp without time zone NOT NULL,
     mtime timestamp without time zone NOT NULL,