WIP

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
 );
 
 

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,