From 999bbb1ab1450c77ef744602dff31d15b9dc8066 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Wed, 19 Apr 2023 16:49:06 +0200
Subject: [PATCH] Redesigning E/R instance definition

---
 .../resourceregistry/contexts/entities/ContextManagement.java | 2 ++
 .../informationsystem/resourceregistry/utils/Utility.java     | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/entities/ContextManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/entities/ContextManagement.java
index 2edc6b5..aed9251 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/entities/ContextManagement.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/entities/ContextManagement.java
@@ -128,7 +128,9 @@ public class ContextManagement extends EntityElementManagement<Context, EntityTy
 			select.append(getName());
 			select.append("\"");
 			select.append(QueryLogicalOperator.AND.getLogicalOperator());
+			select.append("\'");
 			select.append(IdentifiableElement.UUID_PROPERTY);
+			select.append("\'");
 			select.append(QueryConditionalOperator.NE.getConditionalOperator());
 			select.append("\"");
 			select.append(parentContext.uuid);
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/utils/Utility.java b/src/main/java/org/gcube/informationsystem/resourceregistry/utils/Utility.java
index cb58570..4d002ab 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/utils/Utility.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/utils/Utility.java
@@ -97,8 +97,8 @@ public class Utility {
 		}
 		
 		// TODO Rewrite using Gremlin
-		String select = "SELECT FROM " + elementType + " WHERE " + IdentifiableElement.UUID_PROPERTY
-				+ " = \"" + uuid.toString() + "\"";
+		String select = "SELECT FROM " + elementType + " WHERE '" + IdentifiableElement.UUID_PROPERTY
+				+ "' = \"" + uuid.toString() + "\"";
 		
 		OResultSet resultSet = oDatabaseDocument.query(select, new HashMap<>());