From 312d0d1c399c122f8cddd58a14e6b1f9fa37ff4d Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Wed, 15 Apr 2020 17:52:11 +0200
Subject: [PATCH] Enable versioning by default
---
patches/patch20200415-3.0.0/versioning.sql | 3 ++-
procedures/retrieveEntityParents.sql | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/patches/patch20200415-3.0.0/versioning.sql b/patches/patch20200415-3.0.0/versioning.sql
index 7818f7d..d1e9450 100644
--- a/patches/patch20200415-3.0.0/versioning.sql
+++ b/patches/patch20200415-3.0.0/versioning.sql
@@ -333,7 +333,6 @@ CREATE PROCEDURE setFileProperties (
)
BEGIN
DECLARE IVersion INT UNSIGNED DEFAULT NULL;
-
IF is_feature_config("ENTITY_VERSIONING", "ENABLED") THEN
SELECT max(e._iversion) INTO IVersion
FROM entity_version AS e
@@ -398,3 +397,5 @@ END //
delimiter ;
+
+INSERT INTO feature_config (_key, _value) VALUES ("ENTITY_VERSIONING", "ENABLED");
diff --git a/procedures/retrieveEntityParents.sql b/procedures/retrieveEntityParents.sql
index bbde5db..74c7f67 100644
--- a/procedures/retrieveEntityParents.sql
+++ b/procedures/retrieveEntityParents.sql
@@ -85,7 +85,8 @@ retrieveEntityParentsBody: BEGIN
JOIN entities AS e
ON (i.parent = e.id)
WHERE i.child = EntityID
- AND i.child_iversion = IVersion;
+ AND i.child_iversion = IVersion
+ AND i.rpath = EntityID;
LEAVE retrieveEntityParentsBody;
END IF;
@@ -101,7 +102,7 @@ retrieveEntityParentsBody: BEGIN
JOIN entities AS e
ON (i.parent = e.id)
WHERE i.child = EntityID
- AND i.rpath = CAST(EntityID AS CHAR) COLLATE utf8_unicode_ci;
+ AND i.rpath = EntityID;
END
//
--
GitLab