Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-mysqlbackend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
caosdb
Software
caosdb-mysqlbackend
Commits
2b00f0bb
Verified
Commit
2b00f0bb
authored
1 year ago
by
Timm Fitschen
Browse files
Options
Downloads
Patches
Plain Diff
BUG: fix merge errors
parent
d272c677
Branches
Branches containing commit
No related tags found
1 merge request
!13
Draft: EHN: file system: link
Pipeline
#47569
failed
1 year ago
Stage: test
Stage: deploy
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
patches/patch20240127-8.0-SNAPSHOT/patch.sql
+2
-0
2 additions, 0 deletions
patches/patch20240127-8.0-SNAPSHOT/patch.sql
procedures/retrieveFSODescriptorByPath.sql
+2
-3
2 additions, 3 deletions
procedures/retrieveFSODescriptorByPath.sql
with
4 additions
and
3 deletions
patches/patch20240127-8.0-SNAPSHOT/patch.sql
+
2
−
0
View file @
2b00f0bb
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
procedures/retrieveFSODescriptorByPath.sql
+
2
−
3
View file @
2b00f0bb
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment