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

WIP: String IDs

parent d8a2e7ae
No related branches found
No related tags found
3 merge requests!17Release 6.0,!15External String IDs,!11DRAFT: file system cleanup
Pipeline #41755 failed
......@@ -47,7 +47,7 @@ delimiter //
* The overridden name
* DescOverride : TEXT
* The overridden description
* DatatypeOverride : INT UNSIGNED
* DatatypeOverride : VARCHAR(255)
* The overridden datatype
* Collection : VARCHAR(255)
* The overridden collection (only if DatatypeOverride is present).
......@@ -64,7 +64,7 @@ CREATE PROCEDURE db_5_0.insertEntityProperty(
in PropertyStatus VARCHAR(255),
in NameOverride VARCHAR(255),
in DescOverride TEXT,
in DatatypeOverride INT UNSIGNED,
in DatatypeOverride VARCHAR(255),
in Collection VARCHAR(255),
in PropertyIndex INT UNSIGNED)
BEGIN
......
......@@ -92,7 +92,9 @@ IF targetSet IS NULL OR targetSet = sourceSet THEN
"1=1",
CONCAT("NOT EXISTS (SELECT 1 FROM entity_ids AS eids WHERE eids.id ",
o,
' "',
EntityID,
'" ',
" AND eids.internal_id = `",
sourceSet,
"`.id)"
......@@ -111,7 +113,9 @@ ELSEIF versioned AND sourceSet = "entities" THEN
"1=1",
CONCAT("eids.id ",
o,
EntityID
' "',
EntityID,
'"'
)),
IF(aggVal IS NULL,
"",
......@@ -122,7 +126,9 @@ ELSEIF versioned AND sourceSet = "entities" THEN
"1=1",
CONCAT("eids.id ",
o,
EntityID
' "',
EntityID,
'"'
)),
IF(aggVal IS NULL,
"",
......@@ -143,7 +149,10 @@ ELSE
"1=1",
CONCAT("eids.id",
o,
EntityID)),
' "',
EntityID,
'"'
)),
IF(aggVal IS NULL,
"",
CONCAT(" AND data.id=",
......
......@@ -60,9 +60,10 @@ BEGIN
DEALLOCATE PREPARE stmt;
IF EntityID IS NOT NULL THEN
SET @stmtStr = CONCAT('INSERT IGNORE INTO `', tableName, '` (id) SELECT internal_id FROM entity_ids WHERE id = ', EntityID, '');
SET @stmtStr = CONCAT('INSERT IGNORE INTO `', tableName, '` (id) SELECT internal_id FROM entity_ids WHERE id = ?');
PREPARE stmt FROM @stmtStr;
EXECUTE stmt;
SET @eid = EntityID;
EXECUTE stmt USING @eid;
SET ecount = ecount + ROW_COUNT();
DEALLOCATE PREPARE stmt;
END IF;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment