Skip to content
Snippets Groups Projects
Verified Commit 2b00f0bb authored by Timm Fitschen's avatar Timm Fitschen
Browse files

BUG: fix merge errors

parent d272c677
Branches
No related tags found
1 merge request!13Draft: EHN: file system: link
Pipeline #47569 failed
......@@ -71,6 +71,8 @@ INSERT IGNORE INTO entity_ids (id, internal_id) VALUES (9,9);
-- Add a new special role "LINK"
INSERT IGNORE INTO entities (id, description, role, acl) VALUES (10, "The link role.", "ROLE", 0);
INSERT IGNORE INTO name_data (domain_id, entity_id, property_id, value, status, pidx) VALUES (0, 10, 20, "LINK", "FIX", 0);
INSERT IGNORE INTO entity_ids (id, internal_id) VALUES (10,10);
-- In the default file storage back-end the key is just the path.
UPDATE files SET file_key=path;
......
......@@ -48,7 +48,6 @@ CREATE PROCEDURE db_5_0.retrieveFSODescriptorByPath(
retrieveFSODescriptorByPathBody: BEGIN
SELECT hash_algorithm AS FileHashAlgo,
byPath as Param,
(SELECT id FROM entity_ids WHERE internal_id = file_id) AS FileId,
path AS FilePath,
size AS FileSize,
......@@ -57,8 +56,8 @@ retrieveFSODescriptorByPathBody: BEGIN
mimetype AS FileMimeType,
file_storage_id AS FileStorageID,
file_key AS FileKey,
parent_directory AS FileParentID,
link_target AS LinkTarget
(SELECT id FROM entity_ids WHERE internal_id = parent_directory) AS FileParentID,
(SELECT id FROM entity_ids WHERE internal_id = link_target) AS LinkTarget
FROM files
WHERE path LIKE byPath;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment