diff --git a/patches/applyPatches.sh b/patches/applyPatches.sh
index 735dd3ea48a43d033b46dad1c7eb1700bda5c9b1..f4295ef5a29d19b5f10e8c2d628a9148385cf97e 100755
--- a/patches/applyPatches.sh
+++ b/patches/applyPatches.sh
@@ -39,6 +39,8 @@ fi
source $UTILSPATH/load_settings.sh
source $UTILSPATH/helpers.sh
+mysql_execute "DELETE FROM rules"
+
PATCHES="./patch*/patch.sh"
for p in $PATCHES
diff --git a/patches/patch20210122-4.0.0-rc3/patch.sql b/patches/patch20210122-4.0.0-rc3/patch.sql
index b7021e5e2266c8323cf8f3433146ee0607aab6be..84b12572f1a585c7064b4a8a1540c3065ccfc228 100644
--- a/patches/patch20210122-4.0.0-rc3/patch.sql
+++ b/patches/patch20210122-4.0.0-rc3/patch.sql
@@ -10,14 +10,14 @@ ALTER TABLE files ADD UNIQUE (`path`);
ALTER TABLE files ADD COLUMN IF NOT EXISTS (
mimetype VARBINARY(255) DEFAULT NULL,
- fileStorage VARBINARY(255) NOT NULL DEFAULT "DEFAULT",
- storageId VARBINARY(255) DEFAULT NULL
+ file_storage_id VARBINARY(255) NOT NULL DEFAULT "DEFAULT",
+ file_key VARBINARY(255) DEFAULT NULL
);
ALTER TABLE archive_files ADD COLUMN IF NOT EXISTS (
mimetype VARBINARY(255) DEFAULT NULL,
- fileStorage VARBINARY(255) NOT NULL DEFAULT "DEFAULT",
- storageId VARBINARY(255) DEFAULT NULL,
+ file_storage_id VARBINARY(255) NOT NULL DEFAULT "DEFAULT",
+ file_key VARBINARY(255) DEFAULT NULL,
checked_timestamp BIGINT DEFAULT NULL
);
@@ -27,9 +27,9 @@ ALTER TABLE entities MODIFY COLUMN `role` enum('RECORDTYPE','RECORD','FILE','DOM
INSERT INTO entities (id, description, role, acl) VALUES (9, "The directory role.", "ROLE", 0);
INSERT INTO name_data (domain_id, entity_id, property_id, value, status, pidx) VALUES (0, 9, 20, "DIRECTORY", "FIX", 0);
-UPDATE files SET storageId=path;
+UPDATE files SET file_key=path;
-ALTER TABLE files MODIFY COLUMN storageId VARBINARY(255) NOT NULL;
+ALTER TABLE files MODIFY COLUMN file_key VARBINARY(255) NOT NULL;
DROP PROCEDURE IF EXISTS _create_dirs;
DELIMITER //
@@ -67,7 +67,7 @@ BEGIN
INSERT INTO entities (description, role, acl) VALUES (NULL, "DIRECTORY", 0);
SET dir_id = LAST_INSERT_ID();
INSERT INTO files (file_id, path, size, hash, checked_timestamp,
- mimetype, fileStorage, storageId)
+ mimetype, file_storage_id, file_key)
VALUES (dir_id, LEFT(dir_path, CHAR_LENGTH(dir_path)-1), 0,
NULL, 0, "inode/directory", "DEFAULT", LEFT(dir_path,
CHAR_LENGTH(dir_path)-1));
diff --git a/procedures/entityVersioning.sql b/procedures/entityVersioning.sql
index 24f629e72a7bdaa3eb9811b0c7a322fc7bcdbe8f..782cddafa400284b3c6cc4bfed9386e007477ff8 100644
--- a/procedures/entityVersioning.sql
+++ b/procedures/entityVersioning.sql
@@ -439,8 +439,8 @@ CREATE PROCEDURE setFileProperties (
in FileHash VARCHAR(255),
in FileChecked BIGINT,
in FileMimetype VARBINARY(255),
- in FileStorage VARBINARY(255),
- in FileStorageId VARBINARY(65525)
+ in FileStorageId VARBINARY(255),
+ in FileKey VARBINARY(65525)
)
BEGIN
DECLARE IVersion INT UNSIGNED DEFAULT NULL;
@@ -450,10 +450,10 @@ BEGIN
WHERE e.entity_id = EntityID;
INSERT INTO archive_files (file_id, path, size, hash,
- checked_timestamp, mimetype, fileStorage, storageId,
+ checked_timestamp, mimetype, file_storage_id, file_key,
_iversion)
SELECT file_id, path, size, hash, checked_timestamp, mimetype,
- fileStorage, storageId, IVersion AS _iversion
+ file_storage_id, file_key, IVersion AS _iversion
FROM files
WHERE file_id = EntityID;
END IF;
@@ -462,9 +462,9 @@ BEGIN
IF FilePath IS NOT NULL THEN
INSERT INTO files (file_id, path, size, hash, checked_timestamp,
- mimetype, fileStorage, storageId)
+ mimetype, file_storage_id, file_key)
VALUES (EntityID, FilePath, FileSize, unhex(FileHash), FileChecked,
- FileMimetype, FileStorage, FileStorageId);
+ FileMimetype, FileStorageId, FileKey);
END IF;
END //
diff --git a/procedures/retrieveEntity.sql b/procedures/retrieveEntity.sql
index b2df703ddf8d52a93ca389f7b168547ae40677dd..a3c52f425eacd24fa73d9f004fdd66ae23001d49 100644
--- a/procedures/retrieveEntity.sql
+++ b/procedures/retrieveEntity.sql
@@ -56,8 +56,8 @@ retrieveEntityBody: BEGIN
DECLARE FileSize VARCHAR(255) DEFAULT NULL;
DECLARE FileHash VARCHAR(255) DEFAULT NULL;
DECLARE FileMimetype VARBINARY(255) DEFAULT NULL;
- DECLARE FileStorage VARBINARY(255) DEFAULT NULL;
- DECLARE FileStorageId VARBINARY(65525) DEFAULT NULL;
+ DECLARE FileStorageId VARBINARY(255) DEFAULT NULL;
+ DECLARE FileKey VARBINARY(65525) DEFAULT NULL;
DECLARE DatatypeID INT UNSIGNED DEFAULT NULL;
DECLARE CollectionName VARCHAR(255) DEFAULT NULL;
DECLARE IsHead BOOLEAN DEFAULT TRUE;
@@ -84,8 +84,8 @@ retrieveEntityBody: BEGIN
LEAVE retrieveEntityBody;
END IF;
- SELECT path, size, hex(hash), mimetype, fileStorage, storageId
- INTO FilePath, FileSize, FileHash, FileMimetype, FileStorage, FileStorageId
+ SELECT path, size, hex(hash), mimetype, file_storage_id, file_key
+ INTO FilePath, FileSize, FileHash, FileMimetype, FileStorageId, FileKey
FROM archive_files
WHERE file_id = EntityID
AND _iversion = IVersion
@@ -133,8 +133,8 @@ retrieveEntityBody: BEGIN
FilePath AS FilePath,
FileHash AS FileHash,
FileMimetype as FileMimetype,
- FileStorage as FileStorage,
FileStorageId as FileStorageId,
+ FileKey as FileKey,
(SELECT acl FROM entity_acl AS a WHERE a.id = e.acl) AS ACL,
Version AS Version
FROM archive_entities AS e
@@ -148,8 +148,8 @@ retrieveEntityBody: BEGIN
END IF;
END IF;
- SELECT path, size, hex(hash), mimetype, fileStorage, storageId
- INTO FilePath, FileSize, FileHash, FileMimetype, FileStorage, FileStorageId
+ SELECT path, size, hex(hash), mimetype, file_storage_id, file_key
+ INTO FilePath, FileSize, FileHash, FileMimetype, FileStorageId, FileKey
FROM files
WHERE file_id = EntityID
LIMIT 1;
@@ -185,8 +185,8 @@ retrieveEntityBody: BEGIN
FilePath AS FilePath,
FileHash AS FileHash,
FileMimetype as FileMimetype,
- FileStorage as FileStorage,
FileStorageId as FileStorageId,
+ FileKey as FileKey,
(SELECT acl FROM entity_acl AS a WHERE a.id = e.acl) AS ACL,
Version AS Version
FROM entities e WHERE id = EntityID LIMIT 1;