From: Michael Tremer Date: Tue, 11 Oct 2022 11:31:56 +0000 (+0000) Subject: packages: Store digest in binary format X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cb753b5ebdf294bae36608887ff47099879c9957;p=pbs.git packages: Store digest in binary format Signed-off-by: Michael Tremer --- diff --git a/src/buildservice/packages.py b/src/buildservice/packages.py index b9cb41bd..50677884 100644 --- 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 d6878044..9e7b94cc 100644 --- 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 );