From fd3697dc50dc084f65bf26bfdd83fe0954a86fc5 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Mon, 20 Apr 2020 14:38:30 +0200
Subject: [PATCH] BUG: delete entities with strange subproperties

---
 patches/patch20200420-2.1.2/patch.sh  | 43 +++++++++++++++++++++++++++
 procedures/deleteEntityProperties.sql |  2 ++
 2 files changed, 45 insertions(+)
 create mode 100755 patches/patch20200420-2.1.2/patch.sh

diff --git a/patches/patch20200420-2.1.2/patch.sh b/patches/patch20200420-2.1.2/patch.sh
new file mode 100755
index 0000000..56ffc95
--- /dev/null
+++ b/patches/patch20200420-2.1.2/patch.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+#
+# ** header v3.0
+# This file is a part of the CaosDB Project.
+#
+# Copyright (C) 2018 Research Group Biomedical Physics,
+# Max-Planck-Institute for Dynamics and Self-Organization Göttingen
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+#
+# ** end header
+#
+# Fix missing delete statement in deleteEntityProperties
+# Update mysql schema to version v2.1.2
+NEW_VERSION="v2.1.2"
+OLD_VERSION="v2.1.1"
+
+if [ -z "$UTILSPATH" ]; then
+ UTILSPATH="../utils"
+fi
+
+. $UTILSPATH/patch_header.sh $*
+
+
+check_version $OLD_VERSION
+
+# just update procedures
+
+update_version $NEW_VERSION
+
+success
+
diff --git a/procedures/deleteEntityProperties.sql b/procedures/deleteEntityProperties.sql
index 64715fe..2e8b7fa 100644
--- a/procedures/deleteEntityProperties.sql
+++ b/procedures/deleteEntityProperties.sql
@@ -51,6 +51,8 @@ DELETE FROM name_overrides
 WHERE (domain_id=0 AND entity_id=EntityID) OR domain_id=EntityID;
 DELETE FROM desc_overrides
 WHERE (domain_id=0 AND entity_id=EntityID) OR domain_id=EntityID;
+DELETE FROM collection_type
+WHERE (domain_id=0 AND entity_id=EntityID) OR domain_id=EntityID;
 DELETE FROM data_type 
 WHERE (domain_id=0 AND entity_id=EntityID) OR domain_id=EntityID OR (domain_id=0 AND entity_id=0 AND property_id=EntityID);
 
-- 
GitLab