From 2b00f0bbc81a5d8329aa44c7fcce9c26a3b4be30 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Mon, 19 Feb 2024 00:04:07 +0100
Subject: [PATCH] BUG: fix merge errors
---
patches/patch20240127-8.0-SNAPSHOT/patch.sql | 2 ++
procedures/retrieveFSODescriptorByPath.sql | 5 ++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/patches/patch20240127-8.0-SNAPSHOT/patch.sql b/patches/patch20240127-8.0-SNAPSHOT/patch.sql
index 38ea11f..974bc86 100644
--- a/patches/patch20240127-8.0-SNAPSHOT/patch.sql
+++ b/patches/patch20240127-8.0-SNAPSHOT/patch.sql
@@ -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;
diff --git a/procedures/retrieveFSODescriptorByPath.sql b/procedures/retrieveFSODescriptorByPath.sql
index 73f9e0d..d6bf87c 100644
--- a/procedures/retrieveFSODescriptorByPath.sql
+++ b/procedures/retrieveFSODescriptorByPath.sql
@@ -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;
--
GitLab