packages: Store digest in binary format

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

diff --git a/src/buildservice/packages.py b/src/buildservice/packages.py
index b9cb41bd67c225b83682c3799a95438826625895..506778845a4cf4982b33049213888998902ef5a8 100644 (file)
--- a/src/buildservice/packages.py
+++ b/src/buildservice/packages.py
@@ -109,13 +109,14 @@ class Packages(base.Object):
                                build_host,
                                build_time,
                                filesize,
-                               hash_sha512
+                               digest_type,
+                               digest
                        )
                        VALUES
                        (
                                %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,
                                %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,
-                               %s, %s, %s
+                               %s, %s, %s, %s
                        )
                        RETURNING *""",
                        package.name,
@@ -140,7 +141,7 @@ class Packages(base.Object):
                        package.buildhost,
                        datetime.datetime.fromtimestamp(package.buildtime),
                        package.downloadsize,
-                       package.hexdigest_sha512,
+                       *package.digest,
                )
 
                # Import filelist
@@ -342,8 +343,8 @@ class Package(base.DataObject):
                return os.path.basename(self.path)
 
        @property
-       def hash_sha512(self):
-               return self.data.hash_sha512
+       def digest(self):
+               return (self.data.digest_type, self.data.digest)
 
        @property
        def filesize(self):

diff --git a/src/database.sql b/src/database.sql
index d6878044fe243799148a0442a07367c09c592fb8..9e7b94cc6af92b2c4df5098bd8e889c37e824766 100644 (file)
--- a/src/database.sql
+++ b/src/database.sql
@@ -849,7 +849,6 @@ CREATE TABLE public.packages (
     build_time timestamp without time zone NOT NULL,
     path text,
     filesize bigint NOT NULL,
-    hash_sha512 text NOT NULL,
     prerequires text[] DEFAULT ARRAY[]::text[] NOT NULL,
     requires text[] DEFAULT ARRAY[]::text[] NOT NULL,
     provides text[] DEFAULT ARRAY[]::text[] NOT NULL,
@@ -858,7 +857,9 @@ CREATE TABLE public.packages (
     recommends text[] DEFAULT ARRAY[]::text[] NOT NULL,
     suggests text[] DEFAULT ARRAY[]::text[] NOT NULL,
     created_at timestamp without time zone DEFAULT CURRENT_TIMESTAMP NOT NULL,
-    deleted boolean DEFAULT false NOT NULL
+    deleted boolean DEFAULT false NOT NULL,
+    digest_type text NOT NULL,
+    digest bytea
 );