From e549964b1ac9e1a0544eba496def111c9027b7b6 Mon Sep 17 00:00:00 2001 From: Timm Fitschen <t.fitschen@indiscale.com> Date: Mon, 8 Feb 2021 10:05:06 +0100 Subject: [PATCH] WIP --- patches/patch20210122-4.0.0-rc3/patch.sql | 8 +++++--- procedures/retrieveEntity.sql | 11 +++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/patches/patch20210122-4.0.0-rc3/patch.sql b/patches/patch20210122-4.0.0-rc3/patch.sql index 84b1257..ba36f0e 100644 --- a/patches/patch20210122-4.0.0-rc3/patch.sql +++ b/patches/patch20210122-4.0.0-rc3/patch.sql @@ -11,14 +11,16 @@ ALTER TABLE files ADD UNIQUE (`path`); ALTER TABLE files ADD COLUMN IF NOT EXISTS ( mimetype VARBINARY(255) DEFAULT NULL, file_storage_id VARBINARY(255) NOT NULL DEFAULT "DEFAULT", - file_key VARBINARY(255) DEFAULT NULL + file_key VARBINARY(255) DEFAULT NULL, + hash_algorithm VARBINARY(255) DEFAULT NULL ); ALTER TABLE archive_files ADD COLUMN IF NOT EXISTS ( mimetype VARBINARY(255) DEFAULT NULL, file_storage_id VARBINARY(255) NOT NULL DEFAULT "DEFAULT", - file_key VARBINARY(255) DEFAULT NULL, - checked_timestamp BIGINT DEFAULT NULL + file_key VARBINARY(255) NOT NULL DEFAULT NULL, + checked_timestamp BIGINT NOT NULL DEFAULT 0, + hash_algorithm VARBINARY(255) DEFAULT NULL ); diff --git a/procedures/retrieveEntity.sql b/procedures/retrieveEntity.sql index a3c52f4..4e89b1b 100644 --- a/procedures/retrieveEntity.sql +++ b/procedures/retrieveEntity.sql @@ -55,6 +55,7 @@ retrieveEntityBody: BEGIN DECLARE FilePath VARCHAR(255) DEFAULT NULL; DECLARE FileSize VARCHAR(255) DEFAULT NULL; DECLARE FileHash VARCHAR(255) DEFAULT NULL; + DECLARE FileHashChecked BIGINT DEFAULT NULL; DECLARE FileMimetype VARBINARY(255) DEFAULT NULL; DECLARE FileStorageId VARBINARY(255) DEFAULT NULL; DECLARE FileKey VARBINARY(65525) DEFAULT NULL; @@ -84,8 +85,8 @@ retrieveEntityBody: BEGIN LEAVE retrieveEntityBody; END IF; - SELECT path, size, hex(hash), mimetype, file_storage_id, file_key - INTO FilePath, FileSize, FileHash, FileMimetype, FileStorageId, FileKey + SELECT path, size, hex(hash), checked_timestamp, mimetype, file_storage_id, file_key + INTO FilePath, FileSize, FileHash, FileHashChecked, FileMimetype, FileStorageId, FileKey FROM archive_files WHERE file_id = EntityID AND _iversion = IVersion @@ -132,6 +133,7 @@ retrieveEntityBody: BEGIN FileSize AS FileSize, FilePath AS FilePath, FileHash AS FileHash, + FileHashChecked AS FileHashChecked, FileMimetype as FileMimetype, FileStorageId as FileStorageId, FileKey as FileKey, @@ -148,8 +150,8 @@ retrieveEntityBody: BEGIN END IF; END IF; - SELECT path, size, hex(hash), mimetype, file_storage_id, file_key - INTO FilePath, FileSize, FileHash, FileMimetype, FileStorageId, FileKey + SELECT path, size, hex(hash), checked_timestamp, mimetype, file_storage_id, file_key + INTO FilePath, FileSize, FileHash, FileHashChecked, FileMimetype, FileStorageId, FileKey FROM files WHERE file_id = EntityID LIMIT 1; @@ -184,6 +186,7 @@ retrieveEntityBody: BEGIN FileSize AS FileSize, FilePath AS FilePath, FileHash AS FileHash, + FileHashChecked AS FileHashChecked, FileMimetype as FileMimetype, FileStorageId as FileStorageId, FileKey as FileKey, -- GitLab